Skip to content

Commit e2d0b34

Browse files
wilkinsonawilkinsona
committed
Merge branch '2.7.x'
2 parents d43359e + 4459fb4 commit e2d0b34

File tree

60 files changed

+130
-130
lines changed

Some content is hidden

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

60 files changed

+130
-130
lines changed

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/getting-started/typical-plugins.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
apply(plugin = "io.spring.dependency-management")
88
// end::apply[]
99

10-
task("verify") {
10+
tasks.register("verify") {
1111
doLast {
1212
project.plugins.getPlugin(JavaPlugin::class)
1313
project.plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin::class)

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/managing-dependencies/custom-version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ the<DependencyManagementExtension>().apply {
2626
}
2727
}
2828

29-
task("slf4jVersion") {
29+
tasks.register("slf4jVersion") {
3030
doLast {
3131
println(project.the<DependencyManagementExtension>().managedVersions["org.slf4j:slf4j-api"])
3232
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::builder[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
builder = "mine/java-cnb-builder"
1313
runImage = "mine/java-cnb-run"
1414
}
1515
// end::builder[]
1616

17-
task bootBuildImageBuilder {
17+
tasks.register("bootBuildImageBuilder") {
1818
doFirst {
1919
println("builder=${tasks.bootBuildImage.builder}")
2020
println("runImage=${tasks.bootBuildImage.runImage}")

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-builder.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66
id("org.springframework.boot") version "{gradle-project-version}"
77
}
88

9-
tasks.getByName<BootJar>("bootJar") {
9+
tasks.named<BootJar>("bootJar") {
1010
mainClass.set("com.example.ExampleApplication")
1111
}
1212

1313
// tag::builder[]
14-
tasks.getByName<BootBuildImage>("bootBuildImage") {
14+
tasks.named<BootBuildImage>("bootBuildImage") {
1515
builder = "mine/java-cnb-builder"
1616
runImage = "mine/java-cnb-run"
1717
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-buildpacks.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
// tag::buildpacks[]
7-
bootBuildImage {
7+
tasks.named("bootBuildImage") {
88
buildpacks = ["file:///path/to/example-buildpack.tgz", "urn:cnb:builder:paketo-buildpacks/java"]
99
}
1010
// end::buildpacks[]
1111

12-
task bootBuildImageBuildpacks {
12+
tasks.register("bootBuildImageBuildpacks") {
1313
doFirst {
1414
bootBuildImage.buildpacks.each { reference -> println "$reference" }
1515
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-buildpacks.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// tag::buildpacks[]
9-
tasks.getByName<BootBuildImage>("bootBuildImage") {
9+
tasks.named<BootBuildImage>("bootBuildImage") {
1010
buildpacks = listOf("file:///path/to/example-buildpack.tgz", "urn:cnb:builder:paketo-buildpacks/java")
1111
}
1212
// end::buildpacks[]

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-caches.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::caches[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
buildCache {
1313
volume {
1414
name = "cache-${rootProject.name}.build"
@@ -22,7 +22,7 @@ bootBuildImage {
2222
}
2323
// end::caches[]
2424

25-
task bootBuildImageCaches {
25+
tasks.register("bootBuildImageCaches") {
2626
doFirst {
2727
bootBuildImage.buildCache.asCache().with { println "buildCache=$name" }
2828
bootBuildImage.launchCache.asCache().with { println "launchCache=$name" }

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-caches.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// tag::caches[]
9-
tasks.getByName<BootBuildImage>("bootBuildImage") {
9+
tasks.named<BootBuildImage>("bootBuildImage") {
1010
buildCache {
1111
volume {
1212
name = "cache-${rootProject.name}.build"

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-docker-auth-token.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::docker-auth-token[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
docker {
1313
builderRegistry {
1414
token = "9cbaf023786cd7..."
@@ -17,7 +17,7 @@ bootBuildImage {
1717
}
1818
// end::docker-auth-token[]
1919

20-
task bootBuildImageDocker {
20+
tasks.register("bootBuildImageDocker") {
2121
doFirst {
2222
println("token=${tasks.bootBuildImage.docker.builderRegistry.token}")
2323
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-docker-auth-token.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66
id("org.springframework.boot") version "{gradle-project-version}"
77
}
88

9-
tasks.getByName<BootJar>("bootJar") {
9+
tasks.named<BootJar>("bootJar") {
1010
mainClass.set("com.example.ExampleApplication")
1111
}
1212

1313
// tag::docker-auth-token[]
14-
tasks.getByName<BootBuildImage>("bootBuildImage") {
14+
tasks.named<BootBuildImage>("bootBuildImage") {
1515
docker {
1616
builderRegistry {
1717
token = "9cbaf023786cd7..."

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-docker-auth-user.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::docker-auth-user[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
docker {
1313
builderRegistry {
1414
username = "user"
@@ -20,7 +20,7 @@ bootBuildImage {
2020
}
2121
// end::docker-auth-user[]
2222

23-
task bootBuildImageDocker {
23+
tasks.register("bootBuildImageDocker") {
2424
doFirst {
2525
println("username=${tasks.bootBuildImage.docker.builderRegistry.username}")
2626
println("password=${tasks.bootBuildImage.docker.builderRegistry.password}")

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-docker-auth-user.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66
id("org.springframework.boot") version "{gradle-project-version}"
77
}
88

9-
tasks.getByName<BootJar>("bootJar") {
9+
tasks.named<BootJar>("bootJar") {
1010
mainClass.set("com.example.ExampleApplication")
1111
}
1212

1313
// tag::docker-auth-user[]
14-
tasks.getByName<BootBuildImage>("bootBuildImage") {
14+
tasks.named<BootBuildImage>("bootBuildImage") {
1515
docker {
1616
builderRegistry {
1717
username = "user"

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-docker-host.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::docker-host[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
docker {
1313
host = "tcp://192.168.99.100:2376"
1414
tlsVerify = true
@@ -17,7 +17,7 @@ bootBuildImage {
1717
}
1818
// end::docker-host[]
1919

20-
task bootBuildImageDocker {
20+
tasks.register("bootBuildImageDocker") {
2121
doFirst {
2222
println("host=${tasks.bootBuildImage.docker.host}")
2323
println("tlsVerify=${tasks.bootBuildImage.docker.tlsVerify}")

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-docker-host.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66
id("org.springframework.boot") version "{gradle-project-version}"
77
}
88

9-
tasks.getByName<BootJar>("bootJar") {
9+
tasks.named<BootJar>("bootJar") {
1010
mainClass.set("com.example.ExampleApplication")
1111
}
1212

1313
// tag::docker-host[]
14-
tasks.getByName<BootBuildImage>("bootBuildImage") {
14+
tasks.named<BootBuildImage>("bootBuildImage") {
1515
docker {
1616
host = "tcp://192.168.99.100:2376"
1717
isTlsVerify = true

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ plugins {
44
}
55

66
// tag::env[]
7-
bootBuildImage {
7+
tasks.named("bootBuildImage") {
88
environment = [
99
"HTTP_PROXY" : "http://proxy.example.com",
1010
"HTTPS_PROXY": "https://proxy.example.com"
1111
]
1212
}
1313
// end::env[]
1414

15-
task bootBuildImageEnvironment {
15+
tasks.register("bootBuildImageEnvironment") {
1616
doFirst {
1717
bootBuildImage.environment.each { name, value -> println "$name=$value" }
1818
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-proxy.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// tag::env[]
9-
tasks.getByName<BootBuildImage>("bootBuildImage") {
9+
tasks.named<BootBuildImage>("bootBuildImage") {
1010
environment = mapOf("HTTP_PROXY" to "http://proxy.example.com",
1111
"HTTPS_PROXY" to "https://proxy.example.com")
1212
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::env-runtime[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
environment = [
1313
"BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
1414
"BPE_APPEND_JAVA_TOOL_OPTIONS" : "-XX:+HeapDumpOnOutOfMemoryError"
1515
]
1616
}
1717
// end::env-runtime[]
1818

19-
task bootBuildImageEnvironment {
19+
tasks.register("bootBuildImageEnvironment") {
2020
doFirst {
2121
bootBuildImage.environment.each { name, value -> println "$name=$value" }
2222
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// tag::env-runtime[]
9-
tasks.getByName<BootBuildImage>("bootBuildImage") {
9+
tasks.named<BootBuildImage>("bootBuildImage") {
1010
environment = mapOf(
1111
"BPE_DELIM_JAVA_TOOL_OPTIONS" to " ",
1212
"BPE_APPEND_JAVA_TOOL_OPTIONS" to "-XX:+HeapDumpOnOutOfMemoryError"

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
// tag::env[]
7-
bootBuildImage {
7+
tasks.named("bootBuildImage") {
88
environment = ["BP_JVM_VERSION" : "8.*"]
99
}
1010
// end::env[]
1111

12-
task bootBuildImageEnvironment {
12+
tasks.register("bootBuildImageEnvironment") {
1313
doFirst {
1414
bootBuildImage.environment.each { name, value -> println "$name=$value" }
1515
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// tag::env[]
9-
tasks.getByName<BootBuildImage>("bootBuildImage") {
9+
tasks.named<BootBuildImage>("bootBuildImage") {
1010
environment = mapOf("BP_JVM_VERSION" to "8.*")
1111
}
1212
// end::env[]

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ plugins {
44
}
55

66
// tag::image-name[]
7-
bootBuildImage {
7+
tasks.named("bootBuildImage") {
88
imageName = "example.com/library/${project.name}"
99
}
1010
// end::image-name[]
1111

12-
task bootBuildImageName {
13-
doFirst {
14-
println(tasks.bootBuildImage.imageName)
15-
}
12+
tasks.register("bootBuildImageName") {
13+
doFirst {
14+
println(tasks.bootBuildImage.imageName)
15+
}
1616
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-name.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ plugins {
66
}
77

88
// tag::image-name[]
9-
tasks.getByName<BootBuildImage>("bootBuildImage") {
9+
tasks.named<BootBuildImage>("bootBuildImage") {
1010
imageName = "example.com/library/${project.name}"
1111
}
1212
// end::image-name[]
1313

1414
tasks.register("bootBuildImageName") {
15-
doFirst {
16-
println(tasks.getByName<BootBuildImage>("bootBuildImage").imageName)
17-
}
15+
doFirst {
16+
println(tasks.getByName<BootBuildImage>("bootBuildImage").imageName)
17+
}
1818
}

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
id 'org.springframework.boot' version '{gradle-project-version}'
44
}
55

6-
bootJar {
6+
tasks.named("bootJar") {
77
mainClass = 'com.example.ExampleApplication'
88
}
99

1010
// tag::publish[]
11-
bootBuildImage {
11+
tasks.named("bootBuildImage") {
1212
imageName = "docker.example.com/library/${project.name}"
1313
publish = true
1414
docker {
@@ -22,8 +22,8 @@ bootBuildImage {
2222
}
2323
// end::publish[]
2424

25-
task bootBuildImagePublish {
26-
doFirst {
27-
println(tasks.bootBuildImage.publish)
28-
}
25+
tasks.register("bootBuildImagePublish") {
26+
doFirst {
27+
println(tasks.bootBuildImage.publish)
28+
}
2929
}

0 commit comments

Comments
 (0)