From 379f0b8e602da002f4f01f02fa2f777635990adf Mon Sep 17 00:00:00 2001
From: Craig Bryant <craig.bryant@hp.com>
Date: Wed, 4 Feb 2015 12:41:17 -0700
Subject: [PATCH] Make it so the shaded jar has a deterministic name

Use version 1.0.0 instead of 1.0 to be more consistent with other
packages

Fix the exclude filter for the 1.2 version of the shade plugin so
the jar can be used

Change-Id: I419320b04ae867886ccfcee7553846864e7e8781
---
 java/pom.xml              | 18 ++++++++++++------
 java/src/assembly/tar.xml |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index ff9f0177..1f871930 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,16 +4,20 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>monasca-persister</groupId>
+    <groupId>monasca</groupId>
     <artifactId>monasca-persister</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
+    <url>http://github.com/stackforge/monasca-persister</url>
+    <packaging>jar</packaging>
 
     <properties>
+        <mon.common.version>1.0.0-SNAPSHOT</mon.common.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <artifactNamedVersion>${project.name}-${project.version}-${timestamp}-${buildNumber}
+        <artifactNamedVersion>${project.artifactId}-${project.version}-${timestamp}-${buildNumber}
         </artifactNamedVersion>
-        <mon.common.version>1.0.0-SNAPSHOT</mon.common.version>
+        <shadedJarName>${project.artifactId}-${project.version}-shaded
+        </shadedJarName>
     </properties>
 
     <!--Needed for buildnumber-maven-plugin-->
@@ -120,7 +124,8 @@
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                     <filters>
                         <filter>
-                            <artifact>*:*</artifact>
+                            <!-- *:* can't be used for artifact because we are using an older shade plugin -->
+                            <artifact>org.eclipse.jetty.orbit:javax.servlet</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
                                 <exclude>META-INF/*.DSA</exclude>
@@ -145,6 +150,7 @@
                                     </mainClass>
                                 </transformer>
                             </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
                         </configuration>
                     </execution>
                 </executions>
@@ -223,7 +229,7 @@
                             <dataSet>
                                 <data>
                                     <type>file</type>
-                                    <src>${project.build.directory}/${artifactNamedVersion}.jar
+                                    <src>${project.build.directory}/${shadedJarName}.jar
                                     </src>
                                     <dst>/opt/monasca/monasca-persister.jar</dst>
                                 </data>
diff --git a/java/src/assembly/tar.xml b/java/src/assembly/tar.xml
index 432799b9..1c059af5 100644
--- a/java/src/assembly/tar.xml
+++ b/java/src/assembly/tar.xml
@@ -17,7 +17,7 @@
   </fileSets>
   <files>
     <file>
-      <source>${project.build.directory}/${artifactNamedVersion}.jar</source>
+      <source>${project.build.directory}/${shadedJarName}.jar</source>
       <outputDirectory>/</outputDirectory>
       <destName>monasca-persister.jar</destName>
     </file>