Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-40818
This commit is contained in:
Scott Frederick
2024-05-17 11:41:23 -05:00
parent 7e74577d21 70aceb21eb
commit 7f2b917851
61 changed files with 64 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java
View File

@@ -247,9 +247,8 @@ class BuildImageTests extends AbstractArchiveIntegrationTests {
.goals("package")
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
.systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1")
.systemProperty("spring-boot.build-image.builder",
"projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2")
.systemProperty("spring-boot.build-image.runImage", "projects.registry.vmware.com/springboot/run:tiny-cnb")
.systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1")
.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-jammy-tiny")
.systemProperty("spring-boot.build-image.createdDate", "2020-07-01T12:34:56Z")
.systemProperty("spring-boot.build-image.applicationDirectory", "/application")
.execute((project) -> {

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<applicationDirectory>/application</applicationDirectory>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<buildpacks>
<buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack>
</buildpacks>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<buildWorkspace>
<bind>
<source>${java.io.tmpdir}/junit-image-cache-${test-build-id}-work</source>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<bindings>
<binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding>
</bindings>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<env>
<FORCE_FAILURE>true</FORCE_FAILURE>
</env>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<buildCache>
<volume>
<name>build-cache-volume1</name>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml
View File

@@ -45,7 +45,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml
View File

@@ -39,7 +39,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml
View File

@@ -29,7 +29,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml
View File

@@ -19,7 +19,7 @@
<version>@project.version@</version>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</plugin>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<createdDate>2020-07-01T12:34:56Z</createdDate>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<createdDate>now</createdDate>
</image>
</configuration>

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml
View File

@@ -23,8 +23,8 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<runImage>projects.registry.vmware.com/springboot/run:tiny-cnb</runImage>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<runImage>paketobuildpacks/run-jammy-tiny</runImage>
</image>
</configuration>
</execution>

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml
View File

@@ -23,9 +23,9 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<buildpacks>
<buildpack>urn:cnb:builder:spring-boot/test-info</buildpack>
<buildpack>urn:cnb:builder:spring-boot/spring-boot-test-info</buildpack>
</buildpacks>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<name>example.com/test/build-image:${project.version}</name>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<env>
<EMPTY_KEY></EMPTY_KEY>
</env>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml
View File

@@ -25,7 +25,7 @@
<configuration>
<finalName>final-name</finalName>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml
View File

@@ -31,7 +31,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<network>none</network>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<publish>true</publish>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-security-opts/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<security-options/>
</image>
</configuration>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<tags>
<tag>${project.artifactId}:latest</tag>
</tags>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-volume-caches/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
<buildWorkspace>
<volume>
<name>cache-${test-build-id}.work</name>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml
View File

@@ -24,7 +24,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml
View File

@@ -29,7 +29,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml
View File

@@ -26,7 +26,7 @@
<configuration>
<layout>ZIP</layout>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</plugin>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml
View File

@@ -23,7 +23,7 @@
</goals>
<configuration>
<image>
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2</builder>
<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
</image>
</configuration>
</execution>