2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-07-20 02:07:53 +00:00
|
|
|
From: Kyle Wood <kyle@denwav.dev>
|
2021-06-11 12:02:28 +00:00
|
|
|
Date: Thu, 10 Dec 2020 20:50:33 -0800
|
|
|
|
Subject: [PATCH] Convert project to Gradle
|
|
|
|
|
2021-06-17 17:11:00 +00:00
|
|
|
The pom.xml file is deleted in this patch so the patch will fail to
|
|
|
|
apply if there are changes made to it from upstream - thus notifying us
|
|
|
|
that changes were made.
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
diff --git a/.gitignore b/.gitignore
|
2023-11-25 22:34:42 +00:00
|
|
|
index 5dd700a956e915c00b25d91dea8d6f285ddab72b..97e78e27ee0eea2c8b24886eeb19164d552323fe 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/.gitignore
|
|
|
|
+++ b/.gitignore
|
|
|
|
@@ -1,3 +1,5 @@
|
|
|
|
+.gradle/
|
|
|
|
+
|
|
|
|
# Eclipse stuff
|
|
|
|
/.classpath
|
|
|
|
/.project
|
2023-11-25 22:34:42 +00:00
|
|
|
@@ -32,3 +34,7 @@
|
2021-08-07 00:27:45 +00:00
|
|
|
*.ipr
|
|
|
|
*.iws
|
|
|
|
.idea/
|
|
|
|
+
|
|
|
|
+# vs code
|
|
|
|
+/.vscode
|
|
|
|
+/.factorypath
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
|
|
new file mode 100644
|
2024-01-26 19:17:06 +00:00
|
|
|
index 0000000000000000000000000000000000000000..4311f6dde7372a069f462158fba76d9d4b72e23a
|
2021-06-11 12:02:28 +00:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/build.gradle.kts
|
2023-09-24 23:05:05 +00:00
|
|
|
@@ -0,0 +1,91 @@
|
2021-06-11 12:02:28 +00:00
|
|
|
+plugins {
|
|
|
|
+ `java-library`
|
2021-06-15 01:50:13 +00:00
|
|
|
+ `maven-publish`
|
2021-06-11 12:02:28 +00:00
|
|
|
+}
|
|
|
|
+
|
|
|
|
+java {
|
|
|
|
+ withSourcesJar()
|
|
|
|
+ withJavadocJar()
|
|
|
|
+}
|
|
|
|
+
|
2023-06-07 16:24:39 +00:00
|
|
|
+val annotationsVersion = "24.0.1"
|
2024-01-26 19:17:06 +00:00
|
|
|
+val bungeeCordChatVersion = "1.20-R0.2"
|
2023-06-07 16:24:39 +00:00
|
|
|
+
|
2021-06-11 12:02:28 +00:00
|
|
|
+dependencies {
|
|
|
|
+ // api dependencies are listed transitively to API consumers
|
2023-09-21 17:18:04 +00:00
|
|
|
+ api("com.google.guava:guava:32.1.2-jre")
|
|
|
|
+ api("com.google.code.gson:gson:2.10.1")
|
2023-08-13 23:32:51 +00:00
|
|
|
+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
2023-09-21 17:18:04 +00:00
|
|
|
+ api("org.yaml:snakeyaml:2.2")
|
2023-03-14 17:11:24 +00:00
|
|
|
+ api("org.joml:joml:1.10.5")
|
2021-06-11 12:02:28 +00:00
|
|
|
+
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 02:09:28 +00:00
|
|
|
+ compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
|
|
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
|
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
2021-06-11 12:02:28 +00:00
|
|
|
+
|
2023-06-07 16:24:39 +00:00
|
|
|
+ val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
|
2021-06-11 12:02:28 +00:00
|
|
|
+ compileOnly(annotations)
|
|
|
|
+ testCompileOnly(annotations)
|
|
|
|
+
|
2022-06-08 15:31:27 +00:00
|
|
|
+ testImplementation("org.apache.commons:commons-lang3:3.12.0")
|
2023-09-24 07:16:58 +00:00
|
|
|
+ testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
|
|
|
|
+ testImplementation("org.hamcrest:hamcrest:2.2")
|
2023-09-21 16:48:55 +00:00
|
|
|
+ testImplementation("org.mockito:mockito-core:5.5.0")
|
2023-06-08 13:25:35 +00:00
|
|
|
+ testImplementation("org.ow2.asm:asm-tree:9.5")
|
2021-06-11 12:02:28 +00:00
|
|
|
+}
|
|
|
|
+
|
2021-06-15 01:50:13 +00:00
|
|
|
+configure<PublishingExtension> {
|
|
|
|
+ publications.create<MavenPublication>("maven") {
|
|
|
|
+ from(components["java"])
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
2021-06-13 01:28:41 +00:00
|
|
|
+val generateApiVersioningFile by tasks.registering {
|
2021-10-27 02:45:45 +00:00
|
|
|
+ inputs.property("version", project.version)
|
2021-06-13 01:28:41 +00:00
|
|
|
+ val pomProps = layout.buildDirectory.file("pom.properties")
|
|
|
|
+ outputs.file(pomProps)
|
2021-11-28 03:06:16 +00:00
|
|
|
+ val projectVersion = project.version
|
2021-06-13 01:28:41 +00:00
|
|
|
+ doLast {
|
2021-11-28 03:06:16 +00:00
|
|
|
+ pomProps.get().asFile.writeText("version=$projectVersion")
|
2021-06-13 01:28:41 +00:00
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
2021-06-11 12:02:28 +00:00
|
|
|
+tasks.jar {
|
2021-06-13 01:28:41 +00:00
|
|
|
+ from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
|
2021-11-26 06:08:46 +00:00
|
|
|
+ into("META-INF/maven/${project.group}/${project.name}")
|
2021-06-13 01:28:41 +00:00
|
|
|
+ }
|
2021-06-11 12:02:28 +00:00
|
|
|
+ manifest {
|
2021-10-27 02:45:45 +00:00
|
|
|
+ attributes(
|
2021-06-11 12:02:28 +00:00
|
|
|
+ "Automatic-Module-Name" to "org.bukkit"
|
|
|
|
+ )
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
2021-10-27 02:45:45 +00:00
|
|
|
+tasks.withType<Javadoc> {
|
2022-03-01 04:38:49 +00:00
|
|
|
+ val options = options as StandardJavadocDocletOptions
|
|
|
|
+ options.overview = "src/main/javadoc/overview.html"
|
2022-07-20 16:16:13 +00:00
|
|
|
+ options.use()
|
2022-03-01 04:38:49 +00:00
|
|
|
+ options.isDocFilesSubDirs = true
|
|
|
|
+ options.links(
|
2023-09-21 17:18:04 +00:00
|
|
|
+ "https://guava.dev/releases/32.1.2-jre/api/docs/",
|
|
|
|
+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
2023-06-07 16:24:39 +00:00
|
|
|
+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
|
2023-08-13 23:32:51 +00:00
|
|
|
+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
2021-06-11 12:02:28 +00:00
|
|
|
+ )
|
2023-04-09 00:00:50 +00:00
|
|
|
+ options.tags("apiNote:a:API Note:")
|
2022-03-01 04:38:49 +00:00
|
|
|
+
|
|
|
|
+ // workaround for https://github.com/gradle/gradle/issues/4046
|
|
|
|
+ inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset")
|
|
|
|
+ doLast {
|
|
|
|
+ copy {
|
|
|
|
+ from("src/main/javadoc") {
|
|
|
|
+ include("**/doc-files/**")
|
|
|
|
+ }
|
|
|
|
+ into("build/docs/javadoc")
|
|
|
|
+ }
|
|
|
|
+ }
|
2021-06-11 12:02:28 +00:00
|
|
|
+}
|
2023-09-24 23:05:05 +00:00
|
|
|
+
|
|
|
|
+tasks.test {
|
|
|
|
+ useJUnitPlatform()
|
|
|
|
+}
|
2021-06-17 17:11:00 +00:00
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
|
|
deleted file mode 100644
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 21:28:00 +00:00
|
|
|
index 0861b44936958613beba670b0d82e21d3aaf388b..0000000000000000000000000000000000000000
|
2021-06-17 17:11:00 +00:00
|
|
|
--- a/pom.xml
|
|
|
|
+++ /dev/null
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 02:09:28 +00:00
|
|
|
@@ -1,277 +0,0 @@
|
2021-06-17 17:11:00 +00:00
|
|
|
-
|
|
|
|
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
|
|
- 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>
|
|
|
|
-
|
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
|
|
- <artifactId>spigot-api</artifactId>
|
2023-12-07 20:14:35 +00:00
|
|
|
- <version>1.20.4-R0.1-SNAPSHOT</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <packaging>jar</packaging>
|
|
|
|
-
|
|
|
|
- <name>Spigot-API</name>
|
|
|
|
- <url>https://www.spigotmc.org/</url>
|
|
|
|
- <description>An enhanced plugin API for Minecraft servers.</description>
|
|
|
|
-
|
|
|
|
- <properties>
|
|
|
|
- <skipTests>true</skipTests>
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 21:28:00 +00:00
|
|
|
- <maven.compiler.source>17</maven.compiler.source>
|
|
|
|
- <maven.compiler.target>17</maven.compiler.target>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
|
- </properties>
|
|
|
|
-
|
|
|
|
- <distributionManagement>
|
|
|
|
- <repository>
|
|
|
|
- <id>spigotmc-releases</id>
|
|
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
|
|
|
|
- </repository>
|
|
|
|
- <snapshotRepository>
|
|
|
|
- <id>spigotmc-snapshots</id>
|
|
|
|
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
|
|
|
- </snapshotRepository>
|
|
|
|
- </distributionManagement>
|
|
|
|
-
|
|
|
|
- <dependencies>
|
|
|
|
- <!-- bundled with Minecraft, should be kept in sync -->
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>com.google.guava</groupId>
|
|
|
|
- <artifactId>guava</artifactId>
|
2023-09-21 17:18:04 +00:00
|
|
|
- <version>32.1.2-jre</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>compile</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <!-- bundled with Minecraft, should be kept in sync -->
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>com.google.code.gson</groupId>
|
|
|
|
- <artifactId>gson</artifactId>
|
2023-09-21 17:18:04 +00:00
|
|
|
- <version>2.10.1</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>compile</scope>
|
|
|
|
- </dependency>
|
2023-03-14 17:11:24 +00:00
|
|
|
- <!-- bundled with Minecraft, should be kept in sync -->
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.joml</groupId>
|
|
|
|
- <artifactId>joml</artifactId>
|
|
|
|
- <version>1.10.5</version>
|
|
|
|
- <scope>compile</scope>
|
|
|
|
- </dependency>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <dependency>
|
|
|
|
- <groupId>net.md-5</groupId>
|
|
|
|
- <artifactId>bungeecord-chat</artifactId>
|
2024-01-26 19:17:06 +00:00
|
|
|
- <version>1.20-R0.2</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <type>jar</type>
|
|
|
|
- <scope>compile</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.yaml</groupId>
|
|
|
|
- <artifactId>snakeyaml</artifactId>
|
2023-09-21 17:18:04 +00:00
|
|
|
- <version>2.2</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>compile</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <!-- not part of the API proper -->
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.apache.maven</groupId>
|
|
|
|
- <artifactId>maven-resolver-provider</artifactId>
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 02:09:28 +00:00
|
|
|
- <version>3.9.6</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>provided</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.apache.maven.resolver</groupId>
|
|
|
|
- <artifactId>maven-resolver-connector-basic</artifactId>
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 02:09:28 +00:00
|
|
|
- <version>1.9.18</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>provided</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.apache.maven.resolver</groupId>
|
|
|
|
- <artifactId>maven-resolver-transport-http</artifactId>
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 02:09:28 +00:00
|
|
|
- <version>1.9.18</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>provided</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <!-- annotations -->
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.jetbrains</groupId>
|
|
|
|
- <artifactId>annotations-java5</artifactId>
|
2023-06-07 16:24:39 +00:00
|
|
|
- <version>24.0.1</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>provided</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <!-- testing -->
|
|
|
|
- <dependency>
|
2023-09-24 07:16:58 +00:00
|
|
|
- <groupId>org.junit.jupiter</groupId>
|
|
|
|
- <artifactId>junit-jupiter</artifactId>
|
|
|
|
- <version>5.10.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>test</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.hamcrest</groupId>
|
2023-09-24 07:16:58 +00:00
|
|
|
- <artifactId>hamcrest</artifactId>
|
|
|
|
- <version>2.2</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>test</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
2023-09-21 16:48:55 +00:00
|
|
|
- <groupId>org.mockito</groupId>
|
|
|
|
- <artifactId>mockito-core</artifactId>
|
|
|
|
- <version>5.5.0</version>
|
|
|
|
- <scope>test</scope>
|
|
|
|
- </dependency>
|
|
|
|
- <dependency>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <groupId>org.ow2.asm</groupId>
|
|
|
|
- <artifactId>asm-tree</artifactId>
|
2023-06-07 16:24:39 +00:00
|
|
|
- <version>9.5</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <scope>test</scope>
|
|
|
|
- </dependency>
|
|
|
|
- </dependencies>
|
|
|
|
-
|
|
|
|
- <build>
|
|
|
|
- <plugins>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>net.md-5</groupId>
|
|
|
|
- <artifactId>scriptus</artifactId>
|
2023-08-06 00:21:59 +00:00
|
|
|
- <version>0.5.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <executions>
|
|
|
|
- <execution>
|
|
|
|
- <phase>initialize</phase>
|
|
|
|
- <goals>
|
|
|
|
- <goal>describe</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- </executions>
|
|
|
|
- </plugin>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-compiler-plugin</artifactId>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <version>3.11.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <configuration>
|
|
|
|
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
|
|
|
|
- <compilerId>eclipse</compilerId>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <!-- default changed with version 3.11.0 -->
|
|
|
|
- <showWarnings>false</showWarnings>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </configuration>
|
|
|
|
- <dependencies>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>org.codehaus.plexus</groupId>
|
|
|
|
- <artifactId>plexus-compiler-eclipse</artifactId>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <version>2.13.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </dependency>
|
|
|
|
- </dependencies>
|
|
|
|
- </plugin>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-jar-plugin</artifactId>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <version>3.3.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <configuration>
|
|
|
|
- <archive>
|
|
|
|
- <manifest>
|
|
|
|
- <addDefaultEntries>false</addDefaultEntries>
|
|
|
|
- </manifest>
|
|
|
|
- <manifestEntries>
|
|
|
|
- <Automatic-Module-Name>org.bukkit</Automatic-Module-Name>
|
|
|
|
- </manifestEntries>
|
|
|
|
- </archive>
|
|
|
|
- </configuration>
|
|
|
|
- </plugin>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-shade-plugin</artifactId>
|
2023-08-06 00:21:59 +00:00
|
|
|
- <version>3.5.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <executions>
|
|
|
|
- <execution>
|
|
|
|
- <phase>package</phase>
|
|
|
|
- <goals>
|
|
|
|
- <goal>shade</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- </executions>
|
|
|
|
- <configuration>
|
|
|
|
- <filters>
|
|
|
|
- <filter>
|
|
|
|
- <artifact>*:*</artifact>
|
|
|
|
- <excludes>
|
|
|
|
- <exclude>META-INF/MANIFEST.MF</exclude>
|
|
|
|
- </excludes>
|
|
|
|
- </filter>
|
|
|
|
- </filters>
|
|
|
|
- <!-- when downloading via Maven we can pull depends individually -->
|
|
|
|
- <shadedArtifactAttached>true</shadedArtifactAttached>
|
2023-03-10 20:18:50 +00:00
|
|
|
- <!-- In 3.3.0 and later, shadedArtifactAttached causes dependant projects to use dependency reduced pom (bug?) -->
|
|
|
|
- <createDependencyReducedPom>false</createDependencyReducedPom>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </configuration>
|
|
|
|
- </plugin>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-javadoc-plugin</artifactId>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <version>3.5.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <configuration>
|
|
|
|
- <links>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <link>https://guava.dev/releases/31.1-jre/api/docs/</link>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </links>
|
2023-04-09 00:00:50 +00:00
|
|
|
- <tags>
|
|
|
|
- <tag>
|
|
|
|
- <name>apiNote</name>
|
|
|
|
- <placement>a</placement>
|
|
|
|
- <head>API Note:</head>
|
|
|
|
- </tag>
|
|
|
|
- </tags>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </configuration>
|
|
|
|
- </plugin>
|
2023-09-24 07:16:58 +00:00
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-surefire-plugin</artifactId>
|
|
|
|
- <version>3.1.0</version>
|
|
|
|
- </plugin>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </plugins>
|
|
|
|
- </build>
|
|
|
|
-
|
|
|
|
- <profiles>
|
|
|
|
- <profile>
|
|
|
|
- <id>development</id>
|
|
|
|
- <properties>
|
|
|
|
- <skipTests>false</skipTests>
|
|
|
|
- </properties>
|
|
|
|
- <build>
|
|
|
|
- <plugins>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
|
- <artifactId>maven-checkstyle-plugin</artifactId>
|
2023-06-07 16:24:39 +00:00
|
|
|
- <version>3.3.0</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <executions>
|
|
|
|
- <execution>
|
|
|
|
- <phase>process-classes</phase>
|
|
|
|
- <goals>
|
|
|
|
- <goal>check</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- </executions>
|
|
|
|
- <configuration>
|
|
|
|
- <configLocation>checkstyle.xml</configLocation>
|
|
|
|
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
|
|
|
|
- </configuration>
|
|
|
|
- <dependencies>
|
|
|
|
- <dependency>
|
|
|
|
- <groupId>com.puppycrawl.tools</groupId>
|
|
|
|
- <artifactId>checkstyle</artifactId>
|
2021-11-22 05:21:37 +00:00
|
|
|
- <version>8.45.1</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- </dependency>
|
|
|
|
- </dependencies>
|
|
|
|
- </plugin>
|
|
|
|
- <plugin>
|
|
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
|
|
- <artifactId>animal-sniffer-maven-plugin</artifactId>
|
2023-04-07 18:39:13 +00:00
|
|
|
- <version>1.23</version>
|
2021-06-17 17:11:00 +00:00
|
|
|
- <executions>
|
|
|
|
- <execution>
|
|
|
|
- <phase>process-classes</phase>
|
|
|
|
- <goals>
|
|
|
|
- <goal>check</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- </executions>
|
|
|
|
- <configuration>
|
|
|
|
- <signature>
|
|
|
|
- <groupId>org.codehaus.mojo.signature</groupId>
|
|
|
|
- <artifactId>java18</artifactId>
|
|
|
|
- <version>1.0</version>
|
|
|
|
- </signature>
|
|
|
|
- </configuration>
|
|
|
|
- </plugin>
|
|
|
|
- </plugins>
|
|
|
|
- </build>
|
|
|
|
- </profile>
|
|
|
|
- </profiles>
|
|
|
|
-</project>
|