From 12b78eb1d76360a905bed7ce1775a494f5cd6468 Mon Sep 17 00:00:00 2001 From: Dan Mulloy 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 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 2.4.3 package @@ -71,17 +71,17 @@ maven-compiler-plugin - 3.2 + 3.5.1 - 1.6 - 1.6 + 1.7 + 1.7 org.apache.maven.plugins maven-jar-plugin - 2.5 + 2.6 @@ -94,52 +94,9 @@ ProtocolLib - - - - - jenkins @@ -166,7 +123,7 @@ org.apache.maven.plugins maven-source-plugin - 2.4 + 3.0.0 attach-sources @@ -180,7 +137,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.1 + 2.10.3 attach-javadocs @@ -194,7 +151,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts 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 Set setUnion(T[]... array) { Set result = new LinkedHashSet(); 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 List asList(E... elements) { List list = new ArrayList(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 NbtList 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 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 2.4.3 package @@ -78,17 +78,17 @@ maven-compiler-plugin - 3.2 + 3.5.1 - 1.6 - 1.6 + 1.7 + 1.7 org.apache.maven.plugins maven-jar-plugin - 2.5 + 2.6 @@ -105,7 +105,7 @@ maven-javadoc-plugin - 2.7 + 2.10.3 package @@ -160,7 +160,7 @@ org.apache.maven.plugins maven-source-plugin - 2.4 + 3.0.0 attach-sources @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.1 + 2.10.3 attach-javadocs @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts diff --git a/pom.xml b/pom.xml index 2643442e..5f4a90f5 100644 --- a/pom.xml +++ b/pom.xml @@ -46,16 +46,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.5.1 org.apache.maven.plugins maven-jar-plugin - 2.4 + 2.6 maven-javadoc-plugin - 2.7 + 2.10.3 false ISO-8859-1 @@ -74,20 +74,4 @@ - - \ No newline at end of file