Skip to content

Commit 4307a4b

Browse files
gregturngregturn
committed
Upgrade to stable snapshot
1 parent 3c6b249 commit 4307a4b

File tree

56 files changed

+156
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+156
-172
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ build
1515
*.keystore
1616
.DS_Store
1717
upload-dir
18-
!**/templates/*
18+
!**/templates/*
19+
out

‎1/part1/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// tag::buildscript[]
22
buildscript {
33
ext {
4-
springBootVersion = '2.0.0.M4'
4+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
55
}
66
repositories {
77
mavenCentral()
@@ -38,8 +38,6 @@ repositories {
3838
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
3939
}
4040

41-
ext['thymeleaf-spring5.version'] = '3.0.8-SNAPSHOT'
42-
4341
// tag::deps[]
4442
dependencies {
4543
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')

‎10/part1/chat/build.gradle‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// tag::propdeps-plugin-1[]
22
buildscript {
33
ext {
4-
springBootVersion = '2.0.0.M4'
4+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
55
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
66
springCloudStreamVersion = 'Elmhurst.M1'
77
}
@@ -58,8 +58,6 @@ configurations {
5858
all*.exclude group: 'org.springframework', module: 'spring-webmvc'
5959
}
6060

61-
ext['thymeleaf-spring5.version'] = '3.0.8-SNAPSHOT'
62-
6361
dependencies {
6462
compile('org.springframework.boot:spring-boot-starter-webflux')
6563
compile('org.synchronoss.cloud:nio-multipart-parser:1.1.0')
@@ -69,16 +67,15 @@ dependencies {
6967
compile('org.projectlombok:lombok')
7068
compile('org.springframework.cloud:spring-cloud-starter-stream-rabbit')
7169
compile('org.springframework.cloud:spring-cloud-stream-reactive')
72-
compile('org.springframework.cloud:spring-cloud-starter-eureka')
73-
compile('org.springframework.cloud:spring-cloud-starter-hystrix')
70+
compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
71+
compile('org.springframework.cloud:spring-cloud-starter-netflix-hystrix')
7472
compile('org.springframework.cloud:spring-cloud-starter-config')
7573

76-
compile('org.springframework.security:spring-security-config')
77-
compile('org.springframework.security:spring-security-webflux')
74+
compile('org.springframework.boot:spring-boot-starter-security-reactive')
7875

7976
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
8077

81-
compile('org.springframework.session:spring-session-data-mongodb:2.0.0.M3')
78+
compile('org.springframework.session:spring-session-data-mongodb')
8279

8380
// tag::zuul[]
8481
compile('org.springframework.cloud:spring-cloud-starter-gateway')

‎10/part1/comments/build.gradle‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.0.0.M4'
4-
springCloudVersion = 'Finchley.M2'
3+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
55
springCloudStreamVersion = 'Elmhurst.M1'
66
}
77
repositories {
@@ -52,14 +52,13 @@ dependencies {
5252
compile('org.springframework.boot:spring-boot-devtools')
5353
compile('org.springframework.cloud:spring-cloud-starter-stream-rabbit')
5454
compile('org.springframework.cloud:spring-cloud-stream-reactive')
55-
compile('org.springframework.cloud:spring-cloud-starter-eureka')
56-
compile('org.springframework.cloud:spring-cloud-starter-hystrix')
55+
compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
56+
compile('org.springframework.cloud:spring-cloud-starter-netflix-hystrix')
5757
compile('org.springframework.cloud:spring-cloud-starter-config')
5858
compile('org.projectlombok:lombok')
5959

60-
compile('org.springframework.security:spring-security-config')
61-
compile('org.springframework.security:spring-security-webflux')
62-
compile('org.springframework.session:spring-session-data-mongodb:2.0.0.M3')
60+
compile('org.springframework.boot:spring-boot-starter-security-reactive')
61+
compile('org.springframework.session:spring-session-data-mongodb')
6362

6463
testCompile('org.springframework.boot:spring-boot-starter-test')
6564
}

‎10/part1/config-server/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.0.0.M4'
4-
springCloudVersion = 'Finchley.M2'
3+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
55
}
66
repositories {
77
mavenCentral()

‎10/part1/eureka-server/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.0.0.M3'
4-
springCloudVersion = 'Finchley.M2'
3+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
55
}
66
repositories {
77
mavenCentral()

‎10/part1/hystrix-dashboard/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.0.0.M4'
4-
springCloudVersion = 'Finchley.M2'
3+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
55
}
66
repositories {
77
mavenCentral()
@@ -40,7 +40,7 @@ jar {
4040

4141
// tag::code[]
4242
dependencies {
43-
compile('org.springframework.cloud:spring-cloud-starter-hystrix-dashboard')
43+
compile('org.springframework.cloud:spring-cloud-starter-netflix-hystrix-dashboard')
4444
compile('org.springframework.cloud:spring-cloud-starter-config')
4545
}
4646

‎10/part1/images/build.gradle‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.0.0.M4'
4-
springCloudVersion = 'Finchley.M2'
3+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
55
springCloudStreamVersion = 'Elmhurst.M1'
66
}
77
repositories {
@@ -57,15 +57,14 @@ dependencies {
5757
compile('org.springframework.boot:spring-boot-devtools')
5858
compile('org.springframework.cloud:spring-cloud-starter-stream-rabbit')
5959
compile('org.springframework.cloud:spring-cloud-stream-reactive')
60-
compile('org.springframework.cloud:spring-cloud-starter-eureka')
61-
compile('org.springframework.cloud:spring-cloud-starter-hystrix')
60+
compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
61+
compile('org.springframework.cloud:spring-cloud-starter-netflix-hystrix')
6262
compile('org.springframework.cloud:spring-cloud-starter-config')
6363
compile('org.projectlombok:lombok')
6464

6565
// tag::spring-session[]
66-
compile('org.springframework.security:spring-security-config')
67-
compile('org.springframework.security:spring-security-webflux')
68-
compile('org.springframework.session:spring-session-data-mongodb:2.0.0.M3')
66+
compile('org.springframework.boot:spring-boot-starter-security-reactive')
67+
compile('org.springframework.session:spring-session-data-mongodb')
6968
// end::spring-session[]
7069

7170
testCompile('org.springframework.boot:spring-boot-starter-test')

‎2/part1/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
// tag::versions[]
33
ext {
4-
springBootVersion = '2.0.0.M4'
4+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
55
}
66
// end::versions[]
77
repositories {
@@ -33,8 +33,6 @@ repositories {
3333
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
3434
}
3535

36-
ext['thymeleaf-spring5.version'] = '3.0.8-SNAPSHOT'
37-
3836
// tag::deps[]
3937
dependencies {
4038
compile('org.springframework.boot:spring-boot-starter-webflux')

‎2/part2/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.0.0.M4'
3+
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
44
}
55
repositories {
66
mavenCentral()
@@ -31,8 +31,6 @@ repositories {
3131
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
3232
}
3333

34-
ext['thymeleaf-spring5.version'] = '3.0.8-SNAPSHOT'
35-
3634
dependencies {
3735
// tag::netty[]
3836
compile('org.springframework.boot:spring-boot-starter-webflux') {

0 commit comments

Comments
 (0)