From 04787534c6c0d77bba8975fe2a3c1b3d7720bcff Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 20 Apr 2023 02:45:45 +0100
Subject: [PATCH] Updated Upstream (BungeeCord)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
7dd549ff Add maven-enforcer-plugin for dependency convergence
3c12b04c Update dependabot.yml
5545850f #3459: Bump mysql-connector-j from 8.0.32 to 8.0.33
2f909b44 #3458: Bump maven-resolver-transport-http from 1.9.7 to 1.9.8
ff155ebb #3457: Bump maven-resolver-connector-basic from 1.9.7 to 1.9.8
---
 BungeeCord                                |  2 +-
 BungeeCord-Patches/0001-POM-Changes.patch | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index a0a4fa0..7dd549f 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit a0a4fa0e5673c645ffae3fbc025dd05c2abe957e
+Subproject commit 7dd549ff1e4dcd099ff042b15dad3b61648bf1b9
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 1da26d5..bded32e 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 921905301dbe44a7c95763e1114227fcb131295c Mon Sep 17 00:00:00 2001
+From f03d5beb315012d4382d7aab3b0f1058e9a4689d 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
@@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
 - Deploy to papermc mvn repo
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 81179f0f..a680e7b0 100644
+index 52e81e04..55cdb6d1 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -67,7 +67,7 @@ index 81179f0f..a680e7b0 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 06444181..c988cf5d 100644
+index 6a3258f4..5ec5faf7 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,39 +4,40 @@
@@ -506,7 +506,7 @@ index c7478c96..e137dfcc 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index f9aa2c69..4c4597f6 100644
+index e5135290..4c05e323 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -633,7 +633,7 @@ index f9aa2c69..4c4597f6 100644
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -300,6 +325,7 @@
+@@ -325,6 +350,7 @@
                                      <!-- lombok does not add @return or @param which causes warnings, so ignore -->
                                      <doclint>none</doclint>
                                      <sourcepath>${project.build.directory}/delombok</sourcepath>
@@ -641,7 +641,7 @@ index f9aa2c69..4c4597f6 100644
                                  </configuration>
                              </execution>
                          </executions>
-@@ -331,5 +357,88 @@
+@@ -356,5 +382,88 @@
                  </plugins>
              </build>
          </profile>
@@ -772,7 +772,7 @@ index bb2b14fc..221469b9 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 3a8aaa35..5135c0fd 100644
+index c6004000..1087c1f9 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -884,5 +884,5 @@ index 90a4c8d5..81af5457 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.17.2 (Apple Git-113)
+2.40.0