From 12b78eb1d76360a905bed7ce1775a494f5cd6468 Mon Sep 17 00:00:00 2001
From: Dan Mulloy <dmulloy2@live.com>
Date: Wed, 17 Feb 2016 21:03:26 -0500
Subject: [PATCH] Switch to Java 7

This shouldn't be an issue as Java 6 has been EOL'd for years now. Heck,
even Java 7 has been EOL'd

Also updated maven plugin versions
---
 ProtocolLib/pom.xml                           | 59 +++----------------
 .../protocol/reflect/FuzzyReflection.java     |  2 +-
 .../com/comphenix/protocol/utility/Util.java  |  2 +-
 .../protocol/wrappers/nbt/NbtFactory.java     |  2 +-
 modules/v1_7_R4/pom.xml                       | 18 +++---
 pom.xml                                       | 22 +------
 6 files changed, 23 insertions(+), 82 deletions(-)

diff --git a/ProtocolLib/pom.xml b/ProtocolLib/pom.xml
index 6874e54b..72526a99 100644
--- a/ProtocolLib/pom.xml
+++ b/ProtocolLib/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4.3</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -71,17 +71,17 @@
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.6</version>
         <configuration>
           <archive>
             <manifestEntries>
@@ -94,52 +94,9 @@
           <finalName>ProtocolLib</finalName>
         </configuration>
       </plugin>
-
-      <!--<plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-              <goal>javadoc</goal>
-            </goals>
-          </execution>
-
-        </executions>
-      </plugin>-->
-
     </plugins>
   </build>
 
-  <!--<reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-        <configuration>
-          <threshold>High</threshold>
-          <effort>Default</effort>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <failOnError>false</failOnError>
-          <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
-          </links>
-        </configuration>
-      </plugin>
-    </plugins>
-
-  </reporting>-->
-
   <profiles>
     <profile>
       <id>jenkins</id>
@@ -166,7 +123,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.4</version>
+            <version>3.0.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -180,7 +137,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.1</version>
+            <version>2.10.3</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -194,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
+            <version>1.6</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java
index e0f4463e..1fd1c791 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java
@@ -603,7 +603,7 @@ public class FuzzyReflection {
 	
 	// Prevent duplicate fields
 
-	// @SafeVarargs
+	@SafeVarargs
 	private static <T> Set<T> setUnion(T[]... array) {
 		Set<T> result = new LinkedHashSet<T>();
 		
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/Util.java b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/Util.java
index 6b353011..7244597d 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/Util.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/Util.java
@@ -66,7 +66,7 @@ public class Util {
 	 * @param elements Array to convert
 	 * @return The list
 	 */
-	// @SafeVarargs
+	@SafeVarargs
 	public static <E> List<E> asList(E... elements) {
 		List<E> list = new ArrayList<E>(elements.length);
 		for (E element : elements) {
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java
index 6ae83f82..91670f2b 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java
@@ -449,7 +449,7 @@ public class NbtFactory {
 	 * @param elements - elements to add.
 	 * @return The new filled NBT list.
 	 */
-	// @SafeVarargs
+	@SafeVarargs
 	public static <T> NbtList<T> ofList(String name, T... elements) {
 		return WrappedList.fromArray(name, elements);
 	}
diff --git a/modules/v1_7_R4/pom.xml b/modules/v1_7_R4/pom.xml
index 05ac5111..f5865ccb 100644
--- a/modules/v1_7_R4/pom.xml
+++ b/modules/v1_7_R4/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4.3</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -78,17 +78,17 @@
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.6</version>
         <configuration>
           <archive>
             <manifestEntries>
@@ -105,7 +105,7 @@
 
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.10.3</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -160,7 +160,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.4</version>
+            <version>3.0.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -174,7 +174,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.1</version>
+            <version>2.10.3</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -188,7 +188,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
+            <version>1.6</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/pom.xml b/pom.xml
index 2643442e..5f4a90f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,16 +46,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.5.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.6</version>
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.10.3</version>
         <configuration>
           <failOnError>false</failOnError>
           <encoding>ISO-8859-1</encoding>
@@ -74,20 +74,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <!--<reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-    </plugins>
-  </reporting>-->
 </project>
\ No newline at end of file