From 189096515b7ef17bae554985800c7220db135c74 Mon Sep 17 00:00:00 2001
From: cristianciutea <cristi.ciutea@gmail.com>
Date: Wed, 8 Sep 2021 19:52:22 +0200
Subject: [PATCH] ci: fixed tarballs

---
 build/assembly/targz.xml | 14 +++++++-------
 build/assembly/zip.xml   |  8 +++++++-
 pom.xml                  |  7 ++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build/assembly/targz.xml b/build/assembly/targz.xml
index 4aaabb65..485e3734 100644
--- a/build/assembly/targz.xml
+++ b/build/assembly/targz.xml
@@ -22,12 +22,12 @@
                 <include>bin/${project.artifactId}</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.basedir}</directory>
-            <outputDirectory>/usr/</outputDirectory>
-            <includes>
-                <include>bin/${project.artifactId}.jar</include>
-            </includes>
-        </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>target/${project.artifactId}_${project.version}_noarch.jar</source>
+            <outputDirectory>usr/bin/</outputDirectory>
+            <destName>nrjmx.jar</destName>
+        </file>
+    </files>
 </assembly>
\ No newline at end of file
diff --git a/build/assembly/zip.xml b/build/assembly/zip.xml
index fb1888f8..05c94cea 100644
--- a/build/assembly/zip.xml
+++ b/build/assembly/zip.xml
@@ -14,8 +14,14 @@
                 <include>README*</include>
                 <include>LICENSE*</include>
                 <include>bin/${project.artifactId}.bat</include>
-                <include>bin/${project.artifactId}.jar</include>
             </includes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>target/${project.artifactId}_${project.version}_noarch.jar</source>
+            <outputDirectory>Program Files/New Relic/nrjmx/bin/</outputDirectory>
+            <destName>nrjmx.jar</destName>
+        </file>
+    </files>
 </assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 087168a7..75587d97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${project.artifactId}_linux_${project.version}_noarch</finalName>
+                    <finalName>${project.artifactId}_${project.version}_noarch</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
@@ -75,16 +75,17 @@
             </plugin>
             <plugin>
                 <groupId>com.coderplus.maven.plugins</groupId>
-                <artifactId>copy-rename-maven-plugin</artifactId>
+                    <artifactId>copy-rename-maven-plugin</artifactId>
                 <version>1.0</version>
                 <executions>
                     <execution>
                         <id>copy-file</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                            <sourceFile>target/${project.artifactId}_linux_${project.version}_noarch.jar
+                            <sourceFile>target/${project.artifactId}_${project.version}_noarch.jar
                             </sourceFile>
                             <destinationFile>bin/nrjmx.jar</destinationFile>
                         </configuration>