From f250289a1ebcfe1539cbbdc783145aa80478d131 Mon Sep 17 00:00:00 2001
From: sgdc3 <sgdc3.mail@gmail.com>
Date: Sun, 28 Jan 2018 22:01:14 +0100
Subject: [PATCH] Pom cleanup, fix output filename

---
 pom.xml | 70 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58ccc429..e97e8b10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <properties>
         <!-- Project properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.jdkVersion>1.8</project.jdkVersion>
+        <jdk.version>1.8</jdk.version>
 
         <!-- Output properties -->
         <project.outputName>AuthMe</project.outputName>
@@ -104,7 +104,7 @@
     </profiles>
 
     <build>
-        <finalName>${project.outputName}-${project.version}</finalName>
+        <finalName>original-${project.outputName}-${project.version}</finalName>
 
         <resources>
             <resource>
@@ -132,8 +132,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>${project.jdkVersion}</source>
-                    <target>${project.jdkVersion}</target>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
                 </configuration>
             </plugin>
             <!-- Test Plugin -->
@@ -165,7 +165,9 @@
                 </executions>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
-					<shadedArtifactAttached>true</shadedArtifactAttached>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <finalName>${project.outputName}-${project.version}</finalName>
+
                     <!--
                     Relocate all lib we use in order to fix class loading errors if we use different versions
                     than already loaded libs (i.e. by Mojang -> gson)
@@ -254,24 +256,28 @@
                     <failOnError>false</failOnError>
                 </configuration>
                 <executions>
-                    <execution> 
+                    <execution>
                         <id>attach-javadocs</id>
                         <phase>deploy</phase>
-                        <goals><goal>jar</goal></goals> 
-                    </execution> 
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>
-                <executions> 
-                    <execution> 
+                <executions>
+                    <execution>
                         <id>deploy</id>
                         <phase>deploy</phase>
-                        <goals><goal>deploy</goal></goals> 
-                    </execution> 
-                </executions> 
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -360,7 +366,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.5-jre</version>
+            <version>23.6-jre</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -395,15 +401,15 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.7.4</version>
+            <version>2.7.6</version>
             <scope>compile</scope>
+            <optional>true</optional>
             <exclusions>
                 <exclusion>
                     <artifactId>slf4j-api</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
             </exclusions>
-            <optional>true</optional>
         </dependency>
         <!-- HikariCP Logger -->
         <dependency>
@@ -428,6 +434,8 @@
             <groupId>de.mkammerer</groupId>
             <artifactId>argon2-jvm-nolibs</artifactId>
             <version>2.3</version>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
 
         <!-- Spigot API, http://www.spigotmc.org/ -->
@@ -462,6 +470,21 @@
 
         <!-- Bukkit Libraries  -->
 
+        <!-- ConfigMe -->
+        <dependency>
+            <groupId>ch.jalu</groupId>
+            <artifactId>configme</artifactId>
+            <version>0.4.1</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- bStats metrics -->
         <dependency>
             <groupId>org.bstats</groupId>
@@ -736,21 +759,6 @@
             </exclusions>
         </dependency>
 
-        <!-- ConfigMe -->
-        <dependency>
-            <groupId>ch.jalu</groupId>
-            <artifactId>configme</artifactId>
-            <version>0.4.1</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Unit Testing Libraries -->
 
         <dependency>