From f40cc3d6ca55159e3d7abf8b1a54a6686b92a4aa Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 8 Dec 2021 20:34:03 -0600
Subject: [PATCH] Strip META-INF/maven and services - avoid problems with forge
 1.18

---
 DynmapCore/build.gradle   | 2 ++
 forge-1.16.5/build.gradle | 2 ++
 forge-1.17.1/build.gradle | 2 ++
 forge-1.18/build.gradle   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle
index 26f198df..0de15bf6 100644
--- a/DynmapCore/build.gradle
+++ b/DynmapCore/build.gradle
@@ -44,6 +44,8 @@ shadowJar {
         include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
         include(dependency('org.postgresql:postgresql:'))
         include(dependency(':DynmapCoreAPI'))
+        exclude("META-INF/maven/**")
+        exclude("META-INF/services/**")
 	}
 	relocate('org.json.simple', 'org.dynmap.json.simple')
 	relocate('org.yaml.snakeyaml', 'org.dynmap.snakeyaml')
diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle
index 8576ff29..9075eea9 100644
--- a/forge-1.16.5/build.gradle
+++ b/forge-1.16.5/build.gradle
@@ -47,6 +47,8 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
+        exclude("META-INF/maven/**")
+        exclude("META-INF/services/**")
     }
     archiveName = "Dynmap-${parent.version}-forge-1.16.5.jar"
     destinationDir = file '../target'
diff --git a/forge-1.17.1/build.gradle b/forge-1.17.1/build.gradle
index 3064365e..94a69cc3 100644
--- a/forge-1.17.1/build.gradle
+++ b/forge-1.17.1/build.gradle
@@ -51,6 +51,8 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
+        exclude("META-INF/maven/**")
+        exclude("META-INF/services/**")
     }
     archiveName = "Dynmap-${parent.version}-forge-1.17.1.jar"
     destinationDir = file '../target'
diff --git a/forge-1.18/build.gradle b/forge-1.18/build.gradle
index 3dfb2686..b74d5eb9 100644
--- a/forge-1.18/build.gradle
+++ b/forge-1.18/build.gradle
@@ -53,6 +53,8 @@ shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
         include(dependency("commons-codec:commons-codec:"))
+        exclude("META-INF/maven/**")
+        exclude("META-INF/services/**")
     }
 	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_18.commons.codec')