From b43cf9ac333787e50e666a79ed14e06062cf270a Mon Sep 17 00:00:00 2001
From: Jacob Swehla <30414349+JacobSwehla@users.noreply.github.com>
Date: Fri, 29 Dec 2017 11:25:31 -0600
Subject: [PATCH] Moved config file and fixed some warnings

---
 Server/pom.xml                                | 49 +++++++++++++------
 .../simon987/server/ServerConfiguration.java  |  2 +-
 pom.xml                                       | 14 ++----
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/Server/pom.xml b/Server/pom.xml
index a1c3a52..df94ffc 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -3,24 +3,37 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
-	
-	<parent>
-		<groupId>net.simon987.server</groupId>
-		<artifactId>server_root</artifactId>
-		<version>1.2a</version>
-    </parent>
+
 
     <build>
-        <resources>
-            <resource>
-                <directory>../Server/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>config.properties</include>
-                </includes>
-            </resource>
-        </resources>
+
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>default-resources</id>
+                        <!-- here the phase you need -->
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>../target/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../Server/src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>config.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <version>3.6.2</version>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -50,6 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
                 <configuration>
                     <outputDirectory>../target</outputDirectory>
                     <archive>
@@ -93,4 +107,9 @@
 
     </dependencies>
 
+    <properties>
+        <!-- explicitly set build encoding so not altered by build platform defaults -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/Server/src/main/java/net/simon987/server/ServerConfiguration.java b/Server/src/main/java/net/simon987/server/ServerConfiguration.java
index 3338c90..b5d2f8a 100644
--- a/Server/src/main/java/net/simon987/server/ServerConfiguration.java
+++ b/Server/src/main/java/net/simon987/server/ServerConfiguration.java
@@ -22,7 +22,7 @@ public class ServerConfiguration {
     public ServerConfiguration(String file) {
         try {
             properties = new Properties();
-            InputStream is = ServerConfiguration.class.getClassLoader().getResourceAsStream("config.properties");
+            InputStream is = new FileInputStream("config.properties");
             properties.load(is);
 
         } catch (IOException e) {
diff --git a/pom.xml b/pom.xml
index 38a43c2..91054b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,26 +13,18 @@
     <build>
         <plugins>
             <plugin>
-                <version>3.6.2</version>
                 <groupId>org.apache.maven.plugins</groupId>
+                <version>3.6.2</version>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
             </plugin>
-                <plugin>
-                    <version>3.6.2</version>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-                </plugin>
-                <plugin>
+            <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.0.2</version>
                     <configuration>
                         <outputDirectory>../target/plugins</outputDirectory>
                         <archive>