commit 8e0b8cd910617f439fff84ece83ae02b8f44aad6
author Carsten Ziegeler <cziegeler@apache.org> Wed Dec 14 07:54:53 2016 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Dec 14 07:54:53 2016 +0000
tree 9a115a9c77c61df0691e50f939cb0ece78425f9e
parent a4f4151502b51d7cb24b8abb3324342c2eacd3c0

SLING-6393 : Set project final name as default model archive name. Apply patch from Roy Teeuwen

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774129 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index aa08e1d..98220ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
        <dependency>
            <groupId>org.apache.sling</groupId>
            <artifactId>org.apache.sling.provisioning.model</artifactId>
-           <version>1.7.1-SNAPSHOT</version>
+           <version>1.8.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.apache.maven</groupId>

src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java

diff --git a/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java b/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
index a2d3025..c91b5dc 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
@@ -31,6 +31,7 @@
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.sling.provisioning.model.Artifact;
 import org.apache.sling.provisioning.model.Model;
@@ -48,6 +49,12 @@
     )
 public class AttachModelArchive extends AbstractSlingStartMojo {
 
+    /**
+     * The filename to be used for the generated model archive file.
+     */
+    @Parameter(defaultValue = "${project.build.finalName}")
+    private String modelArchiveName;
+
     @Component
     private ArtifactHandlerManager artifactHandlerManager;
 
@@ -69,7 +76,7 @@
         }
 
         // write the model archive
-        final File outputFile = new File(this.project.getBuild().getDirectory() + File.separatorChar + BuildConstants.MODEL_ARCHIVE_NAME);
+        final File outputFile = new File(this.project.getBuild().getDirectory() + File.separatorChar + modelArchiveName + "." + ModelArchiveWriter.DEFAULT_EXTENSION);
         outputFile.getParentFile().mkdirs();
 
         try ( final FileOutputStream fos = new FileOutputStream(outputFile)) {

src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java

diff --git a/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java b/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
index 62d00bd..3da52da 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
@@ -32,9 +32,6 @@
     // Model artifact name
     public static final String MODEL_ARTIFACT_NAME = "slingstart.txt";
 
-    // Model archive name
-    public static final String MODEL_ARCHIVE_NAME = "slingstart." + ModelArchiveWriter.DEFAULT_EXTENSION;
-
     // Types
 
     public static final String TYPE_JAR = "jar";