Merge pull request #348 from DemonWav/pom

Add repo to handle the bungee-cord chat dependency
This commit is contained in:
kashike 2016-06-22 22:41:50 -07:00 committed by GitHub
commit dc33259d0d
3 changed files with 28 additions and 14 deletions

View File

@ -1,11 +1,11 @@
From f24f0b8ba5724ebdbe7d09a476607b43dd626645 Mon Sep 17 00:00:00 2001
From 0ab9576478ff7a43d94367022d1302d353729635 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 0f5b26c..ead01eb 100644
index 0f5b26c..d6df6cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -36,7 +36,7 @@ index 0f5b26c..ead01eb 100644
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <!--PaperSpigot - Bump to 1.8 - This will haunt me -->
+ <!-- Paper - Bump to 1.8 - This will haunt me -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
@ -59,7 +59,21 @@ index 0f5b26c..ead01eb 100644
</snapshotRepository>
</distributionManagement>
@@ -107,6 +109,7 @@
@@ -44,6 +46,13 @@
</pluginRepository>
</pluginRepositories>
+ <repositories>
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -107,6 +116,7 @@
</dependencies>
<build>
@ -67,7 +81,7 @@ index 0f5b26c..ead01eb 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,26 +132,6 @@
@@ -129,26 +139,6 @@
</dependencies>
</plugin>
<plugin>
@ -95,5 +109,5 @@ index 0f5b26c..ead01eb 100644
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
--
2.8.3
2.9.0

View File

@ -1,14 +1,14 @@
From 95be64b105c7cc5e412441b55ef5257a9aacb660 Mon Sep 17 00:00:00 2001
From 68c630ca51baec9eb6c20b206e7119fd72c9c854 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 1 Apr 2016 00:02:47 -0400
Subject: [PATCH] add Trove and FastUtil to Bukkit
diff --git a/pom.xml b/pom.xml
index a03865f..597f65c 100644
index 46df34d..5e5e5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,19 @@
@@ -55,6 +55,19 @@
<dependencies>
<dependency>
@ -29,5 +29,5 @@ index a03865f..597f65c 100644
<artifactId>commons-lang</artifactId>
<version>2.6</version>
--
2.8.0
2.9.0

View File

@ -1,4 +1,4 @@
From 4c640a3a8199ea1b1653e9e03e65e4b6af3b4697 Mon Sep 17 00:00:00 2001
From 9c26223cc08641a0cc1ce815215a989c5867adbb Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors.
@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml
index 597f65c..58ddcf3 100644
index 5e5e5e4..5b70369 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,12 @@
@@ -126,6 +126,12 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
@ -395,5 +395,5 @@ index 93a43dd..7229b25 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
--
2.8.0
2.9.0