Permalink
Browse files

issue#254: upgrade spring in order to support jdk8

1 parent 4b87db9 commit 398db21fdd2527fe076155a379a2d2f16cddc276 @beiwei30 beiwei30 committed Jun 8, 2016
View
@@ -42,10 +42,6 @@
<artifactId>citrus-webx-all</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
@@ -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>
@@ -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>
@@ -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>
@@ -40,10 +40,6 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
@@ -40,10 +40,6 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -39,10 +39,6 @@
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
View
@@ -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>
@@ -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>
@@ -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>

0 comments on commit 398db21

Please sign in to comment.