From 3d893d81d0ad5fa3ca424f6757240a003984b599 Mon Sep 17 00:00:00 2001
From: mcmonkey <agoodwin@freneticllc.com>
Date: Thu, 25 Apr 2019 17:57:54 -0700
Subject: [PATCH] bump maven plugins, use ECJ for 1.14 compile

---
 dist/pom.xml                                  | 20 +++++++-------
 main/pom.xml                                  |  6 ++---
 v1_10_R1/pom.xml                              | 12 ++++-----
 v1_11_R1/pom.xml                              | 12 ++++-----
 v1_12_R1/pom.xml                              | 22 ++++++++--------
 v1_13_R2/pom.xml                              | 18 ++++++-------
 v1_14_R1/pom.xml                              | 26 ++++++++++++-------
 .../nms/v1_14_R1/entity/FoxController.java    |  2 +-
 v1_8_R3/pom.xml                               | 12 ++++-----
 9 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index b74e14cbe..7cb4a55e5 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>net.citizensnpcs</groupId>
-        <artifactId>citizens-parent</artifactId> 
+        <artifactId>citizens-parent</artifactId>
         <version>2.0.25-SNAPSHOT</version>
     </parent>
     <artifactId>citizens</artifactId>
@@ -17,7 +17,7 @@
                     <finalName>Citizens-${CITIZENS_VERSION}-b${BUILD_NUMBER}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
-                <version>2.2</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <id>package-all</id>
@@ -43,48 +43,48 @@
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citizens-v1_8_R3</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citizens-v1_10_R1</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citizens-v1_11_R1</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citizens-v1_12_R1</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citizens-v1_13_R2</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency>         
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citizens-v1_14_R1</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency> 
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/main/pom.xml b/main/pom.xml
index 59fecc42f..f715b51e3 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -113,7 +113,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.8.0</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -123,13 +123,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.1.1</version>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml
index ced3f0fa5..3f5ea81a8 100644
--- a/v1_10_R1/pom.xml
+++ b/v1_10_R1/pom.xml
@@ -6,19 +6,19 @@
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
 	    <version>2.0.25-SNAPSHOT</version>
-	</parent> 
-	<artifactId>citizens-v1_10_R1</artifactId> 
+	</parent>
+	<artifactId>citizens-v1_10_R1</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.10.2-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories> 
+	<repositories>
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
-		</repository> 
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -35,7 +35,7 @@
             <version>${craftbukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -68,7 +68,7 @@
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
-						</goals> 
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml
index 83814931c..2d0a38151 100644
--- a/v1_11_R1/pom.xml
+++ b/v1_11_R1/pom.xml
@@ -6,19 +6,19 @@
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
 	    <version>2.0.25-SNAPSHOT</version>
-	</parent> 
-	<artifactId>citizens-v1_11_R1</artifactId> 
+	</parent>
+	<artifactId>citizens-v1_11_R1</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.11.2-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories> 
+	<repositories>
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
-		</repository> 
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -35,7 +35,7 @@
             <version>${craftbukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -68,7 +68,7 @@
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
-						</goals> 
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
index b97043720..8065f14a4 100644
--- a/v1_12_R1/pom.xml
+++ b/v1_12_R1/pom.xml
@@ -6,19 +6,19 @@
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
 	    <version>2.0.25-SNAPSHOT</version>
-	</parent> 
-	<artifactId>citizens-v1_12_R1</artifactId> 
+	</parent>
+	<artifactId>citizens-v1_12_R1</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.12.2-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories> 
+	<repositories>
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
-		</repository> 
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -35,7 +35,7 @@
             <version>${craftbukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -46,29 +46,29 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.8.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.1.1</version>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.1</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
-						</goals> 
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml
index 06b974828..b237da467 100644
--- a/v1_13_R2/pom.xml
+++ b/v1_13_R2/pom.xml
@@ -6,19 +6,19 @@
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
 	    <version>2.0.25-SNAPSHOT</version>
-	</parent> 
-	<artifactId>citizens-v1_13_R2</artifactId> 
+	</parent>
+	<artifactId>citizens-v1_13_R2</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.13.2-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories> 
+	<repositories>
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
-		</repository> 
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -35,7 +35,7 @@
             <version>${craftbukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.8.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -56,19 +56,19 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.1.1</version>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.1</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
-						</goals> 
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml
index 973992ffe..a3ca81a4c 100644
--- a/v1_14_R1/pom.xml
+++ b/v1_14_R1/pom.xml
@@ -6,19 +6,19 @@
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
 	    <version>2.0.25-SNAPSHOT</version>
-	</parent> 
-	<artifactId>citizens-v1_14_R1</artifactId> 
+	</parent>
+	<artifactId>citizens-v1_14_R1</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.14-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories> 
+	<repositories>
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
-		</repository> 
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -35,7 +35,7 @@
             <version>${craftbukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -46,29 +46,37 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.8.0</version>
 				<configuration>
+					<compilerId>eclipse</compilerId>
 					<source>1.8</source>
 					<target>1.8</target>
 				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.plexus</groupId>
+						<artifactId>plexus-compiler-eclipse</artifactId>
+						<version>2.8.1</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.1.1</version>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.1</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
-						</goals> 
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java
index 2dfffa79f..f51fbb4c1 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java
@@ -214,4 +214,4 @@ public class FoxController extends MobEntityController {
             return npc;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml
index bf978add9..deaf63428 100644
--- a/v1_8_R3/pom.xml
+++ b/v1_8_R3/pom.xml
@@ -6,19 +6,19 @@
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
 	    <version>2.0.25-SNAPSHOT</version>
-	</parent> 
-	<artifactId>citizens-v1_8_R3</artifactId> 
+	</parent>
+	<artifactId>citizens-v1_8_R3</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.8.8-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories> 
+	<repositories>
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
-		</repository> 
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -35,7 +35,7 @@
             <version>${craftbukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -68,7 +68,7 @@
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
-						</goals> 
+						</goals>
 					</execution>
 				</executions>
 			</plugin>