Skip to content

Commit 98b2627

Browse files
gregturngregturn
committed
Switch Thymeleaf and Spring Cloud
1 parent b6a7f5d commit 98b2627

File tree

56 files changed

+212
-315
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

+212
-315
lines changed

‎10/part1/chat/build.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
buildscript {
33
ext {
44
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
5-
thymeleafVersion = '3.0.4-SNAPSHOT'
5+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
66
}
77
repositories {
88
mavenCentral()
@@ -18,7 +18,7 @@ buildscript {
1818
// end::propdeps-plugin-1[]
1919

2020
plugins {
21-
id "io.spring.dependency-management" version "1.0.0.RC2"
21+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
2222

2323
// tag::gradle-git[]
2424
id "com.gorylenko.gradle-git-properties" version "1.4.17"
@@ -53,12 +53,10 @@ jar {
5353
version = '0.0.1-SNAPSHOT'
5454
}
5555

56-
ext['thymeleaf.version'] = thymeleafVersion
57-
5856
dependencies {
5957
compile('org.springframework.boot:spring-boot-starter-webflux')
6058
compile('org.springframework.boot:spring-boot-starter-actuator')
61-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
59+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
6260
compile('org.springframework.boot:spring-boot-devtools')
6361
compile('org.projectlombok:lombok')
6462
compile('org.springframework.cloud:spring-cloud-starter-stream-rabbit')
@@ -102,7 +100,6 @@ compileJava.dependsOn(processResources)
102100

103101
dependencyManagement {
104102
imports {
105-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
106-
mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.BUILD-SNAPSHOT"
103+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
107104
}
108-
}
105+
}

‎10/part1/comments/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
45
}
56
repositories {
67
mavenCentral()
@@ -13,7 +14,7 @@ buildscript {
1314
}
1415

1516
plugins {
16-
id "io.spring.dependency-management" version "1.0.0.RC2"
17+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1718

1819
// tag::gradle-git[]
1920
id "com.gorylenko.gradle-git-properties" version "1.4.17"
@@ -39,8 +40,6 @@ jar {
3940
version = '0.0.1-SNAPSHOT'
4041
}
4142

42-
ext['reactor.version'] = '3.0.3.RELEASE'
43-
4443
dependencies {
4544
compile('org.springframework.boot:spring-boot-starter-actuator')
4645
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
@@ -59,6 +58,6 @@ dependencies {
5958

6059
dependencyManagement {
6160
imports {
62-
mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.BUILD-SNAPSHOT"
61+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
6362
}
6463
}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
45
}
56
repositories {
67
mavenCentral()
@@ -13,7 +14,7 @@ buildscript {
1314
}
1415

1516
plugins {
16-
id "io.spring.dependency-management" version "1.0.0.RC2"
17+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1718

1819
// tag::gradle-git[]
1920
id "com.gorylenko.gradle-git-properties" version "1.4.17"
@@ -49,7 +50,7 @@ dependencies {
4950

5051
dependencyManagement {
5152
imports {
52-
mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.BUILD-SNAPSHOT"
53+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
5354
}
5455
}
5556
// end::code[]

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
45
}
56
repositories {
67
mavenCentral()
@@ -13,7 +14,7 @@ buildscript {
1314
}
1415

1516
plugins {
16-
id "io.spring.dependency-management" version "1.0.0.RC2"
17+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1718

1819
// tag::gradle-git[]
1920
id "com.gorylenko.gradle-git-properties" version "1.4.17"
@@ -52,6 +53,6 @@ dependencies {
5253

5354
dependencyManagement {
5455
imports {
55-
mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.BUILD-SNAPSHOT"
56+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
5657
}
5758
}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
45
}
56
repositories {
67
mavenCentral()
@@ -13,7 +14,7 @@ buildscript {
1314
}
1415

1516
plugins {
16-
id "io.spring.dependency-management" version "1.0.0.RC2"
17+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1718

1819
// tag::gradle-git[]
1920
id "com.gorylenko.gradle-git-properties" version "1.4.17"
@@ -46,7 +47,7 @@ dependencies {
4647

4748
dependencyManagement {
4849
imports {
49-
mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.BUILD-SNAPSHOT"
50+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
5051
}
5152
}
5253
// end::code[]

‎10/part1/images/build.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4-
thymeleafVersion = '3.0.4-SNAPSHOT'
4+
springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
55
}
66
repositories {
77
mavenCentral()
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
plugins {
17-
id "io.spring.dependency-management" version "1.0.0.RC2"
17+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1818

1919
// tag::gradle-git[]
2020
id "com.gorylenko.gradle-git-properties" version "1.4.17"
@@ -41,12 +41,10 @@ jar {
4141
version = '0.0.1-SNAPSHOT'
4242
}
4343

44-
ext['thymeleaf.version'] = thymeleafVersion
45-
4644
dependencies {
4745
compile('org.springframework.boot:spring-boot-starter-webflux')
4846
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
49-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
47+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
5048
compile('org.springframework.boot:spring-boot-starter-actuator')
5149
compile('org.springframework.boot:spring-boot-devtools')
5250
compile('org.springframework.cloud:spring-cloud-starter-stream-rabbit')
@@ -69,7 +67,6 @@ dependencies {
6967

7068
dependencyManagement {
7169
imports {
72-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
73-
mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.BUILD-SNAPSHOT"
70+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
7471
}
75-
}
72+
}

‎2/part1/build.gradle

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ buildscript {
22
// tag::versions[]
33
ext {
44
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
5-
thymeleafVersion = '3.0.4-SNAPSHOT'
65
}
76
// end::versions[]
87
repositories {
@@ -16,7 +15,7 @@ buildscript {
1615
}
1716

1817
plugins {
19-
id "io.spring.dependency-management" version "1.0.0.RC2"
18+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
2019
}
2120

2221
apply plugin: 'java'
@@ -38,18 +37,10 @@ repositories {
3837
}
3938

4039
// tag::deps[]
41-
ext['thymeleaf.version'] = thymeleafVersion
42-
4340
dependencies {
4441
compile('org.springframework.boot:spring-boot-starter-webflux')
45-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
42+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
4643
compile('org.projectlombok:lombok')
4744
testCompile('org.springframework.boot:spring-boot-starter-test')
4845
}
49-
50-
dependencyManagement {
51-
imports {
52-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
53-
}
54-
}
5546
// end::deps[]

‎2/part2/build.gradle

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4-
thymeleafVersion = '3.0.4-SNAPSHOT'
54
}
65
repositories {
76
mavenCentral()
@@ -14,7 +13,7 @@ buildscript {
1413
}
1514

1615
plugins {
17-
id "io.spring.dependency-management" version "1.0.0.RC2"
16+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1817
}
1918

2019
apply plugin: 'java'
@@ -35,8 +34,6 @@ repositories {
3534
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
3635
}
3736

38-
ext['thymeleaf.version'] = thymeleafVersion
39-
4037
dependencies {
4138
// tag::netty[]
4239
compile('org.springframework.boot:spring-boot-starter-webflux') {
@@ -45,13 +42,7 @@ dependencies {
4542
}
4643
compile('org.springframework.boot:spring-boot-starter-tomcat')
4744
// end::netty[]
48-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
45+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
4946
compile('org.projectlombok:lombok')
5047
testCompile('org.springframework.boot:spring-boot-starter-test')
5148
}
52-
53-
dependencyManagement {
54-
imports {
55-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
56-
}
57-
}

‎3/part1/build.gradle

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4-
thymeleafVersion = '3.0.4-SNAPSHOT'
54
}
65
repositories {
76
mavenCentral()
@@ -14,7 +13,7 @@ buildscript {
1413
}
1514

1615
plugins {
17-
id "io.spring.dependency-management" version "1.0.0.RC2"
16+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1817
}
1918

2019
apply plugin: 'java'
@@ -36,21 +35,13 @@ repositories {
3635
}
3736

3837

39-
ext['thymeleaf.version'] = thymeleafVersion
40-
4138
dependencies {
4239
compile('org.springframework.boot:spring-boot-starter-webflux')
4340
// tag::dep-1[]
4441
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
4542
// end::dep-1[]
46-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
43+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
4744
compile('org.projectlombok:lombok')
4845
testCompile('org.springframework.boot:spring-boot-starter-test')
4946
testCompile("io.projectreactor.addons:reactor-test")
5047
}
51-
52-
dependencyManagement {
53-
imports {
54-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
55-
}
56-
}

‎3/part2/build.gradle

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4-
thymeleafVersion = '3.0.4-SNAPSHOT'
54
}
65
repositories {
76
mavenCentral()
@@ -14,7 +13,7 @@ buildscript {
1413
}
1514

1615
plugins {
17-
id "io.spring.dependency-management" version "1.0.0.RC2"
16+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1817
}
1918

2019
apply plugin: 'java'
@@ -36,19 +35,11 @@ repositories {
3635
}
3736

3837

39-
ext['thymeleaf.version'] = thymeleafVersion
40-
4138
dependencies {
4239
compile('org.springframework.boot:spring-boot-starter-webflux')
4340
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
44-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
41+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
4542
compile('org.projectlombok:lombok')
4643
testCompile('org.springframework.boot:spring-boot-starter-test')
4744
testCompile("io.projectreactor.addons:reactor-test")
4845
}
49-
50-
dependencyManagement {
51-
imports {
52-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
53-
}
54-
}

‎4/part1/build.gradle

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
ext {
33
springBootVersion = '2.0.0.BUILD-SNAPSHOT'
4-
thymeleafVersion = '3.0.4-SNAPSHOT'
54
}
65
repositories {
76
mavenCentral()
@@ -14,7 +13,7 @@ buildscript {
1413
}
1514

1615
plugins {
17-
id "io.spring.dependency-management" version "1.0.0.RC2"
16+
id "io.spring.dependency-management" version "1.0.0.RELEASE"
1817
}
1918

2019
apply plugin: 'java'
@@ -36,12 +35,10 @@ repositories {
3635
}
3736

3837

39-
ext['thymeleaf.version'] = thymeleafVersion
40-
4138
dependencies {
4239
compile('org.springframework.boot:spring-boot-starter-webflux')
4340
compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
44-
compile("org.thymeleaf:thymeleaf-spring5:${thymeleafVersion}")
41+
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
4542
compile('org.projectlombok:lombok')
4643

4744
// tag::test-1[]
@@ -57,9 +54,3 @@ dependencies {
5754
testCompile("org.seleniumhq.selenium:selenium-java")
5855
// end::test-4[]
5956
}
60-
61-
dependencyManagement {
62-
imports {
63-
mavenBom "io.projectreactor:reactor-bom:Aluminium-SR1"
64-
}
65-
}

0 commit comments

Comments
 (0)