You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:26:52 UTC
[sling-slingstart-maven-plugin] 11/16: SLING-4889 : Provide a mojo
to create a maven like structure of the referenced artifacts
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit b239b9c5e887a297c7b9503cbe1745345b982a1c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 16 14:45:13 2015 +0000
SLING-4889 : Provide a mojo to create a maven like structure of the referenced artifacts
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1691412 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/slingstart/AbstractSlingStartMojo.java | 24 +++++++++++++++++-----
.../sling/maven/slingstart/PreparePackageMojo.java | 21 +++----------------
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
index 769e525..8323df6 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
@@ -24,6 +24,7 @@ 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.MavenProjectHelper;
+import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
/**
* Base class for all slingstart mojos.
@@ -52,23 +53,36 @@ public abstract class AbstractSlingStartMojo extends AbstractMojo {
*/
@Parameter(defaultValue="false")
protected boolean usePomVariables;
-
+
/**
- * If set to true, Artifact dependencies from provisioning file without explicit version are tried
+ * If set to true, Artifact dependencies from provisioning file without explicit version are tried
* to be resolved against the dependency versions from the Maven POM.
*/
@Parameter(defaultValue="false")
protected boolean usePomDependencies;
-
+
/**
* If set to true, an exception is throws when "usePomDependencies" is set to true and some
* dependency version could not be resolved in the Maven POM.
*/
@Parameter(defaultValue="false")
protected boolean allowUnresolvedPomDependencies;
-
+
protected File getTmpDir() {
return new File(this.project.getBuild().getDirectory(), "slingstart-tmp");
}
-
+
+ /**
+ * @return Resolving options to be used when building an effective provisioning model.
+ */
+ protected ResolverOptions getResolverOptions() {
+ ResolverOptions options = new ResolverOptions();
+ if (usePomVariables) {
+ options.variableResolver(new PomVariableResolver(project));
+ }
+ if (usePomDependencies) {
+ options.artifactVersionResolver(new PomArtifactVersionResolver(project, allowUnresolvedPomDependencies));
+ }
+ return options;
+ }
}
diff --git a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
index a5967af..8e3d5e1 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
@@ -43,7 +43,6 @@ import org.apache.sling.provisioning.model.Configuration;
import org.apache.sling.provisioning.model.Feature;
import org.apache.sling.provisioning.model.Model;
import org.apache.sling.provisioning.model.ModelConstants;
-import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
import org.apache.sling.provisioning.model.RunMode;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -99,20 +98,6 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
this.prepareWebapp(model);
}
- /**
- * @return Resolving options to be used when building an effective provisioning model.
- */
- protected ResolverOptions getResolverOptions() {
- ResolverOptions options = new ResolverOptions();
- if (usePomVariables) {
- options.variableResolver(new PomVariableResolver(project));
- }
- if (usePomDependencies) {
- options.artifactVersionResolver(new PomArtifactVersionResolver(project, allowUnresolvedPomDependencies));
- }
- return options;
- }
-
protected File getStandaloneOutputDirectory() {
return new File(this.project.getBuild().getOutputDirectory());
}
@@ -215,7 +200,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
throws MojoExecutionException{
for(final ArtifactGroup group : runMode.getArtifactGroups()) {
for(final org.apache.sling.provisioning.model.Artifact a : group) {
- final Artifact artifact = ModelUtils.getArtifact(this.project, this.mavenSession, this.artifactHandlerManager, this.resolver,
+ final Artifact artifact = ModelUtils.getArtifact(this.project, this.mavenSession, this.artifactHandlerManager, this.resolver,
a.getGroupId(), a.getArtifactId(), a.getVersion(), a.getType(), a.getClassifier());
final File artifactFile = artifact.getFile();
contentsMap.put(getPathForArtifact(group.getStartLevel(), artifactFile.getName(), runMode, isBoot), artifactFile);
@@ -467,7 +452,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
mainName,
alias);
}
-
+
/**
* Replace \${var} with ${var}
* @param text String with escaped variables
@@ -479,5 +464,5 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
}
return text.replaceAll("\\\\\\$", "\\$");
}
-
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.