This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag slingstart-maven-plugin-1.5.0 in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit e0e89f2f0ee472dcf936062b2736d2e51bf4ebb6 Author: Carsten Ziegeler <[email protected]> AuthorDate: Tue Nov 8 07:59:05 2016 +0000 SLING-6068 : slingstart-maven-plugin: Allow to start a quickstart JAR based on a provisioning model even for non slingstart packagings git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1768640 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/maven/slingstart/PackageMojo.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java index de1bb05..53df7db 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java +++ b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java @@ -76,7 +76,12 @@ public class PackageMojo extends AbstractSlingStartMojo { final Manifest mf = new Manifest(fis); // make sure this filename does not conflict with any other project artifacts (primary or secondary) - final File outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".standalonelaunchpad.jar"); + final File outputFile; + if ( BuildConstants.PACKAGING_SLINGSTART.equals(project.getPackaging()) ) { + outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".jar"); + } else { + outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".standalonelaunchpad.jar"); + } final JarArchiverHelper helper = new JarArchiverHelper(jarArchiver, this.project, outputFile, mf); helper.addDirectory(buildOutputDirectory, null, EXCLUDES_MANIFEST); @@ -107,7 +112,12 @@ public class PackageMojo extends AbstractSlingStartMojo { final File buildOutputDirectory = new File(buildDirectory, BuildConstants.WEBAPP_OUTDIR); // make sure this filename does not conflict with any other project artifacts (primary or secondary) - final File outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".webapplaunchpad.war"); + final File outputFile; + if ( BuildConstants.PACKAGING_SLINGSTART.equals(project.getPackaging()) ) { + outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".war"); + } else { + outputFile = new File(buildDirectory, this.project.getArtifactId() + "-" + this.project.getVersion() + ".webapplaunchpad.war"); + } final JarArchiverHelper helper = new JarArchiverHelper(this.jarArchiver, this.project, outputFile); helper.addDirectory(buildOutputDirectory, null, EXCLUDES_MANIFEST); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
