Skip to content

Get optional plugins into hpi:run #43

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

Draft
KostyaSha wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Get optional plugins into hpi:run #43

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
41 changes: 38 additions & 3 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 @@ -23,6 +23,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
Expand Down Expand Up @@ -52,11 +53,13 @@
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
import java.util.jar.JarFile;
import java.util.logging.ConsoleHandler;
Expand Down Expand Up @@ -690,6 +693,7 @@ public void startJetty() throws MojoExecutionException {
*/
protected Set<Artifact> resolveDependencies(String scope) throws MojoExecutionException {
try {
final HashSet<Artifact> artifacts = new HashSet<>();
ArtifactResolutionResult result = artifactResolver.resolveTransitively(
getProject().getDependencyArtifacts(),
getProject().getArtifact(),
Expand All @@ -698,12 +702,43 @@ protected Set<Artifact> resolveDependencies(String scope) throws MojoExecutionEx
getProject().getRemoteArtifactRepositories(),
artifactMetadataSource,
new ScopeArtifactFilter(scope));
return result.getArtifacts();
artifacts.addAll(result.getArtifacts());

// hack to get optional deps into party
try {
for (Object node : result.getArtifactResolutionNodes()) {
if (node instanceof ResolutionNode) {
artifacts.addAll(recurse((ResolutionNode) node));
}
}
} catch (IOException e) {
e.printStackTrace();
}

return artifacts;
} catch (ArtifactNotFoundException e) {
throw new MojoExecutionException("Unable to copy dependency plugin",e);
throw new MojoExecutionException("Unable to copy dependency plugin", e);
} catch (ArtifactResolutionException e) {
throw new MojoExecutionException("Unable to copy dependency plugin",e);
throw new MojoExecutionException("Unable to copy dependency plugin", e);
}
}

private Set<Artifact> recurse(ResolutionNode node) throws IOException {
final HashSet<Artifact> artifacts = new HashSet<>();

try {
for (Iterator i = node.getChildrenIterator(); i.hasNext(); ) {
final ResolutionNode childArtifact = (ResolutionNode) i.next();
final MavenArtifact mavenArtifact = wrap(childArtifact.getArtifact());
if (mavenArtifact.isPlugin()) {
artifacts.add(childArtifact.getArtifact());
artifacts.addAll(recurse(childArtifact));
}
}
} catch (NullPointerException ignore) {
// node.getChildrenIterator() maybe null
}
return artifacts;
}

public Set<MavenArtifact> getProjectArtifacts() {
Expand Down