diff options
| author | Zach Brown <[email protected]> | 2016-02-15 08:22:37 -0600 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2016-02-15 08:22:37 -0600 |
| commit | bf58a0d2783fe29e938032af6df032cd06641dc2 (patch) | |
| tree | 0a3d47ad4de31dae7182463a86a074d9da6c3daa | |
| parent | 2cf460f29ed4c844c4e85795fed922dc9d95bcdb (diff) | |
| download | Paper-bf58a0d2783fe29e938032af6df032cd06641dc2.tar.gz Paper-bf58a0d2783fe29e938032af6df032cd06641dc2.zip | |
Downgrade versioning plugin, fix build
| -rw-r--r-- | Spigot-Server-Patches/0001-POM-Changes.patch | 13 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 7778f227d2..2b3bda1bfa 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From e060c4c376a9d7a27eb43d52817182e12281cf00 Mon Sep 17 00:00:00 2001 +From 04c8eebe965a800482f27c0b0aa00d1c9175cf01 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Thu, 19 Mar 2015 19:41:15 -0500 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 91627ff..85dff6f 100644 +index 91627ff..19e47f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -67,7 +67,7 @@ index 91627ff..85dff6f 100644 </pluginRepositories> <!-- This builds a completely 'ready to start' jar with all dependencies inside --> -@@ -103,36 +109,21 @@ +@@ -103,36 +109,22 @@ <defaultGoal>install</defaultGoal> <plugins> <plugin> @@ -103,9 +103,10 @@ index 91627ff..85dff6f 100644 - </plugin> + <groupId>com.lukegb.mojo</groupId> + <artifactId>gitdescribe-maven-plugin</artifactId> -+ <version>3.1-SNAPSHOT</version> ++ <version>1.3</version> + <configuration> + <outputPrefix>git-PaperSpigot-</outputPrefix> ++ <scmDirectory>${project.}</scmDirectory> + </configuration> + <executions> + <execution> @@ -119,7 +120,7 @@ index 91627ff..85dff6f 100644 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> -@@ -142,7 +133,7 @@ +@@ -142,7 +134,7 @@ <manifestEntries> <Main-Class>org.bukkit.craftbukkit.Main</Main-Class> <Implementation-Title>CraftBukkit</Implementation-Title> @@ -128,7 +129,7 @@ index 91627ff..85dff6f 100644 <Implementation-Vendor>Bukkit Team</Implementation-Vendor> <Specification-Title>Bukkit</Specification-Title> <Specification-Version>${api.version}</Specification-Version> -@@ -172,26 +163,6 @@ +@@ -172,26 +164,6 @@ </configuration> </plugin> <plugin> diff --git a/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch b/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch index d4c7e10eff..5c5a8d22b2 100644 --- a/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch +++ b/Spigot-Server-Patches/0042-Fix-jar-being-shaded-multiple-times.patch @@ -1,14 +1,14 @@ -From 0f95432dde26db7643e8ca3c7e0f04de6e18e51f Mon Sep 17 00:00:00 2001 +From d50dae836a3d3f52e9c5be6089246adadbb71628 Mon Sep 17 00:00:00 2001 From: Jedediah Smith <[email protected]> Date: Thu, 30 Apr 2015 22:42:34 -0400 Subject: [PATCH] Fix jar being shaded multiple times diff --git a/pom.xml b/pom.xml -index 85dff6f..d0468a9 100644 +index 19e47f4..68073c0 100644 --- a/pom.xml +++ b/pom.xml -@@ -129,6 +129,7 @@ +@@ -130,6 +130,7 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.5</version> <configuration> |