From b4d8a9f64dd2d6bdb352a02e59edb3ae08a0b5ba Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 2 Jan 2025 15:35:41 +0000 Subject: [PATCH] Address system tests' deprecation warnings with Gradle 8.12 See gh-43496 --- .../PaketoBuilderTests-bootDistZipJarApp.gradle | 4 +++- .../PaketoBuilderTests-classDataSharingApp.gradle | 12 +++++++++--- .../PaketoBuilderTests-executableWarApp.gradle | 4 +++- .../image/paketo/PaketoBuilderTests-nativeApp.gradle | 4 +++- .../PaketoBuilderTests-plainDistZipJarApp.gradle | 4 +++- .../paketo/PaketoBuilderTests-plainWarApp.gradle | 4 +++- .../boot/image/paketo/PaketoBuilderTests.gradle | 4 +++- .../boot/image/paketo/settings.gradle | 4 +++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle index 78d1fa0e5b18..518254b7be5e 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle @@ -8,7 +8,9 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-classDataSharingApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-classDataSharingApp.gradle index 2941dac9874e..c22d34549910 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-classDataSharingApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-classDataSharingApp.gradle @@ -7,15 +7,21 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" } } mavenCentral() - maven { url 'https://repo.spring.io/milestone' } - maven { url 'https://repo.spring.io/snapshot' } + maven { + url = 'https://repo.spring.io/milestone' + } + maven { + url = 'https://repo.spring.io/snapshot' + } } dependencies { diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle index 70c2fb829bf5..bb1f1cbcccee 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle @@ -8,7 +8,9 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle index db91ed392cb0..2b3839020c68 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle @@ -9,7 +9,9 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle index c06a8fee24ed..c0ae9a898643 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle @@ -8,7 +8,9 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle index 29ef451f3b95..de62bba09943 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle @@ -8,7 +8,9 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle index 8c14e21a2299..7de3ef0910d7 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle @@ -7,7 +7,9 @@ plugins { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot" diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/settings.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/settings.gradle index 557a0234c4d8..45db2a2bf6c1 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/settings.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/settings.gradle @@ -3,7 +3,9 @@ pluginManagement { repositories { exclusiveContent { forRepository { - maven { url '{systemTestMavenRepository}' } + maven { + url = '{systemTestMavenRepository}' + } } filter { includeGroup "org.springframework.boot"