svn commit: r1774129 - in /sling/trunk/tooling/maven/slingstart-maven-plugin: pom.xml src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java

[cziegeler]

Author: cziegeler
Date: Wed Dec 14 07:54:53 2016
New Revision: 1774129

URL: http://svn.apache.org/viewvc?rev=1774129&view=rev
Log:
SLING-6393 : Set project final name as default model archive name. Apply patch 
from Roy Teeuwen

Modified:
    sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
    
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
    
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml?rev=1774129&r1=1774128&r2=1774129&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml Wed Dec 14 
07:54:53 2016
@@ -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>

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java?rev=1774129&r1=1774128&r2=1774129&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
 Wed Dec 14 07:54:53 2016
@@ -31,6 +31,7 @@ import org.apache.maven.plugin.MojoFailu
 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 @@ import org.apache.sling.provisioning.mod
     )
 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 @@ public class AttachModelArchive extends
         }
 
         // 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)) {

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java?rev=1774129&r1=1774128&r2=1774129&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
 Wed Dec 14 07:54:53 2016
@@ -32,9 +32,6 @@ public abstract class BuildConstants {
     // 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";