From 3d6fa5bec3c5be97f10c900fc45e46c86d0cb324 Mon Sep 17 00:00:00 2001
From: Scott Stamp <scottstamp851@gmail.com>
Date: Mon, 15 Oct 2018 19:56:32 -0230
Subject: [PATCH] Upgraded maven-assembly-plugin, removing deprecated
 ${artifactId}

---
 Extensions/AdminOnConnect/pom.xml      | 5 +++--
 Extensions/BlockReplacePackets/pom.xml | 5 +++--
 Extensions/SpeechColorizer/pom.xml     | 5 +++--
 G-Earth-UI/pom.xml                     | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Extensions/AdminOnConnect/pom.xml b/Extensions/AdminOnConnect/pom.xml
index a35aa52..bb56ca3 100644
--- a/Extensions/AdminOnConnect/pom.xml
+++ b/Extensions/AdminOnConnect/pom.xml
@@ -93,13 +93,14 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                     </archive>
-                    <finalName>${artifactId}</finalName>
+                    <finalName>${project.artifactId}</finalName>
                 </configuration>
             </plugin>
 
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -118,7 +119,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${artifactId}-Full</finalName>
+                    <finalName>${project.artifactId}-Full</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
             </plugin>
diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml
index 96bb0fe..ee5ddc5 100644
--- a/Extensions/BlockReplacePackets/pom.xml
+++ b/Extensions/BlockReplacePackets/pom.xml
@@ -93,12 +93,13 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                     </archive>
-                    <finalName>${artifactId}</finalName>
+                    <finalName>${project.artifactId}</finalName>
                 </configuration>
             </plugin>
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -117,7 +118,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${artifactId}-Full</finalName>
+                    <finalName>${project.artifactId}-Full</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
             </plugin>
diff --git a/Extensions/SpeechColorizer/pom.xml b/Extensions/SpeechColorizer/pom.xml
index eeda8be..c310987 100644
--- a/Extensions/SpeechColorizer/pom.xml
+++ b/Extensions/SpeechColorizer/pom.xml
@@ -93,12 +93,13 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                     </archive>
-                    <finalName>${artifactId}</finalName>
+                    <finalName>${project.artifactId}</finalName>
                 </configuration>
             </plugin>
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -117,7 +118,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${artifactId}-Full</finalName>
+                    <finalName>${project.artifactId}-Full</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
             </plugin>
diff --git a/G-Earth-UI/pom.xml b/G-Earth-UI/pom.xml
index af2ede1..b56ced6 100644
--- a/G-Earth-UI/pom.xml
+++ b/G-Earth-UI/pom.xml
@@ -87,6 +87,7 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5</version>
                 <executions>
                     <execution>
                         <phase>package</phase>