Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
issue#254: upgrade spring in order to support jdk8
  • Loading branch information
beiwei30 committed Jun 8, 2016
1 parent 4b87db9 commit 398db21
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 35 deletions.
4 changes: 0 additions & 4 deletions dubbo-admin/pom.xml
Expand Up @@ -41,10 +41,6 @@
<groupId>com.alibaba.citrus</groupId>
<artifactId>citrus-webx-all</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
Expand Down
6 changes: 5 additions & 1 deletion dubbo-config/dubbo-config-spring/pom.xml
Expand Up @@ -36,7 +36,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
Expand Down
4 changes: 0 additions & 4 deletions dubbo-container/dubbo-container-api/pom.xml
Expand Up @@ -38,10 +38,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
4 changes: 4 additions & 0 deletions dubbo-container/dubbo-container-spring/pom.xml
Expand Up @@ -34,5 +34,9 @@
<artifactId>dubbo-container-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 0 additions & 4 deletions dubbo-demo/dubbo-demo-consumer/pom.xml
Expand Up @@ -39,10 +39,6 @@
<artifactId>dubbo</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions dubbo-demo/dubbo-demo-provider/pom.xml
Expand Up @@ -39,10 +39,6 @@
<artifactId>dubbo</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
Expand Down
6 changes: 5 additions & 1 deletion dubbo-rpc/dubbo-rpc-http/pom.xml
Expand Up @@ -41,7 +41,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 1 addition & 3 deletions dubbo-rpc/dubbo-rpc-rmi/pom.xml
Expand Up @@ -36,9 +36,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<scope>provided</scope>
<optional>true</optional>
<artifactId>spring-context</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 1 addition & 3 deletions dubbo-rpc/dubbo-rpc-thrift/pom.xml
Expand Up @@ -55,9 +55,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<scope>provided</scope>
<optional>true</optional>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
Expand Down
4 changes: 1 addition & 3 deletions dubbo-rpc/dubbo-rpc-webservice/pom.xml
Expand Up @@ -49,9 +49,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<scope>provided</scope>
<optional>true</optional>
<artifactId>spring-context</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 0 additions & 4 deletions dubbo-simple/dubbo-monitor-simple/pom.xml
Expand Up @@ -38,10 +38,6 @@
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
Expand Down
10 changes: 6 additions & 4 deletions pom.xml
Expand Up @@ -81,7 +81,7 @@
</profiles>
<properties>
<!-- Common libs -->
<spring_version>2.5.6.SEC03</spring_version>
<spring_version>3.2.16.RELEASE</spring_version>
<javassist_version>3.20.0-GA</javassist_version>
<netty_version>3.2.5.Final</netty_version>
<mina_version>1.1.7</mina_version>
Expand Down Expand Up @@ -131,8 +131,8 @@

<!-- for maven compiler plugin -->
<maven_compiler_plugin_version>2.3.2</maven_compiler_plugin_version>
<java_source_version>1.5</java_source_version>
<java_target_version>1.5</java_target_version>
<java_source_version>1.6</java_source_version>
<java_target_version>1.6</java_target_version>
<file_encoding>UTF-8</file_encoding>

</properties>
Expand All @@ -141,8 +141,10 @@
<!-- Common libs -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring_version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
Expand Down

0 comments on commit 398db21

Please sign in to comment.