From 1ebc557bd5fcdd8031ad9fb59ccc1663560e7a8d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 6 Oct 2025 22:47:56 +0100 Subject: [PATCH] Consistent configuration of test repository URLs --- .../spring-boot-server-tests-app/build.gradle | 2 +- .../spring-boot-server-tests-app/settings.gradle | 2 +- .../spring-boot-sni-client-app/build.gradle | 2 +- .../spring-boot-sni-client-app/settings.gradle | 2 +- .../spring-boot-sni-reactive-app/build.gradle | 2 +- .../spring-boot-sni-reactive-app/settings.gradle | 2 +- .../spring-boot-sni-servlet-app/build.gradle | 2 +- .../spring-boot-sni-servlet-app/settings.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/build.gradle b/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/build.gradle index 28db4d64fa8..dee832949c0 100644 --- a/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/build.gradle +++ b/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/build.gradle @@ -29,7 +29,7 @@ java { } repositories { - maven { url "file:${rootDir}/../test-repository"} + maven { url = layout.projectDirectory.dir("../test-repository") } mavenCentral() spring.mavenRepositoriesExcludingBootGroup() } diff --git a/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/settings.gradle b/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/settings.gradle index 488caa3400b..9c6fb24e9bd 100644 --- a/integration-test/spring-boot-server-integration-tests/spring-boot-server-tests-app/settings.gradle +++ b/integration-test/spring-boot-server-integration-tests/spring-boot-server-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}/../test-repository"} + maven { url = layout.settingsDirectory.dir("../test-repository") } mavenCentral() spring.mavenRepositoriesExcludingBootGroup() } diff --git a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/build.gradle b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/build.gradle index 962c0a94ec8..8f1dff96801 100644 --- a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/build.gradle +++ b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/build.gradle @@ -25,7 +25,7 @@ java { } repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url = layout.projectDirectory.dir("../int-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/settings.gradle b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/settings.gradle index 6c05d024ece..d357f9e4f91 100644 --- a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-app/settings.gradle +++ b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-client-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}/../int-test-maven-repository"} + maven { url = layout.settingsDirectory.dir("../int-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/build.gradle b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/build.gradle index d69f630597c..6eca038631c 100644 --- a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/build.gradle +++ b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/build.gradle @@ -27,7 +27,7 @@ java { } repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url = layout.projectDirectory.dir("../int-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/settings.gradle b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/settings.gradle index 5bec4962e90..0722d512fb0 100644 --- a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-app/settings.gradle +++ b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-reactive-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}/../int-test-maven-repository"} + maven { url = layout.settingsDirectory.dir("../int-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/build.gradle b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/build.gradle index 7793bb00cac..788925a1454 100644 --- a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/build.gradle +++ b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/build.gradle @@ -27,7 +27,7 @@ java { } repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url = layout.projectDirectory.dir("../int-test-maven-repository") } mavenCentral() spring.mavenRepositories() } diff --git a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/settings.gradle b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/settings.gradle index 5bec4962e90..0722d512fb0 100644 --- a/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-app/settings.gradle +++ b/integration-test/spring-boot-sni-integration-tests/spring-boot-sni-servlet-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}/../int-test-maven-repository"} + maven { url = layout.settingsDirectory.dir("../int-test-maven-repository") } mavenCentral() spring.mavenRepositories() }