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

Polish "Use NBT plugin version from gradle.properties in image tests"

Browse Source 
See gh-32643
This commit is contained in:
Scott Frederick
2022-10-13 11:26:55 -05:00
parent 42ab82c0b1
commit 3ea18f07fa
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
View File

@@ -17,7 +17,6 @@
package org.springframework.boot.image.paketo;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
@@ -25,7 +24,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.jar.Attributes;
@@ -73,19 +71,11 @@ class PaketoBuilderTests {
void configureGradleBuild() throws IOException {
this.gradleBuild.scriptProperty("systemTestMavenRepository",
new File("build/system-test-maven-repository").getAbsoluteFile().toURI().toASCIIString());
this.gradleBuild.scriptProperty("nativeBuildToolsVersion", getNativeBuildToolsVersion());
this.gradleBuild.scriptPropertyFrom(new File("../../gradle.properties"), "nativeBuildToolsVersion");
this.gradleBuild.expectDeprecationMessages("BPL_SPRING_CLOUD_BINDINGS_ENABLED.*true.*Deprecated");
this.gradleBuild.expectDeprecationMessages("BOM table is deprecated");
}
private String getNativeBuildToolsVersion() throws IOException {
Properties gradleProperties = new Properties();
try (FileInputStream input = new FileInputStream("../../gradle.properties")) {
gradleProperties.load(input);
return gradleProperties.getProperty("nativeBuildToolsVersion");
}
}
@Test
void executableJarApp() throws Exception {
writeMainClass();