From 5a1f864db0b7fc0ad73b32e07ce568fdea23c45b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 20 Oct 2024 21:19:13 +0800
Subject: [PATCH] fix dependency conflict

---
 forge-gui-android/pom.xml |  6 ------
 forge-gui/pom.xml         | 11 +++++++++++
 pom.xml                   | 10 ++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 8bff1a7e225..5d5ab45a55c 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -135,12 +135,6 @@
             <artifactId>forge-gui-mobile</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>xmlpull</groupId>
-            <artifactId>xmlpull</artifactId>
-            <version>1.1.3.4a</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.badlogicgames.gdx</groupId>
             <artifactId>gdx-backend-android</artifactId>
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 16d7eacdeb2..2feebeda020 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -36,10 +36,21 @@
             <artifactId>forge-ai</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>xmlpull</groupId>
+            <artifactId>xmlpull</artifactId>
+            <version>1.1.3.4a</version>
+        </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
             <version>1.4.20</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xmlpull</groupId>
+                    <artifactId>xmlpull</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
diff --git a/pom.xml b/pom.xml
index b6ef5cb5c2e..cc218eb8ef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,6 +371,16 @@
                 <artifactId>logback-core</artifactId>
                 <version>1.5.11</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>2.0.16</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>2.0.16</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>