From c50a413fcd4e29ca08358769a76a2f56eed29182 Mon Sep 17 00:00:00 2001
From: HaHaWTH <id_cn00@outlook.com>
Date: Thu, 28 Mar 2024 20:42:06 +0800
Subject: [PATCH] Reapply "Fix relocation"

This reverts commit 640eb9335e5e2746cbf34c6c5e58c3e5ea7b3b59.
---
 pom.xml | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be8053d6..988ab01b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>shaded-jar-legacy</id>
+                        <id>shaded-jar-relocate</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
@@ -355,6 +355,46 @@
                                     <pattern>org.h2</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.org.h2</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.http</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.org.apache.http</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.org.apache.commons</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.activation</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.javax.annotation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.mail</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>waffle</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.waffle</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.sun.mail</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.sun.mail</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.sun.jna</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.sun.jna</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.sun.activation</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.sun.activation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.github.benmanes.caffeine</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>