From 9749d8d3c8d4dc00e045e01e10bd110f5427feba Mon Sep 17 00:00:00 2001
From: Scott Stamp <scottstamp851@gmail.com>
Date: Sat, 13 Oct 2018 19:48:01 -0230
Subject: [PATCH] Fixed some Maven stuff

G-Earth build output is placed in /bin now
---
 Extensions/BlockReplacePackets/pom.xml | 25 ++++++++++
 Extensions/SpeechColorizer/pom.xml     | 23 +++++++++
 G-Earth-UI/pom.xml                     | 68 +++++++++++++-------------
 3 files changed, 83 insertions(+), 33 deletions(-)

diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml
index f44fd20..1eb4c34 100644
--- a/Extensions/BlockReplacePackets/pom.xml
+++ b/Extensions/BlockReplacePackets/pom.xml
@@ -96,6 +96,31 @@
                     <finalName>${artifactId}</finalName>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>${project.parent.basedir}/bin</outputDirectory>
+                    <archive>
+                        <manifest>
+                            <mainClass>extensions.blockreplacepackets.BlockAndReplacePackets</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <finalName>BlockAndReplacePackets</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/Extensions/SpeechColorizer/pom.xml b/Extensions/SpeechColorizer/pom.xml
index a6a40e5..54ae551 100644
--- a/Extensions/SpeechColorizer/pom.xml
+++ b/Extensions/SpeechColorizer/pom.xml
@@ -96,6 +96,29 @@
                     <finalName>${artifactId}</finalName>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>${project.parent.basedir}/target/bin</outputDirectory>
+                    <archive>
+                        <manifest>
+                            <mainClass>extensions.speechcolorizer.SpeechColorizer</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/G-Earth-UI/pom.xml b/G-Earth-UI/pom.xml
index 65d1503..2643b90 100644
--- a/G-Earth-UI/pom.xml
+++ b/G-Earth-UI/pom.xml
@@ -42,20 +42,20 @@
             </plugin>
 
             <!-- this would copy dependencies if we were building a non-standalone JAR -->
-            <!--<plugin>-->
-            <!--<artifactId>maven-dependency-plugin</artifactId>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<phase>package</phase>-->
-            <!--<goals>-->
-            <!--<goal>copy-dependencies</goal>-->
-            <!--</goals>-->
-            <!--<configuration>-->
-            <!--<outputDirectory>${project.build.directory}/bin/lib</outputDirectory>-->
-            <!--</configuration>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--</plugin>-->
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -80,24 +80,23 @@
             </plugin>
 
             <!-- this builds a non-standalone JAR file -->
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<version>2.5</version>-->
-            <!--<configuration>-->
-            <!--<outputDirectory>${project.build.directory}/bin</outputDirectory>-->
-            <!--<archive>-->
-            <!--<manifest>-->
-            <!--<addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
-            <!--<addClasspath>true</addClasspath>-->
-            <!--<mainClass>main.Main</mainClass>-->
-            <!--<useUniqueVersions>false</useUniqueVersions>-->
-            <!--<classpathPrefix>lib/</classpathPrefix>-->
-            <!--<addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
-            <!--</manifest>-->
-            <!--</archive>-->
-            <!--</configuration>-->
-            <!--</plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <outputDirectory>${project.build.directory}/bin</outputDirectory>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>gearth.Main</mainClass>
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -110,14 +109,17 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <outputDirectory>${project.parent.basedir}/bin</outputDirectory>
                     <archive>
                         <manifest>
-                            <mainClass>main.Main</mainClass>
+                            <mainClass>gearth.Main</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
+                    <finalName>G-Earth-${project.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
             </plugin>
         </plugins>