From c7f32bb8ee78e696404b3518fef8fd46994e53ee Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 11:59:40 +0100 Subject: [PATCH 1/8] Upgrade to API Guardian 1.1.2 Closes gh-36726 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index f5b92ef674..4924e97bf2 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -20,7 +20,7 @@ bom { ] } } - library("API Guardian", "1.1.0") { + library("API Guardian", "1.1.2") { group("org.apiguardian") { modules = [ "apiguardian-api" From d4f9532644ee72f258faf8dc634449d3cd37f02c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 11:59:45 +0100 Subject: [PATCH 2/8] Upgrade to Commons FileUpload 1.5 Closes gh-36727 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 4924e97bf2..c57b7371cf 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -41,7 +41,7 @@ bom { ] } } - library("Commons FileUpload", "1.4") { + library("Commons FileUpload", "1.5") { group("commons-fileupload") { modules = [ "commons-fileupload" From 599322c1541d9f0b690ce18a28c26f19657d45ec Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 11:59:50 +0100 Subject: [PATCH 3/8] Upgrade to Janino 3.1.10 Closes gh-36728 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index c57b7371cf..61acef8e50 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -55,7 +55,7 @@ bom { ] } } - library("Janino", "3.1.8") { + library("Janino", "3.1.10") { group("org.codehaus.janino") { imports = [ "janino" From 64463fe7ecb063f5e1488a8354ad498f9ce1fc16 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 11:59:55 +0100 Subject: [PATCH 4/8] Upgrade to Maven 3.9.4 Closes gh-36729 --- spring-boot-project/spring-boot-parent/build.gradle | 7 ++++--- .../spring-boot-maven-plugin/build.gradle | 3 +++ .../org/springframework/boot/maven/ProcessTestAotMojo.java | 7 ++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 61acef8e50..01229131a7 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -87,12 +87,13 @@ bom { ] } } - library("Maven", "3.6.3") { + library("Maven", "3.9.4") { group("org.apache.maven") { modules = [ + "maven-core", + "maven-model-builder", "maven-plugin-api", - "maven-resolver-provider", - "maven-settings-builder" + "maven-resolver-provider" ] } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index fc4022c970..af47c52f3f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -16,10 +16,12 @@ dependencies { compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations") compileOnly("org.sonatype.plexus:plexus-build-api") compileOnly("org.apache.maven.shared:maven-common-artifact-filters") { + exclude(group: "javax.annotation", module: "javax.annotation-api") exclude(group: "javax.enterprise", module: "cdi-api") exclude(group: "javax.inject", module: "javax.inject") } compileOnly("org.apache.maven:maven-plugin-api") { + exclude(group: "javax.annotation", module: "javax.annotation-api") exclude(group: "javax.enterprise", module: "cdi-api") exclude(group: "javax.inject", module: "javax.inject") } @@ -40,6 +42,7 @@ dependencies { intTestImplementation("org.testcontainers:junit-jupiter") mavenOptionalImplementation("org.apache.maven.plugins:maven-shade-plugin") { + exclude(group: "javax.annotation", module: "javax.annotation-api") exclude(group: "javax.enterprise", module: "cdi-api") exclude(group: "javax.inject", module: "javax.inject") } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java index a1b93ac3c2..9729c92bc5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java @@ -30,7 +30,6 @@ import java.util.Set; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.DefaultArtifactHandler; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.ResolutionErrorHandler; @@ -101,14 +100,16 @@ public class ProcessTestAotMojo extends AbstractAotMojo { /** * Local artifact repository used to resolve JUnit platform launcher jars. */ + @SuppressWarnings("deprecation") @Parameter(defaultValue = "${localRepository}", required = true, readonly = true) - private ArtifactRepository localRepository; + private org.apache.maven.artifact.repository.ArtifactRepository localRepository; /** * Remote artifact repositories used to resolve JUnit platform launcher jars. */ + @SuppressWarnings("deprecation") @Parameter(defaultValue = "${project.remoteArtifactRepositories}", required = true, readonly = true) - private List remoteRepositories; + private List remoteRepositories; @Component private RepositorySystem repositorySystem; From d76e8ad7d1c65c844ea26aafda1919e86fc5bfb4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 12:00:01 +0100 Subject: [PATCH 5/8] Upgrade to Maven Invoker 3.2.0 Closes gh-36730 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 01229131a7..17698c3d1d 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -104,7 +104,7 @@ bom { ] } } - library("Maven Invoker", "3.1.0") { + library("Maven Invoker", "3.2.0") { group("org.apache.maven.shared") { modules = [ "maven-invoker" From ce14c70fbd15ee2e9a82843231dec6132bd4a42f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 12:00:08 +0100 Subject: [PATCH 6/8] Upgrade to Maven Resolver 1.9.14 Closes gh-36731 --- .../spring-boot-parent/build.gradle | 2 +- .../classpath/ModifiedClassPathClassLoader.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 17698c3d1d..7b9d4785c1 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -118,7 +118,7 @@ bom { ] } } - library("Maven Resolver", "1.6.3") { + library("Maven Resolver", "1.9.14") { group("org.apache.maven.resolver") { modules = [ "maven-resolver-api", diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java index b32890d790..ce8b315590 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java @@ -42,7 +42,6 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.collection.CollectRequest; import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.impl.DefaultServiceLocator; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.ArtifactResult; @@ -230,11 +229,9 @@ final class ModifiedClassPathClassLoader extends URLClassLoader { private static List resolveCoordinates(String[] coordinates) { Exception latestFailure = null; - DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator(); - serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class); - serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class); - RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class); + RepositorySystem repositorySystem = createRepositorySystem(); DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); + session.setSystemProperties(System.getProperties()); LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository"); RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default", "https://repo.maven.apache.org/maven2") @@ -260,6 +257,15 @@ final class ModifiedClassPathClassLoader extends URLClassLoader { latestFailure); } + @SuppressWarnings("deprecation") + private static RepositorySystem createRepositorySystem() { + org.eclipse.aether.impl.DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator(); + serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class); + serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class); + RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class); + return repositorySystem; + } + private static List createDependencies(String[] allCoordinates) { List dependencies = new ArrayList<>(); for (String coordinate : allCoordinates) { From dc964642f0731f8e65557f7327303588059a411b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 12:00:13 +0100 Subject: [PATCH 7/8] Upgrade to MockK 1.13.5 Closes gh-36732 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 7b9d4785c1..794810ad29 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -138,7 +138,7 @@ bom { ] } } - library("MockK", "1.10.6") { + library("MockK", "1.13.5") { group("io.mockk") { modules = [ "mockk" From 7038eb4a7de2bf865032a266e1ccbc25aaf0592c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Aug 2023 12:00:19 +0100 Subject: [PATCH 8/8] Upgrade to Spock Framework 2.3-groovy-4.0 Closes gh-36733 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 794810ad29..3be560d514 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -180,7 +180,7 @@ bom { ] } } - library("Spock Framework", "2.2-M1-groovy-4.0") { + library("Spock Framework", "2.3-groovy-4.0") { group("org.spockframework") { imports = [ "spock-bom"