diff options
Diffstat (limited to 'Spigot-Server-Patches/0001-POM-Changes.patch')
| -rw-r--r-- | Spigot-Server-Patches/0001-POM-Changes.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 19c58dee0c..9ee104e2d3 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 1f8f0180d8a5714931673fe8fabce687a0c24095 Mon Sep 17 00:00:00 2001 +From 738ae947990c5e57c2623f02a0a4956a50e158bd Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 6d019d1..0e88ae2 100644 +index 930cdb2f..d8705b50 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -54,7 +54,7 @@ index 6d019d1..0e88ae2 100644 <version>${project.version}</version> <scope>compile</scope> </dependency> -@@ -94,34 +95,22 @@ +@@ -100,34 +101,22 @@ <!-- This builds a completely 'ready to start' jar with all dependencies inside --> <build> @@ -100,7 +100,7 @@ index 6d019d1..0e88ae2 100644 </goals> </execution> </executions> -@@ -131,11 +120,12 @@ +@@ -137,11 +126,12 @@ <artifactId>maven-jar-plugin</artifactId> <version>3.0.2</version> <configuration> @@ -114,10 +114,11 @@ index 6d019d1..0e88ae2 100644 <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor> <Specification-Title>Bukkit</Specification-Title> <Specification-Version>${api.version}</Specification-Version> -@@ -165,26 +155,6 @@ +@@ -170,26 +160,6 @@ + </archive> </configuration> </plugin> - <plugin> +- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> @@ -137,11 +138,10 @@ index 6d019d1..0e88ae2 100644 - </signature> - </configuration> - </plugin> -- <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> -@@ -195,11 +165,13 @@ +@@ -201,11 +171,13 @@ <goal>shade</goal> </goals> <configuration> @@ -159,7 +159,7 @@ index 6d019d1..0e88ae2 100644 <relocation> <pattern>jline</pattern> <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern> -@@ -238,20 +210,6 @@ +@@ -244,20 +216,6 @@ <artifactId>maven-compiler-plugin</artifactId> <!-- versions after this appear to be broken --> <version>3.1</version> @@ -181,7 +181,7 @@ index 6d019d1..0e88ae2 100644 <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 9304637..674096c 100644 +index 93046379..674096ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -194,5 +194,5 @@ index 9304637..674096c 100644 if (stream != null) { -- -2.9.3 +2.34.0 |