diff --git a/pom.xml b/pom.xml index 88cc7a6b38..72f0987f17 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ UTF-8 8 jenkinsci/${project.artifactId} + 1.1.0 3.8.5 3.6.4 2.1.1 @@ -92,6 +93,16 @@ maven-shared-utils 3.3.4 + + org.eclipse.aether + aether-api + ${aether.version} + + + org.eclipse.aether + aether-util + ${aether.version} + @@ -113,6 +124,11 @@ 70.1 + + com.google.guava + guava + 31.1-jre + com.sun.codemodel codemodel @@ -128,6 +144,11 @@ sezpoz 1.13 + + org.apache.ant + ant + 1.10.12 + org.apache.maven maven-archiver @@ -187,23 +208,6 @@ version-number 1.9 - - - org.kohsuke.stapler - maven-stapler-plugin - 1.17 - - - - javax.servlet - servlet-api - - - org.kohsuke.stapler - stapler - - - org.kohsuke.stapler stapler-groovy @@ -284,25 +288,13 @@ - com.google.guava:guava - com.google.inject:guice - commons-beanutils:commons-beanutils - commons-codec:commons-codec commons-io:commons-io commons-lang:commons-lang org.apache.commons:commons-compress org.apache.commons:commons-lang3 - org.apache.httpcomponents:httpclient - org.apache.httpcomponents:httpcore - org.apache.maven.doxia:doxia-decoration-model - org.apache.maven:maven-project org.apache.maven.wagon:wagon-provider-api org.codehaus.plexus:plexus-container-default - org.eclipse.aether:aether-util - org.ow2.asm:asm org.slf4j:slf4j-api - xerces:xercesImpl - xml-apis:xml-apis diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java index 4365b513b6..e6efaf1b21 100644 --- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java +++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java @@ -11,8 +11,8 @@ import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.MavenProjectHelper; +import org.apache.maven.project.ProjectBuilder; import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; import java.util.List; @@ -68,7 +68,7 @@ public abstract class AbstractJenkinsMojo extends AbstractMojo { protected ArtifactResolver artifactResolver; @Component - protected MavenProjectBuilder projectBuilder; + protected ProjectBuilder projectBuilder; @Component protected MavenProjectHelper projectHelper; diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java index d7b252fcd4..b7ac5bad27 100644 --- a/src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java +++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java @@ -10,7 +10,7 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; @@ -32,7 +32,7 @@ */ public class MavenArtifact implements Comparable { public final ArtifactFactory artifactFactory; - public final MavenProjectBuilder builder; + public final ProjectBuilder builder; public final List remoteRepositories; public final ArtifactRepository localRepository; public final Artifact artifact; @@ -43,7 +43,7 @@ public MavenArtifact( Artifact artifact, ArtifactResolver resolver, ArtifactFactory artifactFactory, - MavenProjectBuilder builder, + ProjectBuilder builder, List remoteRepositories, ArtifactRepository localRepository, MavenSession session) { @@ -57,7 +57,12 @@ public MavenArtifact( } public MavenProject resolvePom() throws ProjectBuildingException { - return builder.buildFromRepository(artifact,remoteRepositories,localRepository); + ProjectBuildingRequest buildingRequest = + new DefaultProjectBuildingRequest(session.getProjectBuildingRequest()); + buildingRequest.setRemoteRepositories(remoteRepositories); + buildingRequest.setLocalRepository(localRepository); + buildingRequest.setProcessPlugins(false); // improve performance + return builder.build(artifact, buildingRequest).getProject(); } /** diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java index fd0f455460..9c99bee122 100644 --- a/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java +++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java @@ -39,7 +39,7 @@ import org.apache.maven.project.DependencyResolutionRequest; import org.apache.maven.project.DependencyResolutionResult; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.project.ProjectDependenciesResolver; import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; @@ -196,7 +196,7 @@ public class RunMojo extends AbstractJettyMojo { protected boolean consoleForceReload; @Component - protected MavenProjectBuilder projectBuilder; + protected ProjectBuilder projectBuilder; /** * Optional string that represents "groupId:artifactId" of Jenkins core jar.