Skip to content

S
spring-boot
Commit 8b5f914b authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Revert "Merge branch '2.4.x'" 

This reverts commit 97b26b48, reversing
changes made to 6f9b1ed6.

See gh-25840
parent 58a9fb40
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 335 deletions
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle
View file @ 8b5f914b
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1" buildpacks = [ "paketo-buildpacks/java" ]
buildpacks = [ "spring-boot/test-info" ]
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle
View file @ 8b5f914b
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
buildpacks = [ "file://${projectDir}/buildpack/hello-world" ] buildpacks = [ "file://${projectDir}/buildpack/hello-world" ]
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle
View file @ 8b5f914b
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
buildpacks = [ "file://${projectDir}/hello-world.tgz" ] buildpacks = [ "file://${projectDir}/hello-world.tgz" ]
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle
View file @ 8b5f914b
...@@ -8,6 +8,6 @@ targetCompatibility = '1.8' ...@@ -8,6 +8,6 @@ targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
imageName = "example/test-image-custom" imageName = "example/test-image-custom"
builder = "springci/spring-boot-cnb-builder:0.0.1" builder = "paketobuildpacks/builder:full"
runImage = "paketobuildpacks/run:tiny-cnb" runImage = "paketobuildpacks/run:full-cnb"
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle
View file @ 8b5f914b
...@@ -8,5 +8,4 @@ targetCompatibility = '1.8' ...@@ -8,5 +8,4 @@ targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
imageName = "example/test-image-name" imageName = "example/test-image-name"
builder = "springci/spring-boot-cnb-builder:0.0.1"
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle
View file @ 8b5f914b
...@@ -9,7 +9,3 @@ bootBuildImage { ...@@ -9,7 +9,3 @@ bootBuildImage {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
}
\ No newline at end of file
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle → spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBindingContainingInvalidCertificate.gradle
View file @ 8b5f914b
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" ] bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" ]
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle
View file @ 8b5f914b
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1" environment = ["BP_JVM_VERSION": "13.9.9"]
environment = ["FORCE_FAILURE": "true"]
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle
View file @ 8b5f914b
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ] buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
} }
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle
View file @ 8b5f914b
...@@ -9,7 +9,3 @@ if (project.hasProperty('applyWarPlugin')) { ...@@ -9,7 +9,3 @@ if (project.hasProperty('applyWarPlugin')) {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
}
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml
View file @ 8b5f914b
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<buildpacks> <buildpacks>
<buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack> <buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack>
</buildpacks> </buildpacks>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml
View file @ 8b5f914b
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<bindings> <bindings>
<binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding> <binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding>
</bindings> </bindings>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml
View file @ 8b5f914b
...@@ -23,9 +23,8 @@ ...@@ -23,9 +23,8 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<env> <env>
<FORCE_FAILURE>true</FORCE_FAILURE> <BP_JVM_VERSION>13.9.9</BP_JVM_VERSION>
</env> </env>
</image> </image>
</configuration> </configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml
View file @ 8b5f914b
...@@ -43,11 +43,6 @@ ...@@ -43,11 +43,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml
View file @ 8b5f914b
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml
View file @ 8b5f914b
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml
View file @ 8b5f914b
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml deleted 100644 → 0
View file @ 58a9fb40
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.boot.maven.it</groupId>
<artifactId>build-image</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>@java.version@</maven.compiler.source>
<maven.compiler.target>@java.version@</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
<goal>build-image</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java deleted 100644 → 0
View file @ 58a9fb40
/*
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.test;
public class SampleApplication {
public static void main(String[] args) throws Exception {
System.out.println("Launched");
synchronized(args) {
args.wait(); // Prevent exit"
}
}
}
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml
View file @ 8b5f914b
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder> <builder>paketobuildpacks/builder:full</builder>
<runImage>paketobuildpacks/run:tiny-cnb</runImage> <runImage>paketobuildpacks/run:full-cnb</runImage>
</image> </image>
</configuration> </configuration>
</execution> </execution>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml
View file @ 8b5f914b
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<buildpacks> <buildpacks>
<buildpack>spring-boot/test-info</buildpack> <buildpack>gcr.io/paketo-buildpacks/bellsoft-liberica:latest</buildpack>
<buildpack>gcr.io/paketo-buildpacks/executable-jar:latest</buildpack>
<buildpack>gcr.io/paketo-buildpacks/spring-boot:latest</buildpack>
</buildpacks> </buildpacks>
</image> </image>
</configuration> </configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml
View file @ 8b5f914b
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<name>example.com/test/build-image:${project.version}</name> <name>example.com/test/build-image:${project.version}</name>
</image> </image>
</configuration> </configuration>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml
View file @ 8b5f914b
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<env> <env>
<EMPTY_KEY></EMPTY_KEY> <EMPTY_KEY></EMPTY_KEY>
</env> </env>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml
View file @ 8b5f914b
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
</goals> </goals>
<configuration> <configuration>
<finalName>final-name</finalName> <finalName>final-name</finalName>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml
View file @ 8b5f914b
...@@ -22,11 +22,6 @@ ...@@ -22,11 +22,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml
View file @ 8b5f914b
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml
View file @ 8b5f914b
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
src/spring-boot-builder/README.adoc deleted 100644 → 0
View file @ 58a9fb40
= Spring Boot Test Builder
This directory contains a Cloud Native Buildpacks https://buildpacks.io/docs/concepts/components/builder/[builder] and https://buildpacks.io/docs/concepts/components/buildpack/[buildpack] that is used by integration tests to verify the behavior of the Spring Boot build plugins.
== Creating the builder
* Install the https://buildpacks.io/docs/install-pack/[pack CLI]
* Authenticate to Docker Hub via `docker login` using the `springci` repository credentials
* Use `pack` to create the builder image and publish it to Docker Hub:
[source,bash]
----
$ cd builder
$ pack builder create springci/spring-boot-cnb-builder:0.0.1 --config builder.toml --publish
----
src/spring-boot-builder/builder/builder.toml deleted 100644 → 0
View file @ 58a9fb40
# Buildpacks to include in builder
[[buildpacks]]
id = "spring-boot/test-info"
version = "0.0.1"
uri = "../buildpacks/test-info"
# Order used for detection
[[order]]
[[order.group]]
id = "spring-boot/test-info"
version = "0.0.1"
# Stack that will be used by the builder
[stack]
id = "io.paketo.stacks.tiny"
build-image = "index.docker.io/paketobuildpacks/build:1.2.2-tiny-cnb"
run-image = "index.docker.io/paketobuildpacks/run:tiny-cnb"
run-image-mirrors = ["gcr.io/paketo-buildpacks/run:tiny-cnb"]
src/spring-boot-builder/buildpacks/test-info/bin/build deleted 100755 → 0
View file @ 58a9fb40
#!/usr/bin/env bash
set -eo pipefail
echo "---> Test Info buildpack building"
# INPUT ARGUMENTS
platform_dir=$2
env_dir=${platform_dir}/env
bindings_dir=${platform_dir}/bindings
if [[ -f ${env_dir}/FORCE_FAILURE ]]; then
echo "Forced builder failure"
exit 1
fi
if compgen -G "${env_dir}/*" > /dev/null; then
for var in ${env_dir}/*; do
echo "env: $(basename ${var})=$(<${var})"
done
fi
if compgen -G "${bindings_dir}/*" > /dev/null; then
for binding in ${bindings_dir}/*; do
for f in ${binding}/*; do
echo "binding: $(basename ${binding})/$(basename ${f})=$(<${f})"
done
done
fi
echo "---> Test Info buildpack done"
src/spring-boot-builder/buildpacks/test-info/bin/detect deleted 100755 → 0
View file @ 58a9fb40
#!/usr/bin/env bash
set -eo pipefail
# 1. CHECK IF APPLICABLE
if [[ ! -f META-INF/MANIFEST.MF ]]; then
exit 100
fi
# 2. GET ARGS
plan_path=$2
# 3. DECLARE DEPENDENCIES (OPTIONAL)
cat >> "${plan_path}" <<EOL
# Buildpack provides this dependency
#
# NOTE: The dependency is provided during the 'build' process.
#
[[provides]]
name = "test-info"
# Buildpack requires this dependency
#
# NOTE: Everything aside from 'name' is simply additional information that the providing buildpack can use to resolve
# the dependency.
#
[[requires]]
name = "test-info"
EOL
\ No newline at end of file
src/spring-boot-builder/buildpacks/test-info/buildpack.toml deleted 100644 → 0
View file @ 58a9fb40
# Buildpack API version
api = "0.2"
# Buildpack ID and metadata
[buildpack]
id = "spring-boot/test-info"
version = "0.0.1"
name = "Spring Boot Test Info Buildpack"
homepage = "https://github.com/spring-projects/spring-boot"
# Stacks that the buildpack will work with
[[stacks]]
id = "io.paketo.stacks.tiny"
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