From 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 14 May 2017 12:00:00 +1000
Subject: Update to Minecraft 1.12-pre2

---
 pom.xml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index f8a66e54..7d8a5a57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,20 +4,20 @@
     <groupId>org.bukkit</groupId>
     <artifactId>craftbukkit</artifactId>
     <packaging>jar</packaging>
-    <version>1.11.2-R0.1-SNAPSHOT</version>
+    <version>1.12-pre2-SNAPSHOT</version>
     <name>CraftBukkit</name>
     <url>http://www.bukkit.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <api.version>unknown</api.version>
-        <minecraft.version>1.11.2</minecraft.version>
-        <minecraft_version>1_11_R1</minecraft_version>
+        <minecraft.version>1.12-pre2</minecraft.version>
+        <minecraft_version>1_12_R1</minecraft_version>
         <buildtag.prefix>git-Bukkit-</buildtag.prefix>
         <buildtag.suffix></buildtag.suffix>
         <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>4.9</version>
+            <version>5.0.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.40</version>
+            <version>6.0.6</version>
             <scope>compile</scope>
         </dependency>
         <!-- testing -->
@@ -152,15 +152,15 @@
                 <configuration>
                     <signature>
                         <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java16</artifactId>
-                        <version>1.1</version>
+                        <artifactId>java18</artifactId>
+                        <version>1.0</version>
                     </signature>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -178,12 +178,8 @@
                                     <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.ibex</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.ibex</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.gjt</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.gjt</shadedPattern>
+                                    <pattern>it.unimi</pattern>
+                                    <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bukkit.craftbukkit</pattern>
-- 
cgit v1.2.3