Update Upstream

This commit is contained in:
Aikar 2016-11-18 23:58:56 -05:00
parent ae5a66ed1b
commit 9725050889
24 changed files with 110 additions and 107 deletions

View file

@ -1,11 +1,11 @@
From ac84151c8a02652a1137b7853894796dba4c3df3 Mon Sep 17 00:00:00 2001
From 9576b81c87a4dfb2e3f672f6435779e65468e671 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 2ccc205..6e0250c 100644
index 4b788b0..20159ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -87,7 +87,7 @@ index 2ccc205..6e0250c 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -107,6 +123,7 @@
@@ -108,6 +124,7 @@
</dependencies>
<build>
@ -95,7 +95,7 @@ index 2ccc205..6e0250c 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,26 +146,6 @@
@@ -130,26 +147,6 @@
</dependencies>
</plugin>
<plugin>
@ -122,7 +122,7 @@ index 2ccc205..6e0250c 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
@@ -161,8 +158,7 @@
@@ -162,8 +159,7 @@
</execution>
</executions>
<configuration>