From 67959c130946b1dba148048d1ef891935c87412a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 5 May 2026 12:10:31 -0700 Subject: [PATCH] Fix spring-boot-loader-tests-signed-jar-rsa forward merge issue See gh-50292 --- .../spring-boot-loader-tests-signed-jar-rsa/build.gradle | 4 ++-- .../spring-boot-loader-tests-signed-jar-rsa/settings.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/build.gradle b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/build.gradle index 4b559595245..2429fe485a2 100644 --- a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/build.gradle +++ b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/build.gradle @@ -27,7 +27,7 @@ java { } repositories { - maven { url "file:${rootDir}/../docker-test-maven-repository"} + maven { url = layout.projectDirectory.dir("../docker-test-maven-repository") } mavenCentral() spring.mavenRepositories() } @@ -43,7 +43,7 @@ tasks.register("bootJarUnpack", BootJar.class) { classpath = bootJar.classpath requiresUnpack '**/bcprov-jdk18on-*.jar' archiveClassifier.set("unpack") - targetJavaVersion = targetCompatibility + targetJavaVersion = java.targetCompatibility } build.dependsOn bootJarUnpack diff --git a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/settings.gradle b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/settings.gradle index 8f2eaa44c48..fa84f001ab3 100644 --- a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/settings.gradle +++ b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar-rsa/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { evaluate(new File("${gradle.parent.rootProject.rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this) repositories { - maven { url "file:${rootDir}/../docker-test-maven-repository"} + maven { url = layout.settingsDirectory.dir("../docker-test-maven-repository") } mavenCentral() spring.mavenRepositories() }