diff options
| author | sulu5890 <[email protected]> | 2021-12-19 18:10:11 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-19 16:10:11 -0800 |
| commit | d77c69f3ed32a8009f50c54c607095e87dee3a10 (patch) | |
| tree | de023072bfe6f2335373a69759f6fdbdc7780258 /Spigot-Server-Patches/0001-POM-Changes.patch | |
| parent | fcf419512dfb929925e3caab195f7c1a89cd01c2 (diff) | |
| download | Paper-ver/1.9.4.tar.gz Paper-ver/1.9.4.zip | |
Update Log4J (1.9.4) (#7151)ver/1.9.4
* Update Upstream (Craftbukkit)
* update log4j
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 3ed837a649..b7fefeac13 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 1f44ac1349b9039a365ca63f7ec578fdbc0974ea Mon Sep 17 00:00:00 2001 +From 4739bc1f1d6337e2a5467eabbcfa555b0cd070fb 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 95a9224..00edfb5 100644 +index 91a7135d5..b4f523866 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -54,7 +54,7 @@ index 95a9224..00edfb5 100644 <version>${project.version}</version> <scope>compile</scope> </dependency> -@@ -93,34 +94,22 @@ +@@ -99,34 +100,22 @@ <!-- This builds a completely 'ready to start' jar with all dependencies inside --> <build> @@ -100,7 +100,7 @@ index 95a9224..00edfb5 100644 </goals> </execution> </executions> -@@ -130,11 +119,12 @@ +@@ -136,11 +125,12 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.6</version> <configuration> @@ -114,10 +114,11 @@ index 95a9224..00edfb5 100644 <Implementation-Vendor>Bukkit Team</Implementation-Vendor> <Specification-Title>Bukkit</Specification-Title> <Specification-Version>${api.version}</Specification-Version> -@@ -164,26 +154,6 @@ +@@ -169,26 +159,6 @@ + </archive> </configuration> </plugin> - <plugin> +- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.14</version> @@ -137,11 +138,10 @@ index 95a9224..00edfb5 100644 - </signature> - </configuration> - </plugin> -- <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> -@@ -194,11 +164,13 @@ +@@ -200,11 +170,13 @@ <goal>shade</goal> </goals> <configuration> @@ -159,7 +159,7 @@ index 95a9224..00edfb5 100644 <relocation> <pattern>jline</pattern> <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern> -@@ -232,20 +204,6 @@ +@@ -238,20 +210,6 @@ <artifactId>maven-compiler-plugin</artifactId> <!-- versions after this appear to be broken --> <version>3.1</version> @@ -181,7 +181,7 @@ index 95a9224..00edfb5 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 93046379d..674096cab 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.8.3.windows.1 +2.34.0 |