Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
Fix up maven stuff hopefully
Dieser Commit ist enthalten in:
Ursprung
62aa893cdb
Commit
44406d43b3
@ -1,14 +1,14 @@
|
|||||||
From 3a25a0e5c49a62778583bf33ec87e41053a1989f Mon Sep 17 00:00:00 2001
|
From 98238d93b1456c8bb79e0d6bb95f5773761dd861 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 117a7f8cf..03894ccf3 100644
|
index 117a7f8c..2a5846a1 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -3,29 +3,35 @@
|
@@ -3,37 +3,36 @@
|
||||||
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>
|
||||||
|
|
||||||
@ -39,22 +39,19 @@ index 117a7f8cf..03894ccf3 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>
|
-
|
||||||
</distributionManagement>
|
<repositories>
|
||||||
|
<repository>
|
||||||
@@ -34,6 +40,10 @@
|
|
||||||
<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>
|
</repository>
|
||||||
@ -65,7 +62,7 @@ index 117a7f8cf..03894ccf3 100644
|
|||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<pluginRepositories>
|
<pluginRepositories>
|
||||||
@@ -56,6 +66,13 @@
|
@@ -56,6 +55,13 @@
|
||||||
<version>1.1.1</version>
|
<version>1.1.1</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -79,7 +76,7 @@ index 117a7f8cf..03894ccf3 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 +117,12 @@
|
@@ -100,15 +106,12 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@ -96,7 +93,7 @@ index 117a7f8cf..03894ccf3 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>
|
||||||
@@ -143,40 +157,11 @@
|
@@ -143,40 +146,11 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -139,5 +136,5 @@ index 117a7f8cf..03894ccf3 100644
|
|||||||
- </profiles>
|
- </profiles>
|
||||||
</project>
|
</project>
|
||||||
--
|
--
|
||||||
2.18.0
|
2.19.0
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
From 36435f971c6a8da00ae28e14aae77a018dcda0b3 Mon Sep 17 00:00:00 2001
|
From ce4d9c868afb8ddb4fd84b26873509fffbde8de7 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 cc8fca48..f5e8d49d 100644
|
index 2a5846a1..d6cf92d1 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -54,6 +54,19 @@
|
@@ -43,6 +43,19 @@
|
||||||
</pluginRepositories>
|
</pluginRepositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -29,5 +29,5 @@ index cc8fca48..f5e8d49d 100644
|
|||||||
<groupId>commons-lang</groupId>
|
<groupId>commons-lang</groupId>
|
||||||
<artifactId>commons-lang</artifactId>
|
<artifactId>commons-lang</artifactId>
|
||||||
--
|
--
|
||||||
2.18.0
|
2.19.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From cf7ba1c723ee537f7bbc7cc8d339d6357e5f0694 Mon Sep 17 00:00:00 2001
|
From 2c838b46906d2b21e84956036ddf45bf4464bb30 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 a8a87820..a58d4424 100644
|
index d6cf92d1..ffedf2e7 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -127,6 +127,17 @@
|
@@ -116,6 +116,17 @@
|
||||||
<version>1.3</version>
|
<version>1.3</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -427,5 +427,5 @@ index 3af99b5b..72d506d1 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.18.0
|
2.19.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 1a487d66a8be68e6b9f90eec7cc97a56c465fb32 Mon Sep 17 00:00:00 2001
|
From 2c601455d17d2da1b6434c426da4f820c5278a24 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 a58d4424..a771e156 100644
|
index ffedf2e7..67d40f03 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -114,6 +114,14 @@
|
@@ -103,6 +103,14 @@
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -50,5 +50,5 @@ index 55debf5d..8d2999ac 100644
|
|||||||
* Returns the name of the plugin.
|
* Returns the name of the plugin.
|
||||||
* <p>
|
* <p>
|
||||||
--
|
--
|
||||||
2.18.0
|
2.19.0
|
||||||
|
|
||||||
|
4
pom.xml
4
pom.xml
@ -43,11 +43,11 @@
|
|||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
<id>destroystokyo-releases</id>
|
<id>papermc-releases</id>
|
||||||
<url>https://papermc.io/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://papermc.io/repo/repository/maven-snapshots/</url>
|
<url>https://papermc.io/repo/repository/maven-snapshots/</url>
|
||||||
</snapshotRepository>
|
</snapshotRepository>
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren