Updated Upstream (Bukkit) (#5359)

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

Bukkit Changes:
c589f546 Use upstream plexus-compiler-eclipse
This commit is contained in:
Josh Roy 2021-03-14 15:35:51 -04:00
parent 727e71ad0f
commit 55421b2226
4 changed files with 13 additions and 21 deletions

View file

@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
</pluginRepositories>
</repositories>
<dependencies>
+ <dependency>

View file

@ -11,8 +11,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
</pluginRepository>
</pluginRepositories>
</repository>
</repositories>
+ <!-- Paper start -->
+ <dependencyManagement>

View file

@ -40,30 +40,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
</properties>
- <distributionManagement>
- <repository>
+ <repositories>
<repository>
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
- </repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
- <snapshotRepository>
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
<repositories>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -0,0 +0,0 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
</repositories>
+ </repositories>
<pluginRepositories>
<dependencies>
<dependency>
@@ -0,0 +0,0 @@
<version>2.6</version>
<scope>compile</scope>
@ -102,8 +94,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <compilerId>eclipse</compilerId>
- </configuration>
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -0,0 +0,0 @@
</excludes>
</filter>

@ -1 +1 @@
Subproject commit d264e972e9fecfea2f4a016c5d89ab8611680eb3
Subproject commit c589f5464d0c822a21ffff763af526ef4ecfb243