diff options
| author | Nassim Jahnke <[email protected]> | 2023-09-24 17:16:58 +1000 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2023-09-24 18:25:25 +1000 |
| commit | e284bb12156fad92767ceadf3d5e57cbc71e5b21 (patch) | |
| tree | 8729234f3b355b10c44a7f6b87cbb85f435bd611 /patches/server/0001-Setup-Gradle-project.patch | |
| parent | 7a00758b1b952c308041d87632b84a48dc18535f (diff) | |
| download | Paper-e284bb12156fad92767ceadf3d5e57cbc71e5b21.tar.gz Paper-e284bb12156fad92767ceadf3d5e57cbc71e5b21.zip | |
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:
fb23cbb3 Define surefire plugin version
d022084a Define ordering for MetadataStoreTest
99a7f6f0 PR-910: Match generic max absorption attribute name style with the rest
c7390d71 PR-909: Update tests to JUnit 5
CraftBukkit Changes:
f0661c351 PR-1230: Move unstructured PDC NBT serialisation to SNBT
452fcb599 PR-1256: Update tests to JUnit 5
Diffstat (limited to 'patches/server/0001-Setup-Gradle-project.patch')
| -rw-r--r-- | patches/server/0001-Setup-Gradle-project.patch | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 0131e45bdb..770cfecb0e 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..91a5d6e9775010336da28ed6e2f6654b0f7248f6 +index 0000000000000000000000000000000000000000..398df317e5a84e8916a86209e10c127e23bdd563 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,138 @@ @@ -55,8 +55,8 @@ index 0000000000000000000000000000000000000000..91a5d6e9775010336da28ed6e2f6654b + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + -+ testImplementation("junit:junit:4.13.2") -+ testImplementation("org.hamcrest:hamcrest-library:1.3") ++ testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") ++ testImplementation("org.hamcrest:hamcrest:2.2") +} + +val craftbukkitPackageVersion = "1_20_R2" // Paper @@ -172,10 +172,10 @@ index 0000000000000000000000000000000000000000..91a5d6e9775010336da28ed6e2f6654b +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index f71302bc9a652ece0f80ca3e1f00cff46ed50619..0000000000000000000000000000000000000000 +index 533f4ac3041ff81a4691591e42f16f710a7d23ac..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,590 +0,0 @@ +@@ -1,596 +0,0 @@ -<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> @@ -402,6 +402,12 @@ index f71302bc9a652ece0f80ca3e1f00cff46ed50619..00000000000000000000000000000000 - <artifactId>json-simple</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> +- <exclusions> +- <exclusion> +- <groupId>junit</groupId> +- <artifactId>junit</artifactId> +- </exclusion> +- </exclusions> - </dependency> - <dependency> - <groupId>org.xerial</groupId> @@ -443,15 +449,15 @@ index f71302bc9a652ece0f80ca3e1f00cff46ed50619..00000000000000000000000000000000 - </dependency> - <!-- testing --> - <dependency> -- <groupId>junit</groupId> -- <artifactId>junit</artifactId> -- <version>4.13.2</version> +- <groupId>org.junit.jupiter</groupId> +- <artifactId>junit-jupiter</artifactId> +- <version>5.10.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> -- <artifactId>hamcrest-library</artifactId> -- <version>1.3</version> +- <artifactId>hamcrest</artifactId> +- <version>2.2</version> - <scope>test</scope> - </dependency> - </dependencies> |