From 2eaad0585c4f044b56ec507b6b038b3b7dcdbc3c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 6 Oct 2025 21:20:47 +0100 Subject: [PATCH] Consistent configuration of docker-test-maven-repository --- .../spring-boot-launch-script-tests-app/build.gradle | 2 +- .../spring-boot-launch-script-tests-app/settings.gradle | 2 +- .../spring-boot-loader-tests-app/build.gradle | 2 +- .../spring-boot-loader-tests-app/settings.gradle | 2 +- .../spring-boot-loader-tests-signed-jar/build.gradle | 2 +- .../spring-boot-loader-tests-signed-jar/settings.gradle | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/build.gradle b/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/build.gradle index a3e805e90e2..1f39d3f484d 100644 --- a/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/build.gradle +++ b/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/build.gradle @@ -25,7 +25,7 @@ java { } repositories { - maven { url = new File("../docker-test-maven-repository").toURI() } + maven { url = layout.projectDirectory.dir("../docker-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/settings.gradle b/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/settings.gradle index 8f2eaa44c48..fa84f001ab3 100644 --- a/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/settings.gradle +++ b/integration-test/spring-boot-launch-script-integration-tests/spring-boot-launch-script-tests-app/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() } diff --git a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/build.gradle b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/build.gradle index 49111637aa7..2b9e7636865 100644 --- a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/build.gradle +++ b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/build.gradle @@ -25,7 +25,7 @@ java { } repositories { - maven { url "file:${rootDir}/../docker-test-maven-repository"} + maven { url = layout.projectDirectory.dir("../docker-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/settings.gradle b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/settings.gradle index 8f2eaa44c48..fa84f001ab3 100644 --- a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/settings.gradle +++ b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-app/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() } diff --git a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/build.gradle b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/build.gradle index f474bec3988..67051a52b7a 100644 --- a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/build.gradle +++ b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/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() } diff --git a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/settings.gradle b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/settings.gradle index 8f2eaa44c48..fa84f001ab3 100644 --- a/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/settings.gradle +++ b/integration-test/spring-boot-loader-integration-tests/spring-boot-loader-tests-signed-jar/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() }