Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-07-04 18:55:07 +02:00
Code Issues Projects Releases Wiki Activity

Update maven shade plugin so that newer maven versions (ie travis) will compile.

Browse Source
This commit is contained in:
md_5 2013-12-03 08:21:58 +11:00
parent af7cb96f76
commit 31572d6c20
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Bukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From 2bb359a6e5b56a5e53f765efa8aea93c2db727fb Mon Sep 17 00:00:00 2001 From 3ab78de5ed40a1b0368005186ae44885139aff05 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000 Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index a83e578..e1f4e61 100644 index a83e578..718a2f6 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,43 +1,23 @@ @@ -1,43 +1,23 @@
@ -64,6 +64,15 @@ index a83e578..e1f4e61 100644
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@@ -52,7 +32,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
+ <version>2.1</version>
<executions>
<execution>
<phase>package</phase>
-- --
1.8.3.2 1.8.3.2

6
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From ea9533f887254b6ec417d9e69a0eb81b9676c7ad Mon Sep 17 00:00:00 2001 From 4b914f695027412127875091a38d36fbddc46a07 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000 Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 2afdff4..a77fec8 100644 index 2afdff4..fb6b5c4 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,12 +1,20 @@ @@ -1,12 +1,20 @@
@ -137,7 +137,7 @@ index 2afdff4..a77fec8 100644
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version> - <version>1.4</version>
+ <version>2.0</version> + <version>2.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>