From f57b5395a2674d69a7d05401c2f0781f3493bf77 Mon Sep 17 00:00:00 2001
From: Fredthedoggy <45927799+fredthedoggy@users.noreply.github.com>
Date: Sat, 5 Jun 2021 12:36:29 -0400
Subject: [PATCH] Update for Maven-Shade 3.2.4 + Relocate

---
 bukkit/dependency-reduced-pom.xml     | 18 +++++++++-
 bukkit/pom.xml                        | 18 +++++++++-
 bungeecord/dependency-reduced-pom.xml | 50 +++++++++++++++++++++++++++
 bungeecord/pom.xml                    | 18 +++++++++-
 common/dependency-reduced-pom.xml     |  8 +++--
 common/pom.xml                        |  8 +++--
 sponge/dependency-reduced-pom.xml     |  8 +++--
 sponge/pom.xml                        |  8 +++--
 velocity/pom.xml                      | 18 +++++++++-
 9 files changed, 142 insertions(+), 12 deletions(-)
 create mode 100644 bungeecord/dependency-reduced-pom.xml

diff --git a/bukkit/dependency-reduced-pom.xml b/bukkit/dependency-reduced-pom.xml
index 08ebbe7..646b550 100644
--- a/bukkit/dependency-reduced-pom.xml
+++ b/bukkit/dependency-reduced-pom.xml
@@ -11,7 +11,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -20,6 +20,22 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <relocations>
+            <relocation>
+              <pattern>com.fasterxml.jackson</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>okhttp3</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>okio</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+            </relocation>
+          </relocations>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 2fb5079..0337ed9 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -48,6 +48,22 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.fasterxml.jackson</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>okhttp3</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>okio</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/bungeecord/dependency-reduced-pom.xml b/bungeecord/dependency-reduced-pom.xml
new file mode 100644
index 0000000..c459693
--- /dev/null
+++ b/bungeecord/dependency-reduced-pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>Donation-Store-Minecraft</artifactId>
+    <groupId>net.donationstore</groupId>
+    <version>2.3</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>donation-store-bungeecord</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <relocations>
+            <relocation>
+              <pattern>com.fasterxml.jackson</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>okhttp3</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>okio</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+            </relocation>
+          </relocations>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>net.md-5</groupId>
+      <artifactId>bungeecord-api</artifactId>
+      <version>1.14-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml
index 3197b10..3898d39 100644
--- a/bungeecord/pom.xml
+++ b/bungeecord/pom.xml
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.6</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -47,6 +47,22 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.fasterxml.jackson</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>okhttp3</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>okio</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/common/dependency-reduced-pom.xml b/common/dependency-reduced-pom.xml
index 0b8d19c..ae5edb6 100644
--- a/common/dependency-reduced-pom.xml
+++ b/common/dependency-reduced-pom.xml
@@ -11,7 +11,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -27,9 +27,13 @@
               <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
             </relocation>
             <relocation>
-              <pattern>com.squareup.okhttp3</pattern>
+              <pattern>okhttp3</pattern>
               <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
             </relocation>
+            <relocation>
+              <pattern>okio</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+            </relocation>
           </relocations>
         </configuration>
       </plugin>
diff --git a/common/pom.xml b/common/pom.xml
index d9d6bd0..f23de3e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -56,7 +56,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.4</version>
                 <configuration>
                     <relocations>
                         <relocation>
@@ -64,9 +64,13 @@
                             <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>com.squareup.okhttp3</pattern>
+                            <pattern>okhttp3</pattern>
                             <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>okio</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
diff --git a/sponge/dependency-reduced-pom.xml b/sponge/dependency-reduced-pom.xml
index ef97c35..eb352f7 100644
--- a/sponge/dependency-reduced-pom.xml
+++ b/sponge/dependency-reduced-pom.xml
@@ -11,7 +11,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -27,9 +27,13 @@
               <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
             </relocation>
             <relocation>
-              <pattern>com.squareup.okhttp3</pattern>
+              <pattern>okhttp3</pattern>
               <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
             </relocation>
+            <relocation>
+              <pattern>okio</pattern>
+              <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+            </relocation>
           </relocations>
         </configuration>
       </plugin>
diff --git a/sponge/pom.xml b/sponge/pom.xml
index d933bde..29274e0 100644
--- a/sponge/pom.xml
+++ b/sponge/pom.xml
@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.4</version>
                 <configuration>
                     <relocations>
                         <relocation>
@@ -44,9 +44,13 @@
                             <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>com.squareup.okhttp3</pattern>
+                            <pattern>okhttp3</pattern>
                             <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>okio</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
diff --git a/velocity/pom.xml b/velocity/pom.xml
index ca6d9f8..1629cf8 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -53,7 +53,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.6</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -62,6 +62,22 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.fasterxml.jackson</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.jackson</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>okhttp3</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okhttp3</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>okio</pattern>
+                            <shadedPattern>net.donationstore.plugin.internal.okio</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
             </plugin>
         </plugins>
     </build>