Author: sseifert
Date: Tue Dec 6 22:33:24 2016
New Revision: 1772982
URL: http://svn.apache.org/viewvc?rev=1772982&view=rev
Log:
SLING-6370 slingstart: start goal failes if not executed together with install
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java?rev=1772982&r1=1772981&r2=1772982&view=diff
==============================================================================
---
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
(original)
+++
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
Tue Dec 6 22:33:24 2016
@@ -402,11 +402,18 @@ public class StartMojo extends AbstractM
// If the current project is a slingstart project, use its JAR artifact
if
(this.project.getPackaging().equals(BuildConstants.PACKAGING_SLINGSTART)) {
- final File jarFile = project.getArtifact().getFile();
- if (jarFile.exists()) {
+ File jarFile = project.getArtifact().getFile();
+ if (jarFile != null && jarFile.exists()) {
getLog().info("Using launchpad jar being generated as this
project's primary artifact: '" + jarFile + "'!");
return jarFile;
}
+ else {
+ jarFile = new File(project.getBuild().getDirectory(),
project.getBuild().getFinalName() + ".jar");
+ if (jarFile.exists()) {
+ getLog().info("Using launchpad jar being generated as this
project's primary artifact: '" + jarFile + "'!");
+ return jarFile;
+ }
+ }
}
// In case there was a provisioning model found but this is not a
slingstart project, the JAR might be attached already through goal "package"
