From 83856add6b409b423639f939275c4510cb87417e Mon Sep 17 00:00:00 2001
From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:13:05 -0800
Subject: [PATCH] Update several build plugins, Gson, and Netty (#136)

---
 .../0106-Update-Gson-and-build-plugins.patch  |  42 +++++
 .../server/0214-Update-to-Netty-4.1.x.patch   |   2 +-
 .../0225-Update-several-build-plugins.patch   | 168 ++++++++++++++++++
 3 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 patches/api/0106-Update-Gson-and-build-plugins.patch
 create mode 100644 patches/server/0225-Update-several-build-plugins.patch

diff --git a/patches/api/0106-Update-Gson-and-build-plugins.patch b/patches/api/0106-Update-Gson-and-build-plugins.patch
new file mode 100644
index 00000000..49b9fd42
--- /dev/null
+++ b/patches/api/0106-Update-Gson-and-build-plugins.patch
@@ -0,0 +1,42 @@
+From 1c95f138431ebaea5d406b1d0915f019356381c1 Mon Sep 17 00:00:00 2001
+From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
+Date: Tue, 22 Aug 2023 10:10:54 -0700
+Subject: [PATCH] Update Gson and build plugins
+
+
+diff --git a/pom.xml b/pom.xml
+index ab017e4b..353e4410 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -61,11 +61,11 @@
+             <version>17.0</version>
+             <scope>compile</scope>
+         </dependency>
+-        <!-- bundled with Minecraft, should be kept in sync -->
++        <!-- bundled with Minecraft, updated in SportPaper -->
+         <dependency>
+             <groupId>com.google.code.gson</groupId>
+             <artifactId>gson</artifactId>
+-          <version>2.2.4</version>
++            <version>2.10.1</version>
+         </dependency>
+         <dependency>
+             <groupId>org.avaje</groupId>
+@@ -107,12 +107,12 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+-                <version>3.1</version>
++                <version>3.11.0</version>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+-                <version>2.3</version>
++                <version>3.5.0</version>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>
+-- 
+2.41.0
+
diff --git a/patches/server/0214-Update-to-Netty-4.1.x.patch b/patches/server/0214-Update-to-Netty-4.1.x.patch
index 6ef1f33f..69aaca98 100644
--- a/patches/server/0214-Update-to-Netty-4.1.x.patch
+++ b/patches/server/0214-Update-to-Netty-4.1.x.patch
@@ -15,7 +15,7 @@ index 2dee42e5..e6bdad05 100644
 +        <dependency>
 +            <groupId>io.netty</groupId>
 +            <artifactId>netty-all</artifactId>
-+            <version>4.1.87.Final</version>
++            <version>4.1.105.Final</version>
 +        </dependency>
          <dependency>
              <groupId>it.unimi.dsi</groupId>
diff --git a/patches/server/0225-Update-several-build-plugins.patch b/patches/server/0225-Update-several-build-plugins.patch
new file mode 100644
index 00000000..a89b125f
--- /dev/null
+++ b/patches/server/0225-Update-several-build-plugins.patch
@@ -0,0 +1,168 @@
+From 1726ca7e38b99bf0a47dfaf3a4f14ec42aef4c04 Mon Sep 17 00:00:00 2001
+From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
+Date: Tue, 22 Aug 2023 10:11:12 -0700
+Subject: [PATCH] Update several build plugins
+
+
+diff --git a/pom.xml b/pom.xml
+index 6959c62a..41d4e4c7 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -117,65 +117,65 @@
+     <build>
+         <defaultGoal>install</defaultGoal>
+         <plugins>
+-						<plugin>
+-								<groupId>net.md-5</groupId>
+-								<artifactId>scriptus</artifactId>
+-								<version>0.4.1</version>
+-								<executions>
+-										<execution>
+-												<id>ex-sport</id>
+-												<configuration>
+-														<format>git-SportPaper-%s</format>
+-														<scmDirectory>../</scmDirectory>
+-														<descriptionProperty>sportpaper.desc</descriptionProperty>
+-												</configuration>
+-												<phase>initialize</phase>
+-												<goals>
+-														<goal>describe</goal>
+-												</goals>
+-										</execution>
+-										<execution>
+-												<id>ex-paper</id>
+-												<configuration>
+-														<format>-P.%s</format>
+-														<scmDirectory>../base/Paper/PaperSpigot-Server</scmDirectory>
+-														<descriptionProperty>paper.desc</descriptionProperty>
+-												</configuration>
+-												<phase>initialize</phase>
+-												<goals>
+-														<goal>describe</goal>
+-												</goals>
+-										</execution>
+-										<execution>
+-												<id>ex-spigot</id>
+-												<configuration>
+-														<format>-SP.%s</format>
+-														<scmDirectory>../base/Paper/Spigot-Server</scmDirectory>
+-														<descriptionProperty>spigot.desc</descriptionProperty>
+-												</configuration>
+-												<phase>initialize</phase>
+-												<goals>
+-														<goal>describe</goal>
+-												</goals>
+-										</execution>
+-										<execution>
+-												<id>ex-craftbukkit</id>
+-												<configuration>
+-														<format>-CB.%s</format>
+-														<scmDirectory>../base/Paper/CraftBukkit</scmDirectory>
+-														<descriptionProperty>craftbukkit.desc</descriptionProperty>
+-												</configuration>
+-												<phase>initialize</phase>
+-												<goals>
+-														<goal>describe</goal>
+-												</goals>
+-										</execution>
+-								</executions>
+-						</plugin>
++            <plugin>
++                <groupId>net.md-5</groupId>
++                <artifactId>scriptus</artifactId>
++                <version>0.5.0</version>
++                <executions>
++                    <execution>
++                        <id>ex-sport</id>
++                        <configuration>
++                            <format>git-SportPaper-%s</format>
++                            <scmDirectory>../</scmDirectory>
++                            <descriptionProperty>sportpaper.desc</descriptionProperty>
++                        </configuration>
++                        <phase>initialize</phase>
++                        <goals>
++                            <goal>describe</goal>
++                        </goals>
++                    </execution>
++                    <execution>
++                        <id>ex-paper</id>
++                        <configuration>
++                            <format>-P.%s</format>
++                            <scmDirectory>../base/Paper/PaperSpigot-Server</scmDirectory>
++                            <descriptionProperty>paper.desc</descriptionProperty>
++                        </configuration>
++                        <phase>initialize</phase>
++                        <goals>
++                            <goal>describe</goal>
++                        </goals>
++                    </execution>
++                    <execution>
++                        <id>ex-spigot</id>
++                        <configuration>
++                            <format>-SP.%s</format>
++                            <scmDirectory>../base/Paper/Spigot-Server</scmDirectory>
++                            <descriptionProperty>spigot.desc</descriptionProperty>
++                        </configuration>
++                        <phase>initialize</phase>
++                        <goals>
++                            <goal>describe</goal>
++                        </goals>
++                    </execution>
++                    <execution>
++                        <id>ex-craftbukkit</id>
++                        <configuration>
++                            <format>-CB.%s</format>
++                            <scmDirectory>../base/Paper/CraftBukkit</scmDirectory>
++                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
++                        </configuration>
++                        <phase>initialize</phase>
++                        <goals>
++                            <goal>describe</goal>
++                        </goals>
++                    </execution>
++                </executions>
++            </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
+-                <version>2.5</version>
++                <version>3.3.0</version>
+                 <configuration>
+                     <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
+                     <archive>
+@@ -214,7 +214,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+-                <version>2.3</version>
++                <version>3.5.0</version>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>
+@@ -259,7 +259,7 @@
+             <plugin>
+                 <groupId>net.md-5</groupId>
+                 <artifactId>specialsource-maven-plugin</artifactId>
+-                <version>1.2.1</version>
++                <version>1.2.3</version>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>
+@@ -276,12 +276,12 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+-                <version>3.1</version>
++                <version>3.11.0</version>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-surefire-plugin</artifactId>
+-                <version>2.18</version>
++                <version>3.1.2</version>
+                 <configuration>
+                     <workingDirectory>${basedir}/target/test-server</workingDirectory>
+                     <excludes>
+-- 
+2.41.0
+