Build fixups

Author: electronicboy

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 86a75ef5a2d727172ec13f240723e6b9e45cd4e0 Mon Sep 17 00:00:00 2001
+From e98674a788d5a10f52f7714314d959be452e147b Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -621,15 +621,21 @@ index afb805d1..be74fd49 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index 18bbe6f9..e0b8b453 100644
+index 18bbe6f9..e956060c 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3,18 +3,18 @@
+@@ -3,18 +3,24 @@
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
 
 -    <groupId>net.md-5</groupId>
 -    <artifactId>bungeecord-parent</artifactId>
++    <parent>
++        <groupId>io.github.waterfallmc</groupId>
++        <artifactId>waterfall-super</artifactId>
++        <version>26.1-R0.1-SNAPSHOT</version>
++        <relativePath>../pom.xml</relativePath>
++    </parent>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
      <version>26.1-R0.1-SNAPSHOT</version>
@@ -651,7 +657,7 @@ index 18bbe6f9..e0b8b453 100644
      </organization>
      <licenses>
          <license>
-@@ -26,7 +26,22 @@
+@@ -26,7 +32,22 @@
 
      <developers>
          <developer>
@@ -675,7 +681,7 @@ index 18bbe6f9..e0b8b453 100644
          </developer>
      </developers>
 
-@@ -50,28 +65,24 @@
+@@ -50,28 +71,24 @@
      </modules>
 
      <scm>
@@ -714,15 +720,15 @@ index 18bbe6f9..e0b8b453 100644
      </distributionManagement>
 
      <properties>
-@@ -155,6 +166,7 @@
+@@ -155,6 +172,7 @@
                      </execution>
                  </executions>
              </plugin>
 +            <!-- Use latest version of the javadoc plugin, fixes some issues with the javadoc tool on recent JDK builds on macOS at least -->
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
-@@ -170,6 +182,14 @@
+@@ -170,6 +188,14 @@
                  </configuration>
              </plugin>
              <plugin>
@@ -737,15 +743,15 @@ index 18bbe6f9..e0b8b453 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.6.0</version>
-@@ -194,6 +214,7 @@
+@@ -194,6 +220,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
 +            -->
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-enforcer-plugin</artifactId>
-@@ -257,6 +278,15 @@
+@@ -257,6 +284,15 @@
                                  </goals>
                              </execution>
                          </executions>

BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 067dfc16c47dc4d8fef5ddf6294ed98a90a18f4a Mon Sep 17 00:00:00 2001
+From ff0ec8e8ae8ff4f90cd8e0bde2f1cf1286380c00 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
@@ -38,10 +38,10 @@ index fd082dcd..d090e151 100644
      </build>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
 new file mode 100644
-index 00000000..8387393c
+index 00000000..eb42c916
 --- /dev/null
 +++ b/log4j/pom.xml
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,47 @@
 +<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/xsd/maven-4.0.0.xsd">
 +    <modelVersion>4.0.0</modelVersion>
@@ -61,10 +61,6 @@ index 00000000..8387393c
 +    <name>Waterfall-Log4J</name>
 +    <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
 +
-+    <properties>
-+        <log4j2.version>2.20.0</log4j2.version>
-+    </properties>
-+
 +    <dependencies>
 +        <!-- Log4j -->
 +        <dependency>
@@ -235,10 +231,10 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index e0b8b453..b4371768 100644
+index e956060c..40a1cc35 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -52,14 +52,15 @@
+@@ -58,14 +58,15 @@
          <module>config</module>
          <module>dialog</module>
          <module>event</module>
@@ -256,6 +252,28 @@ index e0b8b453..b4371768 100644
          <module>native</module>
          <module>nbt</module>
      </modules>
+@@ -96,6 +97,7 @@
+         <lombok.version>1.18.44</lombok.version>
+         <maven.compiler.release>17</maven.compiler.release>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
++        <log4j2.version>2.25.3</log4j2.version>
+     </properties>
+ 
+     <!-- We really shouldn't depend on external repositories -->
+@@ -184,6 +186,13 @@
+                             <artifactId>lombok</artifactId>
+                             <version>${lombok.version}</version>
+                         </annotationProcessorPath>
++                        <!-- Waterfall start - Use log4j2 for logging -->
++                        <annotationProcessorPath>
++                            <groupId>org.apache.logging.log4j</groupId>
++                            <artifactId>log4j-core</artifactId>
++                            <version>${log4j2.version}</version>
++                        </annotationProcessorPath>
++                        <!-- Waterfall end -->
+                     </annotationProcessorPaths>
+                 </configuration>
+             </plugin>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
 index 8c25ae3a..07cf55ba 100644
 --- a/proxy/pom.xml

BungeeCord-Patches/0035-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From db26a22ee551104e7e5b649bf741542e9d7d9842 Mon Sep 17 00:00:00 2001
+From fe4c03bd7e15cf2f6af289e30488b0972758f3cf 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
@@ -23,10 +23,10 @@ index 628ce968..faa06a92 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 8387393c..f9af0d5b 100644
+index eb42c916..c4692781 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
-@@ -41,6 +41,24 @@
+@@ -37,6 +37,24 @@
              <version>${log4j2.version}</version>
              <scope>compile</scope>
          </dependency>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>io.github.waterfallmc</groupId>
     <artifactId>waterfall-super</artifactId>
-    <version>dev-SNAPSHOT</version>
+    <version>26.1-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Waterfall-Super</name>