Skip to content

Commit

Permalink
Merge pull request #5 from waylau/feat-update-to-spring-v5.1.1
Browse files Browse the repository at this point in the history 
更新至Spring 5.1.1.RELEASE
  • Loading branch information
@waylau
waylau authored Oct 31, 2018
2 parents ee60a1b + 2346307 commit c26f358
Show file tree
Hide file tree
Showing 44 changed files with 73 additions and 73 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

* Apache Maven 3.5.2
* Gradle 4.5
* Spring 5.0.8.RELEASE
* Spring 5.1.1.RELEASE
* Servlet 4.0.0
* JUnit 4.12
* Lo4j 2.6.2
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch01-hello-world/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')

}
2 changes: 1 addition & 1 deletion samples/s5-ch01-hello-world/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions samples/s5-ch02-aop-aspect-xml/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
}
4 changes: 2 additions & 2 deletions samples/s5-ch02-aop-aspect-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions samples/s5-ch02-aop-aspect/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
}
4 changes: 2 additions & 2 deletions samples/s5-ch02-aop-aspect/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion samples/s5-ch02-custom-scope/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')

}
2 changes: 1 addition & 1 deletion samples/s5-ch02-custom-scope/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion samples/s5-ch02-dependency-injection/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')

}
2 changes: 1 addition & 1 deletion samples/s5-ch02-dependency-injection/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions samples/s5-ch02-expression-language/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
}
4 changes: 2 additions & 2 deletions samples/s5-ch02-expression-language/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>5.0.8.RELEASE</version>
<version>5.1.1.RELEASE</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions samples/s5-ch05-client-side-rest-test/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-webmvc:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-webmvc:5.1.1.RELEASE')
provided('javax.servlet:javax.servlet-api:4.0.0')
// 该依赖用于测试阶段
testCompile('org.springframework:spring-test:5.0.8.RELEASE')
testCompile('org.springframework:spring-test:5.1.1.RELEASE')
testCompile('junit:junit:4.12')
}
2 changes: 1 addition & 1 deletion samples/s5-ch05-client-side-rest-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch05-mvc-test/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-webmvc:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-webmvc:5.1.1.RELEASE')

provided('javax.servlet:javax.servlet-api:4.0.0')

// 该依赖用于测试阶段
testCompile('org.springframework:spring-test:5.0.8.RELEASE')
testCompile('org.springframework:spring-test:5.1.1.RELEASE')
testCompile('junit:junit:4.12')
}
2 changes: 1 addition & 1 deletion samples/s5-ch05-mvc-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch06-declarative-transaction/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-jdbc:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
compile('org.springframework:spring-jdbc:5.1.1.RELEASE')
compile('org.apache.logging.log4j:log4j-core:2.6.2')
compile('org.apache.logging.log4j:log4j-jcl:2.6.2')
compile('org.apache.logging.log4j:log4j-slf4j-impl:2.6.2')
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch06-declarative-transaction/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch08-embedded-database/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-jdbc:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
compile('org.springframework:spring-jdbc:5.1.1.RELEASE')
compile('org.apache.logging.log4j:log4j-core:2.6.2')
compile('org.apache.logging.log4j:log4j-jcl:2.6.2')
compile('org.apache.logging.log4j:log4j-slf4j-impl:2.6.2')
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch08-embedded-database/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch08-jdbc-object-mapping/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-jdbc:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
compile('org.springframework:spring-jdbc:5.1.1.RELEASE')
compile('org.apache.logging.log4j:log4j-core:2.6.2')
compile('org.apache.logging.log4j:log4j-jcl:2.6.2')
compile('org.apache.logging.log4j:log4j-slf4j-impl:2.6.2')
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch08-jdbc-object-mapping/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch08-jdbc-template/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-aspects:5.0.8.RELEASE')
compile('org.springframework:spring-jdbc:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-aspects:5.1.1.RELEASE')
compile('org.springframework:spring-jdbc:5.1.1.RELEASE')
compile('org.apache.logging.log4j:log4j-core:2.6.2')
compile('org.apache.logging.log4j:log4j-jcl:2.6.2')
compile('org.apache.logging.log4j:log4j-slf4j-impl:2.6.2')
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch08-jdbc-template/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions samples/s5-ch10-jaxb-oxm/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-context:5.0.8.RELEASE')
compile('org.springframework:spring-oxm:5.0.8.RELEASE')
compile('org.springframework:spring-context:5.1.1.RELEASE')
compile('org.springframework:spring-oxm:5.1.1.RELEASE')
}
2 changes: 1 addition & 1 deletion samples/s5-ch10-jaxb-oxm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<url>https://waylau.com</url>
</organization>
<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch11-mvc-rest/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-webmvc:5.0.8.RELEASE')
compile('org.springframework:spring-webmvc:5.1.1.RELEASE')

// 添加 Jackson JSON 依赖
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.6'
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch11-mvc-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</organization>

<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
<jetty.version>9.4.11.v20180605</jetty.version>
<jackson.version>2.9.6</jackson.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch12-rest-template/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-webmvc:5.0.8.RELEASE')
compile('org.springframework:spring-webmvc:5.1.1.RELEASE')

// 添加 Jackson JSON 依赖
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.6'
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch12-rest-template/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</organization>

<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
<jetty.version>9.4.11.v20180605</jetty.version>
<jackson.version>2.9.6</jackson.version>
<httpclient.version>4.5.5</httpclient.version>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch13-websocket-stomp/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-webmvc:5.0.8.RELEASE')
compile('org.springframework:spring-websocket:5.0.8.RELEASE')
compile('org.springframework:spring-messaging:5.0.8.RELEASE')
compile('org.springframework:spring-webmvc:5.1.1.RELEASE')
compile('org.springframework:spring-websocket:5.1.1.RELEASE')
compile('org.springframework:spring-messaging:5.1.1.RELEASE')

// 添加 Jackson JSON 依赖
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.6'
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch13-websocket-stomp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</organization>

<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
<jetty.version>9.4.11.v20180605</jetty.version>
<jackson.version>2.9.6</jackson.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch15-webclient-file/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-webflux:5.0.8.RELEASE')
compile('org.springframework:spring-webflux:5.1.1.RELEASE')
}
2 changes: 1 addition & 1 deletion samples/s5-ch15-webclient-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</organization>

<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
<reactor.netty.version>0.7.6.RELEASE</reactor.netty.version>
</properties>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions samples/s5-ch16-reactive-websocket/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ repositories {
dependencies {

// 该依赖用于编译阶段
compile('org.springframework:spring-webmvc:5.0.8.RELEASE')
compile('org.springframework:spring-websocket:5.0.8.RELEASE')
compile('org.springframework:spring-messaging:5.0.8.RELEASE')
compile('org.springframework:spring-webmvc:5.1.1.RELEASE')
compile('org.springframework:spring-websocket:5.1.1.RELEASE')
compile('org.springframework:spring-messaging:5.1.1.RELEASE')

// 添加 Jackson JSON 依赖
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.6'
Expand Down
2 changes: 1 addition & 1 deletion samples/s5-ch16-reactive-websocket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</organization>

<properties>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.1.RELEASE</spring.version>
<jetty.version>9.4.11.v20180605</jetty.version>
<jackson.version>2.9.6</jackson.version>
<reactor.netty.version>0.7.6.RELEASE</reactor.netty.version>
Expand Down
Loading

0 comments on commit c26f358

Please sign in to comment.