aligning libs parameter of distribution mojo in pour mojo
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/asciidoc/index.adoc b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/asciidoc/index.adoc
index a5f2f61..f10ba34 100644
--- a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/asciidoc/index.adoc
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/asciidoc/index.adoc
@@ -28,6 +28,7 @@
|===
|Name|Type|Property|Default|Description
|dependencyScopes|Collection<String>|winegrower.dependencyScopes|provided,compile,system,runtime|which scopes to includes to build the deployment classloader.
+|libs|Collection<String>|winegrower.libs|-|List of coordinates (`groupId:artifactId:version[:classifier[:type]]`) to add in the ripener deployment.
|jarFilter|String|winegrower.jarFilter|-|custom `Predicate<String>` implementation to use as jar filter in the `Ripener.Configuration`.
|manifestContributors|Collection<String>|winegrower.manifestContributors|-|All manifets contributors to use for the `Ripener.Configuration`.
|scanningExcludes|Collection<String>|winegrower.scanningExcludes|-|All exclusions to use for the `Ripener.Configuration`.
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/DistributionMojo.java b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/DistributionMojo.java
index b5890f9..b06c9a8 100644
--- a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/DistributionMojo.java
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/DistributionMojo.java
@@ -13,45 +13,24 @@
*/
package org.apache.winegrower.extension.build.maven;
-import static java.util.Optional.ofNullable;
-import static java.util.stream.Collectors.toList;
-import static org.apache.maven.plugins.annotations.ResolutionScope.RUNTIME_PLUS_SYSTEM;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Stream;
-
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.DefaultDependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionException;
-import org.apache.maven.project.DependencyResolutionRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.project.ProjectDependenciesResolver;
-import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
import org.apache.winegrower.extension.build.common.Build;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.graph.DependencyVisitor;
-import org.eclipse.aether.impl.ArtifactResolver;
-import org.eclipse.aether.repository.LocalRepositoryManager;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactRequest;
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toList;
+import static org.apache.maven.plugins.annotations.ResolutionScope.RUNTIME_PLUS_SYSTEM;
@Mojo(name = "distribution", requiresDependencyResolution = RUNTIME_PLUS_SYSTEM)
-public class DistributionMojo extends AbstractMojo {
+public class DistributionMojo extends LibsMojo {
@Parameter(defaultValue = "${project}", readonly = true, required = true)
private MavenProject project;
@@ -73,9 +52,6 @@
@Parameter(property = "winegrower.conf", defaultValue = "src/main/winegrower/conf")
private String conf;
- @Parameter(property = "winegrower.libs")
- private Collection<String> libs;
-
@Parameter(property = "winegrower.no-root", defaultValue = "false")
private boolean skipArchiveRootFolder;
@@ -94,24 +70,6 @@
@Component
private MavenProjectHelper helper;
- @Component
- private ArtifactResolver resolver;
-
- @Component
- private RepositorySystem repositorySystem;
-
- @Component
- private ProjectDependenciesResolver dependenciesResolver;
-
- @Component
- private DependencyGraphBuilder graphBuilder;
-
- @Parameter(defaultValue = "${repositorySystemSession}")
- private RepositorySystemSession session;
-
- @Parameter(defaultValue = "${project.remoteProjectRepositories}")
- private List<RemoteRepository> remoteRepositories;
-
@Override
public void execute() {
new Build(new Build.Configuration(
@@ -127,78 +85,6 @@
}
}
- private Stream<File> collectTransitiveDependencies(final Dependency dependency) {
- final DependencyResolutionRequest request = new DefaultDependencyResolutionRequest();
- request.setMavenProject(new MavenProject() {{
- getDependencies().add(dependency);
- }});
- request.setRepositorySession(session);
- try {
- final Collection<File> files = new ArrayList<>();
- dependenciesResolver.resolve(request).getDependencyGraph().accept(new DependencyVisitor() {
- @Override
- public boolean visitEnter(final DependencyNode node) {
- return true;
- }
-
- @Override
- public boolean visitLeave(final DependencyNode node) {
- final org.eclipse.aether.artifact.Artifact artifact = node.getArtifact();
- files.add(artifact.getFile());
- return true;
- }
- });
- return files.stream();
- } catch (final DependencyResolutionException e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- private File resolve(final String group, final String artifact, final String version, final String classifier) {
- final DefaultArtifact art = new DefaultArtifact(group, artifact, classifier, "jar", version);
- final ArtifactRequest artifactRequest = new ArtifactRequest().setArtifact(art).setRepositories(remoteRepositories);
-
- final LocalRepositoryManager lrm = session.getLocalRepositoryManager();
- art.setFile(new File(lrm.getRepository().getBasedir(), lrm.getPathForLocalArtifact(artifactRequest.getArtifact())));
-
- try {
- final ArtifactResult result = repositorySystem.resolveArtifact(session, artifactRequest);
- if (result.isMissing()) {
- throw new IllegalStateException("Can't find commons-cli, please add it to the pom.");
- }
- return result.getArtifact().getFile();
- } catch (final ArtifactResolutionException e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
- }
-
- private Stream<File> collectLibs() {
- return ofNullable(libs)
- .map(value -> value.stream().flatMap(l -> {
- final boolean transitive = l.endsWith("?transitive");
- final String coords = transitive ? l.substring(0, l.length() - "?transitive".length()) : l;
- final String[] c = coords.split(":");
- if (c.length < 3 || c.length > 5) {
- throw new IllegalArgumentException("libs syntax is groupId:artifactId:version[:classifier][:type[?transitive]]");
- }
- if (!transitive) {
- return Stream.of(resolve(c[0], c[1], c[2], c.length == 4 ? c[3] : ""));
- } else {
- return collectTransitiveDependencies(new Dependency() {{
- setGroupId(c[0]);
- setArtifactId(c[1]);
- setVersion(c[2]);
- if (c.length == 4 && !"-".equals(c[3])) {
- setClassifier(c[3]);
- }
- if (c.length == 5) {
- setType(c[4]);
- }
- }});
- }
- }).filter(it -> !it.getName().endsWith(".pom")))
- .orElseGet(Stream::empty);
- }
private Collection<File> collectJars() {
return Stream.concat(Stream.concat(
collectDependencies(),
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/LibsMojo.java b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/LibsMojo.java
new file mode 100644
index 0000000..a07e7d9
--- /dev/null
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/LibsMojo.java
@@ -0,0 +1,140 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.winegrower.extension.build.maven;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.DefaultDependencyResolutionRequest;
+import org.apache.maven.project.DependencyResolutionException;
+import org.apache.maven.project.DependencyResolutionRequest;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectDependenciesResolver;
+import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.DependencyVisitor;
+import org.eclipse.aether.impl.ArtifactResolver;
+import org.eclipse.aether.repository.LocalRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactRequest;
+import org.eclipse.aether.resolution.ArtifactResolutionException;
+import org.eclipse.aether.resolution.ArtifactResult;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static java.util.Optional.ofNullable;
+
+public abstract class LibsMojo extends AbstractMojo {
+ @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+ private RepositorySystemSession session;
+
+ @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true)
+ private List<RemoteRepository> remoteRepositories;
+
+ @Component
+ private RepositorySystem repositorySystem;
+
+ @Component
+ private ArtifactResolver resolver;
+
+ @Component
+ private ProjectDependenciesResolver dependenciesResolver;
+
+ @Component
+ private DependencyGraphBuilder graphBuilder;
+
+ @Parameter(property = "winegrower.libs")
+ private Collection<String> libs;
+
+ protected Stream<File> collectLibs() {
+ return ofNullable(libs)
+ .map(value -> value.stream().flatMap(l -> {
+ final boolean transitive = l.endsWith("?transitive");
+ final String coords = transitive ? l.substring(0, l.length() - "?transitive".length()) : l;
+ final String[] c = coords.split(":");
+ if (c.length < 3 || c.length > 5) {
+ throw new IllegalArgumentException("libs syntax is groupId:artifactId:version[:classifier][:type[?transitive]]");
+ }
+ if (!transitive) {
+ return Stream.of(resolve(c[0], c[1], c[2], c.length == 4 ? c[3] : ""));
+ } else {
+ return collectTransitiveDependencies(new Dependency() {{
+ setGroupId(c[0]);
+ setArtifactId(c[1]);
+ setVersion(c[2]);
+ if (c.length == 4 && !"-".equals(c[3])) {
+ setClassifier(c[3]);
+ }
+ if (c.length == 5) {
+ setType(c[4]);
+ }
+ }});
+ }
+ }).filter(it -> !it.getName().endsWith(".pom")))
+ .orElseGet(Stream::empty);
+ }
+
+ protected Stream<File> collectTransitiveDependencies(final Dependency dependency) {
+ final DependencyResolutionRequest request = new DefaultDependencyResolutionRequest();
+ request.setMavenProject(new MavenProject() {{
+ getDependencies().add(dependency);
+ }});
+ request.setRepositorySession(session);
+ try {
+ final Collection<File> files = new ArrayList<>();
+ dependenciesResolver.resolve(request).getDependencyGraph().accept(new DependencyVisitor() {
+ @Override
+ public boolean visitEnter(final DependencyNode node) {
+ return true;
+ }
+
+ @Override
+ public boolean visitLeave(final DependencyNode node) {
+ final org.eclipse.aether.artifact.Artifact artifact = node.getArtifact();
+ files.add(artifact.getFile());
+ return true;
+ }
+ });
+ return files.stream();
+ } catch (final DependencyResolutionException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ protected File resolve(final String group, final String artifact, final String version, final String classifier) {
+ final DefaultArtifact art = new DefaultArtifact(group, artifact, classifier, "jar", version);
+ final ArtifactRequest artifactRequest = new ArtifactRequest().setArtifact(art).setRepositories(remoteRepositories);
+
+ final LocalRepositoryManager lrm = session.getLocalRepositoryManager();
+ art.setFile(new File(lrm.getRepository().getBasedir(), lrm.getPathForLocalArtifact(artifactRequest.getArtifact())));
+
+ try {
+ final ArtifactResult result = repositorySystem.resolveArtifact(session, artifactRequest);
+ if (result.isMissing()) {
+ throw new IllegalStateException("Can't find commons-cli, please add it to the pom.");
+ }
+ return result.getArtifact().getFile();
+ } catch (final ArtifactResolutionException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java
index 43b5b1e..182b86e 100644
--- a/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java
+++ b/winegrower-extension/winegrower-build/winegrower-maven-plugin/src/main/java/org/apache/winegrower/extension/build/maven/PourMojo.java
@@ -14,7 +14,6 @@
package org.apache.winegrower.extension.build.maven;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -40,7 +39,7 @@
import static org.apache.maven.plugins.annotations.ResolutionScope.RUNTIME_PLUS_SYSTEM;
@Mojo(name = "pour", requiresDependencyResolution = RUNTIME_PLUS_SYSTEM)
-public class PourMojo extends AbstractMojo {
+public class PourMojo extends LibsMojo {
@Parameter(property = "winegrower.workDir", defaultValue = "${project.build.directory}/winegrower/workdir")
private File workDir;
@@ -113,12 +112,15 @@
}
private ClassLoader createClassLoader(final ClassLoader parent) {
- final List<File> jars = Stream.concat(project.getArtifacts().stream()
- .filter(a -> !((dependencyScopes == null && !(Artifact.SCOPE_COMPILE.equals(
- a.getScope()) || Artifact.SCOPE_RUNTIME.equals(
- a.getScope()))) || (dependencyScopes != null && !dependencyScopes.contains(
- a.getScope()))))
- .map(Artifact::getFile), Stream.of(project.getBuild().getOutputDirectory()).map(File::new).filter(File::exists))
+ final List<File> jars = Stream.concat(
+ collectLibs(),
+ Stream.concat(project.getArtifacts().stream()
+ .filter(a -> !((dependencyScopes == null && !(Artifact.SCOPE_COMPILE.equals(
+ a.getScope()) || Artifact.SCOPE_RUNTIME.equals(
+ a.getScope()))) || (dependencyScopes != null && !dependencyScopes.contains(
+ a.getScope()))))
+ .map(Artifact::getFile),
+ Stream.of(project.getBuild().getOutputDirectory()).map(File::new).filter(File::exists)))
.collect(toList());
final List<URL> urls = jars.stream().map(file -> {
try {
@@ -127,6 +129,9 @@
throw new IllegalArgumentException(e);
}
}).collect(toList());
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Startup classpath: " + jars);
+ }
final boolean excludeOsgi = jars.stream()
.anyMatch(it -> it.getName().startsWith("org.osgi.") || it.getName().startsWith("osgi."));
final boolean hasWinegrower = jars.stream()
