#36: Created-by entry does not reflect who created the JAR

This closes #36

Author: michael-o

src/main/java/org/codehaus/plexus/archiver/jar/JdkManifestFactory.java

@@ -16,10 +16,13 @@
  *  limitations under the License.
  */
 
+import java.io.InputStream;
 import java.util.Map;
+import java.util.Properties;
 import java.util.jar.Attributes;
 
 import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.util.PropertyUtils;
 
 /**
  * Not part of any public API
@@ -32,9 +35,21 @@ public static java.util.jar.Manifest getDefaultManifest()
     {
         final java.util.jar.Manifest defaultManifest = new java.util.jar.Manifest();
         defaultManifest.getMainAttributes().putValue( "Manifest-Version", "1.0" );
-        defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
-                                                      "java.vm.version" ) + " (" + System.getProperty(
-                                                          "java.vm.vendor" ) + ")" );
+
+        String createdBy = "Plexus Archiver";
+
+        InputStream inputStream = JdkManifestFactory.class.getResourceAsStream( "/META-INF/"
+            + "maven/org.codehaus.plexus/plexus-archiver/pom.properties" );
+        Properties properties = PropertyUtils.loadProperties( inputStream );
+        if ( properties != null )
+        {
+            String plexusArchiverVersion = properties.getProperty( "version" );
+            if ( plexusArchiverVersion != null )
+            {
+                createdBy += " " + plexusArchiverVersion;
+            }
+        }
+        defaultManifest.getMainAttributes().putValue( "Created-By", createdBy );
 
         return defaultManifest;
     }

src/main/java/org/codehaus/plexus/archiver/jar/Manifest.java

@@ -30,11 +30,13 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
 import java.util.jar.Attributes;
 
 import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.util.PropertyUtils;
 
 /**
  * Holds the data of a jar manifest.
@@ -739,9 +741,21 @@ public static Manifest getDefaultManifest()
     {
         final Manifest defaultManifest = new Manifest();
         defaultManifest.getMainAttributes().putValue( "Manifest-Version", "1.0" );
-        defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
-                                                      "java.vm.version" ) + " (" + System.getProperty(
-                                                          "java.vm.vendor" ) + ")" );
+
+        String createdBy = "Plexus Archiver";
+
+        InputStream inputStream = Manifest.class.getResourceAsStream( "/META-INF/"
+            + "maven/org.codehaus.plexus/plexus-archiver/pom.properties" );
+        Properties properties = PropertyUtils.loadProperties( inputStream );
+        if ( properties != null )
+        {
+            String plexusArchiverVersion = properties.getProperty( "version" );
+            if ( plexusArchiverVersion != null )
+            {
+                createdBy += " " + plexusArchiverVersion;
+            }
+        }
+        defaultManifest.getMainAttributes().putValue( "Created-By", createdBy );
 
         return defaultManifest;
     }