Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Maven 3.9.4

Browse Source 
Closes gh-36747
This commit is contained in:
Andy Wilkinson 2023-08-04 14:09:37 +01:00
parent f32e27f92e
commit 0c7c7ac8a9
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-parent/build.gradle
View File

@ -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"
]
}
}

7
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@ -16,10 +16,16 @@ 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-core") {
exclude(group: "javax.annotation", module: "javax.annotation-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 +46,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")
}

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/settings.xml
View File

@ -17,6 +17,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<checksumPolicy>ignore</checksumPolicy>
</repository>
<repository>
<id>spring-milestones</id>
@ -42,6 +43,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<checksumPolicy>ignore</checksumPolicy>
</pluginRepository>
</pluginRepositories>
</profile>

7
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java
View File

@ -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<ArtifactRepository> remoteRepositories;
private List<org.apache.maven.artifact.repository.ArtifactRepository> remoteRepositories;
@Component
private RepositorySystem repositorySystem;