Skip to content

Avoid copying session.projectBuildingRequest unless overriding something #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
basil merged 1 commit into from
Mar 22, 2022
Merged

Avoid copying session.projectBuildingRequest unless overriding something #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import hudson.util.VersionNumber;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.AbstractMojo;
Expand All @@ -15,8 +14,6 @@
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;

import java.util.List;

/**
* Mojos that need to figure out the Jenkins version it's working with.
*
Expand Down Expand Up @@ -50,17 +47,6 @@ public abstract class AbstractJenkinsMojo extends AbstractMojo {
@Parameter
private String jenkinsCoreVersionOverride;


/**
* List of Remote Repositories used by the resolver
*/
@Parameter(defaultValue = "${project.remoteArtifactRepositories}",readonly = true, required = true)
protected List<ArtifactRepository> remoteRepos;

@Component
@Parameter(defaultValue = "${localRepository}", readonly = true, required = true)
protected ArtifactRepository localRepository;

@Component
protected ArtifactFactory artifactFactory;

Expand Down Expand Up @@ -109,8 +95,6 @@ protected MavenArtifact wrap(Artifact a) {
artifactResolver,
artifactFactory,
projectBuilder,
remoteRepos,
localRepository,
session);
}
}
17 changes: 1 addition & 16 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import hudson.util.VersionNumber;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.execution.MavenSession;
Expand Down Expand Up @@ -33,8 +32,6 @@
public class MavenArtifact implements Comparable<MavenArtifact> {
public final ArtifactFactory artifactFactory;
public final ProjectBuilder builder;
public final List<ArtifactRepository> remoteRepositories;
public final ArtifactRepository localRepository;
public final Artifact artifact;
public final ArtifactResolver resolver;
public final MavenSession session;
Expand All @@ -44,23 +41,17 @@ public MavenArtifact(
ArtifactResolver resolver,
ArtifactFactory artifactFactory,
ProjectBuilder builder,
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
MavenSession session) {
this.artifact = artifact;
this.resolver = resolver;
this.artifactFactory = artifactFactory;
this.builder = builder;
this.remoteRepositories = Objects.requireNonNull(remoteRepositories);
this.localRepository = localRepository;
this.session = Objects.requireNonNull(session);
}

public MavenProject resolvePom() throws ProjectBuildingException {
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
buildingRequest.setRemoteRepositories(remoteRepositories);
buildingRequest.setLocalRepository(localRepository);
buildingRequest.setProcessPlugins(false); // improve performance
return builder.build(artifact, buildingRequest).getProject();
}
Expand Down Expand Up @@ -129,11 +120,7 @@ public String getType() {
public File getFile() {
if (artifact.getFile()==null)
try {
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
buildingRequest.setRemoteRepositories(remoteRepositories);
buildingRequest.setLocalRepository(localRepository);
return resolver.resolveArtifact(buildingRequest, artifact).getArtifact().getFile();
return resolver.resolveArtifact(session.getProjectBuildingRequest(), artifact).getArtifact().getFile();
} catch (ArtifactResolverException e) {
throw new RuntimeException("Failed to resolve "+getId(),e);
}
Expand All @@ -151,8 +138,6 @@ public MavenArtifact getHpi() throws IOException {
resolver,
artifactFactory,
builder,
remoteRepositories,
localRepository,
session);
}

Expand Down
23 changes: 2 additions & 21 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.LifecycleDependencyResolver;
import org.apache.maven.model.Resource;
Expand All @@ -34,13 +33,11 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultDependencyResolutionRequest;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.DependencyResolutionException;
import org.apache.maven.project.DependencyResolutionRequest;
import org.apache.maven.project.DependencyResolutionResult;
import org.apache.maven.project.MavenProject;
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;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
Expand Down Expand Up @@ -152,12 +149,6 @@ public class RunMojo extends AbstractJettyMojo {
@Component
protected ArtifactFactory artifactFactory;

@Parameter(defaultValue = "${project.remoteArtifactRepositories}", readonly = true, required = true)
protected List<ArtifactRepository> remoteRepos;

@Parameter(defaultValue = "${localRepository}")
protected ArtifactRepository localRepository;

@Component
private ProjectDependenciesResolver dependenciesResolver;

Expand Down Expand Up @@ -332,12 +323,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {

if (webAppFile == null) {
Artifact jenkinsWarArtifact = getJenkinsWarArtifact();
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
buildingRequest.setRemoteRepositories(remoteRepos);
buildingRequest.setLocalRepository(localRepository);
try {
jenkinsWarArtifact = artifactResolver.resolveArtifact(buildingRequest, jenkinsWarArtifact).getArtifact();
jenkinsWarArtifact = artifactResolver.resolveArtifact(session.getProjectBuildingRequest(), jenkinsWarArtifact).getArtifact();
} catch (ArtifactResolverException x) {
throw new MojoExecutionException("Could not resolve " + jenkinsWarArtifact + ": " + x, x);
}
Expand Down Expand Up @@ -385,11 +372,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {

// find corresponding .hpi file
Artifact hpi = artifactFactory.createArtifact(a.getGroupId(),a.getArtifactId(),a.getVersion(),null,"hpi");
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
buildingRequest.setRemoteRepositories(getProject().getRemoteArtifactRepositories());
buildingRequest.setLocalRepository(localRepository);
hpi = artifactResolver.resolveArtifact(buildingRequest, hpi).getArtifact();
hpi = artifactResolver.resolveArtifact(session.getProjectBuildingRequest(), hpi).getArtifact();

// check recursive dependency. this is a rare case that happens when we split out some things from the core
// into a plugin
Expand Down Expand Up @@ -844,8 +827,6 @@ protected MavenArtifact wrap(Artifact a) {
artifactResolver,
artifactFactory,
projectBuilder,
getProject().getRemoteArtifactRepositories(),
localRepository,
session);
}

Expand Down
8 changes: 1 addition & 7 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/WarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Zip;
Expand Down Expand Up @@ -86,11 +84,7 @@ public void execute() throws MojoExecutionException {

// find corresponding .hpi file
Artifact hpi = artifactFactory.createArtifact(a.getGroupId(),a.getArtifactId(),a.getVersion(),null,"hpi");
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
buildingRequest.setRemoteRepositories(getProject().getRemoteArtifactRepositories());
buildingRequest.setLocalRepository(localRepository);
hpi = artifactResolver.resolveArtifact(buildingRequest, hpi).getArtifact();
hpi = artifactResolver.resolveArtifact(session.getProjectBuildingRequest(), hpi).getArtifact();

if (hpi.getFile().isDirectory())
throw new UnsupportedOperationException(hpi.getFile()+" is a directory and not packaged yet. this isn't supported");
Expand Down