exclude outdated sub-dependencies

arkflame · Jun 3, 2023 · d6761d6 · d6761d6
1 parent eb8d072
commit d6761d6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From 8b148fc857542f423ed043a0ee64a6c8ffc0473b Mon Sep 17 00:00:00 2001
+From 43de49256f52a8990a41b6194163023d1e169f3d Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -39,7 +39,7 @@ index 5ec5faf7..f9ec2c1c 100644
      </build>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
 new file mode 100644
-index 00000000..44bf7f91
+index 00000000..9c561bcc
 --- /dev/null
 +++ b/log4j/pom.xml
 @@ -0,0 +1,48 @@
@@ -63,7 +63,7 @@ index 00000000..44bf7f91
 +    <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
 +
 +    <properties>
-+        <log4j2.version>2.17.2</log4j2.version>
++        <log4j2.version>2.20.0</log4j2.version>
 +    </properties>
 +
 +    <dependencies>
@@ -251,7 +251,7 @@ index 432fd5c5..77991d81 100644
      </modules>
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index e004f988..aa360e69 100644
+index e004f988..368df864 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -71,7 +71,7 @@
@@ -278,7 +278,7 @@ index e004f988..aa360e69 100644
          <dependency>
              <groupId>net.sf.jopt-simple</groupId>
              <artifactId>jopt-simple</artifactId>
-@@ -130,6 +131,25 @@
+@@ -130,6 +131,35 @@
              <version>1.9.10</version>
              <scope>runtime</scope>
          </dependency>
@@ -293,6 +293,16 @@ index e004f988..aa360e69 100644
 +            <groupId>net.minecrell</groupId>
 +            <artifactId>terminalconsoleappender</artifactId>
 +            <version>1.3.0</version>
++            <exclusions>
++                <exclusion>
++                    <groupId>org.apache.logging.log4j</groupId>
++                    <artifactId>log4j-core</artifactId>
++                </exclusion>
++                <exclusion>
++                    <groupId>org.jline</groupId>
++                    <artifactId>jline-terminal</artifactId>
++                </exclusion>
++            </exclusions>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.jline</groupId>

diff --git a/BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch b/BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,11 +1,11 @@
-From f5fe955f7406c4778aeeae08ca0624d2c0b6fa12 Mon Sep 17 00:00:00 2001
+From b773b7b9601c7f191de0849bd58e0758a549d2fc Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
 
 
 diff --git a/api/pom.xml b/api/pom.xml
-index a680e7b0..6774bed3 100644
+index 163fc93b..9a01f8c6 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -75,5 +75,11 @@
@@ -16,7 +16,7 @@ index a680e7b0..6774bed3 100644
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-api</artifactId>
-+            <version>1.7.25</version>
++            <version>1.7.36</version>
 +        </dependency>
      </dependencies>
  </project>
@@ -39,10 +39,10 @@ index 9660234d..3d1e9a3a 100644
       * Called when the plugin has just been loaded. Most of the proxy will not
       * be initialized, so only use it for registering
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index 44bf7f91..fb091698 100644
+index 9c561bcc..a01910ee 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
-@@ -38,6 +38,12 @@
+@@ -38,6 +38,24 @@
              <artifactId>log4j-jul</artifactId>
              <version>${log4j2.version}</version>
          </dependency>
@@ -51,10 +51,22 @@ index 44bf7f91..fb091698 100644
 +            <artifactId>log4j-slf4j-impl</artifactId>
 +            <version>${log4j2.version}</version>
 +            <scope>runtime</scope>
++            <exclusions>
++                <exclusion>
++                    <groupId>org.slf4j</groupId>
++                    <artifactId>slf4j-api</artifactId>
++                </exclusion>
++            </exclusions>
++        </dependency>
++        <dependency>
++            <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++            <version>1.7.36</version>
++            <scope>runtime</scope>
 +        </dependency>
          <dependency>
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.17.2 (Apple Git-113)
+2.40.1.windows.1