Commit 06b26408 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #25454 from jnizet

* pr/25454:
  Update copyright year of changed file
  Fix property name in gradle plugin documentation

Closes gh-25454
parents aa032e09 ed1c68f5
...@@ -21,3 +21,9 @@ bootBuildImage { ...@@ -21,3 +21,9 @@ bootBuildImage {
} }
} }
// end::publish[] // end::publish[]
task bootBuildImagePublish {
doFirst {
println(tasks.bootBuildImage.publish)
}
}
...@@ -13,7 +13,7 @@ tasks.getByName<BootJar>("bootJar") { ...@@ -13,7 +13,7 @@ tasks.getByName<BootJar>("bootJar") {
// tag::publish[] // tag::publish[]
tasks.getByName<BootBuildImage>("bootBuildImage") { tasks.getByName<BootBuildImage>("bootBuildImage") {
imageName = "docker.example.com/library/${project.name}" imageName = "docker.example.com/library/${project.name}"
publish = true isPublish = true
docker { docker {
publishRegistry { publishRegistry {
username = "user" username = "user"
...@@ -24,3 +24,9 @@ tasks.getByName<BootBuildImage>("bootBuildImage") { ...@@ -24,3 +24,9 @@ tasks.getByName<BootBuildImage>("bootBuildImage") {
} }
} }
// end::publish[] // end::publish[]
tasks.register("bootBuildImagePublish") {
doFirst {
println(tasks.getByName<BootBuildImage>("bootBuildImage").isPublish)
}
}
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -242,6 +242,13 @@ class PackagingDocumentationTests { ...@@ -242,6 +242,13 @@ class PackagingDocumentationTests {
assertThat(result.getOutput()).contains("example.com/library/" + this.gradleBuild.getProjectDir().getName()); assertThat(result.getOutput()).contains("example.com/library/" + this.gradleBuild.getProjectDir().getName());
} }
@TestTemplate
void bootBuildImagePublish() throws IOException {
BuildResult result = this.gradleBuild.script("src/docs/gradle/packaging/boot-build-image-publish")
.build("bootBuildImagePublish");
assertThat(result.getOutput()).contains("true");
}
protected void jarFile(File file) throws IOException { protected void jarFile(File file) throws IOException {
try (JarOutputStream jar = new JarOutputStream(new FileOutputStream(file))) { try (JarOutputStream jar = new JarOutputStream(new FileOutputStream(file))) {
jar.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF")); jar.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment