From f5ccf698c59520fbde06ff5692fa624eb2c991b5 Mon Sep 17 00:00:00 2001
From: EriolEandur <Eriol_Eandur@gmx.de>
Date: Mon, 1 Mar 2021 23:26:29 +0100
Subject: [PATCH 1/2] version 0.5.1 updated dependencies to java 11

---
 pom.xml                                       | 19 ++++++++++++-------
 .../HTTP/Handler/ConfigJSHandler.java         |  8 ++++----
 .../HTTP/Handler/DynmapConfigJSONHandler.java |  2 +-
 .../HTTP/Handler/MapConfigHandler.java        |  2 +-
 .../HTTP/Handler/MarkerHandler.java           |  2 +-
 .../HTTP/Handler/StaticFileHandler.java       |  2 +-
 .../HTTP/Handler/TileFileHandler.java         |  2 +-
 7 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6418a73..6699009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.cubespace.dynmap</groupId>
     <artifactId>Dynmap-MultiServer</artifactId>
-    <version>0.5.0</version>
+    <version>0.5.1</version>
 
     <build>
         <defaultGoal>clean install</defaultGoal>
@@ -42,8 +42,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <compilerArguments>
                         <O>-Xlint:all</O>
                         <O>-Xlint:-path</O>
@@ -106,12 +106,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.2.4</version>
+            <version>2.8.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.30</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.13</version>
+            <version>1.27</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -146,12 +146,17 @@
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>1.3.1</version>
+            <version>1.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.cubespace</groupId>
             <artifactId>Yamler-Core</artifactId>
             <version>2.3.1-20150720.092759-2</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>javax.activation</artifactId>
+            <version>1.2.0</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/ConfigJSHandler.java b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/ConfigJSHandler.java
index e888a25..60f50fd 100644
--- a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/ConfigJSHandler.java
+++ b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/ConfigJSHandler.java
@@ -13,10 +13,10 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
-import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_LENGTH;
-import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
-import static io.netty.handler.codec.http.HttpHeaders.Names.IF_MODIFIED_SINCE;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
+import static io.netty.handler.codec.http.HttpHeaderNames.IF_MODIFIED_SINCE;
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
diff --git a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/DynmapConfigJSONHandler.java b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/DynmapConfigJSONHandler.java
index 064858c..c66e30f 100644
--- a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/DynmapConfigJSONHandler.java
+++ b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/DynmapConfigJSONHandler.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaderNames.*;
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
diff --git a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MapConfigHandler.java b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MapConfigHandler.java
index f20320f..e96d933 100644
--- a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MapConfigHandler.java
+++ b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MapConfigHandler.java
@@ -14,7 +14,7 @@
 import net.cubespace.dynmap.multiserver.HTTP.HandlerUtil;
 import net.cubespace.dynmap.multiserver.Main;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaderNames.*;
 import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
diff --git a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MarkerHandler.java b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MarkerHandler.java
index c9802bb..41ce6d6 100644
--- a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MarkerHandler.java
+++ b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/MarkerHandler.java
@@ -13,7 +13,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaderNames.*;
 import static io.netty.handler.codec.http.HttpResponseStatus.*;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
diff --git a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/StaticFileHandler.java b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/StaticFileHandler.java
index 6703627..86d876d 100644
--- a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/StaticFileHandler.java
+++ b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/StaticFileHandler.java
@@ -13,7 +13,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaderNames.*;
 import static io.netty.handler.codec.http.HttpResponseStatus.*;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
diff --git a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/TileFileHandler.java b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/TileFileHandler.java
index cf1dd2c..cf69fc2 100644
--- a/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/TileFileHandler.java
+++ b/src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/TileFileHandler.java
@@ -13,7 +13,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaderNames.*;
 import static io.netty.handler.codec.http.HttpResponseStatus.*;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 

From 6429f301b0ceb907f9ec1513f8f0924345725e99 Mon Sep 17 00:00:00 2001
From: EriolEandur <Eriol_Eandur@gmx.de>
Date: Sat, 5 Jun 2021 22:32:48 +0200
Subject: [PATCH 2/2] version 0.5.2 updated shade plugin includes for java 16

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6699009..7f8d4bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.cubespace.dynmap</groupId>
     <artifactId>Dynmap-MultiServer</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2</version>
 
     <build>
         <defaultGoal>clean install</defaultGoal>
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -74,6 +74,7 @@
                                     <include>io.netty:*</include>
                                     <include>commons-lang:*</include>
                                     <include>net.cubespace:*</include>
+                                    <include>com.sun.activation:*</include>
                                 </includes>
                             </artifactSet>
                         </configuration>