svn commit: r1633368 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java

[rombert]

Author: rombert
Date: Tue Oct 21 13:06:33 2014
New Revision: 1633368

URL: http://svn.apache.org/r1633368
Log:
SLING-4081 - SlingStart Maven Plugin fails if the organization is not
defined in pom.xml

Handle missing organization in JarArchiverHelper

Modified:
    
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java?rev=1633368&r1=1633367&r2=1633368&view=diff
==============================================================================
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
 Tue Oct 21 13:06:33 2014
@@ -78,22 +78,27 @@ public class JarArchiverHelper {
             }
             outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_IMPLEMENTATION_BUILD,
                             project.getVersion()));
-            outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VENDOR,
-                            project.getOrganization().getName()));
             outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VERSION,
                             project.getVersion()));
-            outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_CREATED_BY,
-                            project.getOrganization().getName()));
-            outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_BUILT_BY,
-                            project.getOrganization().getName()));
+
+            String organizationName = project.getOrganization() != null ? 
project.getOrganization().getName() : null;
+            if ( organizationName != null ) {
+                outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VENDOR,
+                            organizationName));
+                outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_CREATED_BY,
+                            organizationName));
+                outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_BUILT_BY,
+                            organizationName));
+                outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_SPECIFICATION_VENDOR,
+                        organizationName));
+            }
+
             outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VENDOR_ID,
                             project.getGroupId()));
             outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_IMPLEMENTATION_TITLE,
                             project.getName()));
             outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_SPECIFICATION_TITLE,
                             project.getName()));
-            outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_SPECIFICATION_VENDOR,
-                            project.getOrganization().getName()));
             outManifest.addConfiguredAttribute(new 
Attribute(BuildConstants.ATTR_SPECIFICATION_VERSION,
                             project.getVersion()));