3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 04:20:04 +01:00

Update 1.12.2 distribution info just in case

Dieser Commit ist enthalten in:
Zach Brown 2018-09-24 21:03:09 -04:00
Ursprung 69c8e71723
Commit c1cd6183f5
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: CC9DA35FC5450B76
6 geänderte Dateien mit 54 neuen und 59 gelöschten Zeilen

Datei anzeigen

@ -1,14 +1,14 @@
From 7836876ec5222a072d9d65d965f4edcc0ea8bbe4 Mon Sep 17 00:00:00 2001 From f689646087896900f4b4a46521b3a5d5487184b3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100 Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 7c81917d..4c5bda27 100644 index 7c81917d..3889d668 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,39 +3,39 @@ @@ -3,46 +3,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
@ -40,50 +40,45 @@ index 7c81917d..4c5bda27 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<distributionManagement> - <distributionManagement>
<repository> - <repository>
- <id>spigotmc-releases</id> - <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url> - <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
+ <id>destroystokyo-releases</id> - </repository>
+ <url>https://destroystokyo.com/repo/repository/maven-releases/</url> - <snapshotRepository>
</repository>
<snapshotRepository>
- <id>spigotmc-snapshots</id> - <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> - <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+ <id>destroystokyo-snapshots</id> - </snapshotRepository>
+ <url>https://destroystokyo.com/repo/repository/maven-snapshots/</url> - </distributionManagement>
</snapshotRepository> + <pluginRepositories>
</distributionManagement> + <pluginRepository>
- <repositories>
- <repository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>spigotmc-public</id>
@@ -43,6 +43,17 @@
</pluginRepository>
</pluginRepositories>
+ <repositories>
+ <repository>
+ <id>spigotmc-public</id> + <id>spigotmc-public</id>
+ <url>https://hub.spigotmc.org/nexus/content/groups/public/</url> + <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+ </repository> + </pluginRepository>
+ </pluginRepositories>
<repositories>
<repository>
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
+ <repository> + <repository>
+ <id>sonatype</id> + <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url> + <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository> + </repository>
+ </repositories> </repositories>
+
- <pluginRepositories>
- <pluginRepository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
@@ -56,6 +67,13 @@ @@ -56,6 +56,13 @@
<version>1.1.1</version> <version>1.1.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -97,7 +92,7 @@ index 7c81917d..4c5bda27 100644
<!-- bundled with Minecraft, should be kept in sync --> <!-- bundled with Minecraft, should be kept in sync -->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
@@ -100,15 +118,12 @@ @@ -100,15 +107,12 @@
</dependencies> </dependencies>
<build> <build>
@ -114,7 +109,7 @@ index 7c81917d..4c5bda27 100644
<dependencies> <dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems --> <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency> <dependency>
@@ -131,6 +146,7 @@ @@ -131,6 +135,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
@ -122,7 +117,7 @@ index 7c81917d..4c5bda27 100644
<!-- when downloading via Maven we can pull depends individually --> <!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
</configuration> </configuration>
@@ -138,33 +154,4 @@ @@ -138,33 +143,4 @@
</plugins> </plugins>
</build> </build>
@ -157,5 +152,5 @@ index 7c81917d..4c5bda27 100644
- </profiles> - </profiles>
</project> </project>
-- --
2.18.0 2.19.0

Datei anzeigen

@ -1,14 +1,14 @@
From f428f0343bf4b0aa2c42fa1755d9523eaec91d3b Mon Sep 17 00:00:00 2001 From bf38aff997d53e25de73849488a72a7422f36b97 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400 Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] add Trove and FastUtil to Bukkit Subject: [PATCH] add Trove and FastUtil to Bukkit
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 4220760f..623d9eae 100644 index 3889d668..c5b3f430 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -55,6 +55,19 @@ @@ -44,6 +44,19 @@
</repositories> </repositories>
<dependencies> <dependencies>
@ -29,5 +29,5 @@ index 4220760f..623d9eae 100644
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
-- --
2.16.2 2.19.0

Datei anzeigen

@ -1,4 +1,4 @@
From 15b5224e92a45ca15a6e5d34f97734922e539b92 Mon Sep 17 00:00:00 2001 From d70c376fbf3dfc694895e80aba6a00df4b88c775 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700 Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors. Subject: [PATCH] Use ASM for event executors.
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods. Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 8d4032e2..21a4a8be 100644 index c5b3f430..09c42fe2 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -128,6 +128,17 @@ @@ -117,6 +117,17 @@
<version>1.3</version> <version>1.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -427,5 +427,5 @@ index d8b9c244..40fd71dc 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else { } else {
-- --
2.17.0 2.19.0

Datei anzeigen

@ -1,4 +1,4 @@
From b1eb117fbca758844625ae8de33b71f3d526ea0a Mon Sep 17 00:00:00 2001 From 4c9bcc7cd688a1c959ea8335a93b16c888d36f83 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 16:30:44 -0400 Date: Sat, 17 Jun 2017 16:30:44 -0400
Subject: [PATCH] Profile Lookup Events Subject: [PATCH] Profile Lookup Events
@ -7,10 +7,10 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
profiles that had to be looked up. profiles that had to be looked up.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index c8b37997..13994dc2 100644 index 09c42fe2..d75bf7da 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -62,6 +62,13 @@ @@ -51,6 +51,13 @@
<!-- Trove Provided by CraftBukkit --> <!-- Trove Provided by CraftBukkit -->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -241,5 +241,5 @@ index 00000000..aa0666d5
+ +
+} +}
-- --
2.15.1 2.19.0

Datei anzeigen

@ -1,4 +1,4 @@
From 21357c1c249a2ebea454a1bb6b7b435c3fecdbfa Mon Sep 17 00:00:00 2001 From fe849acd162816d608ef8b797037f95cfbb95dc3 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Thu, 21 Sep 2017 16:33:12 +0200 Date: Thu, 21 Sep 2017 16:33:12 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging Subject: [PATCH] Allow plugins to use SLF4J for logging
@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction. several layers of logging abstraction.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 13994dc2..45145c5f 100644 index d75bf7da..2fa2dd7c 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -122,6 +122,14 @@ @@ -111,6 +111,14 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -33,7 +33,7 @@ index 13994dc2..45145c5f 100644
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index c4e22c62..02670254 100644 index 55debf5d..8d2999ac 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java --- a/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java
@@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor { @@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor {
@ -50,5 +50,5 @@ index c4e22c62..02670254 100644
* Returns the name of the plugin. * Returns the name of the plugin.
* <p> * <p>
-- --
2.15.1 2.19.0

Datei anzeigen

@ -43,12 +43,12 @@
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>destroystokyo-releases</id> <id>papermc-releases</id>
<url>https://destroystokyo.com/repo/repository/maven-releases/</url> <url>https://papermc.io/repo/repository/maven-releases/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>destroystokyo-snapshots</id> <id>papermc-snapshots</id>
<url>https://destroystokyo.com/repo/repository/maven-snapshots/</url> <url>https://papermc.io/repo/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
</project> </project>