Add javax.annotations to the API
Used this set specifically because they are present in NMS already.
This commit is contained in:
parent
14c974629c
commit
f7cfe1f769
|
@ -1,11 +1,11 @@
|
||||||
From 1952464796554ba4222887f450760dae3bbbaf8d Mon Sep 17 00:00:00 2001
|
From 14af75d25b745ae4d5f22e35b0c93872d74b7176 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Mon, 29 Feb 2016 17:16:08 -0600
|
Date: Mon, 29 Feb 2016 17:16:08 -0600
|
||||||
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 217ce0b..bbfdf47 100644
|
index 217ce0b..65638f7 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -4,35 +4,37 @@
|
@@ -4,35 +4,37 @@
|
||||||
|
@ -73,7 +73,21 @@ index 217ce0b..bbfdf47 100644
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-lang</groupId>
|
<groupId>commons-lang</groupId>
|
||||||
@@ -107,6 +116,7 @@
|
@@ -58,6 +67,13 @@
|
||||||
|
<type>jar</type>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
+ <!-- bundled with Minecraft, shouldn't ever change -->
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>javax.annotation</groupId>
|
||||||
|
+ <artifactId>javax-annotations</artifactId>
|
||||||
|
+ <version>1.0.0</version>
|
||||||
|
+ <scope>compile</scope>
|
||||||
|
+ </dependency>
|
||||||
|
<!-- bundled with Minecraft, should be kept in sync -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.guava</groupId>
|
||||||
|
@@ -107,6 +123,7 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -81,7 +95,7 @@ index 217ce0b..bbfdf47 100644
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@@ -129,26 +139,6 @@
|
@@ -129,26 +146,6 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -109,5 +123,5 @@ index 217ce0b..bbfdf47 100644
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>2.4.1</version>
|
<version>2.4.1</version>
|
||||||
--
|
--
|
||||||
2.5.0
|
2.10.0.windows.1
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 10a4791de112ae58095cfc6027dc367edd1097a0 Mon Sep 17 00:00:00 2001
|
From 26c8d481578cd7a29103c0c3d22939dfd0c85d63 Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Thu, 3 Mar 2016 13:20:33 -0700
|
Date: Thu, 3 Mar 2016 13:20:33 -0700
|
||||||
Subject: [PATCH] Use ASM for event executors.
|
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.
|
Uses method handles for private or static methods.
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 6646f4a..a7f6468 100644
|
index f1c9e34..400968f 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -126,6 +126,12 @@
|
@@ -133,6 +133,12 @@
|
||||||
<version>1.3</version>
|
<version>1.3</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -395,5 +395,5 @@ index d8b9c24..40fd71d 100644
|
||||||
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
|
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
|
||||||
} else {
|
} else {
|
||||||
--
|
--
|
||||||
2.9.3
|
2.10.0.windows.1
|
||||||
|
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -40,6 +40,10 @@
|
||||||
<id>aikar</id>
|
<id>aikar</id>
|
||||||
<url>http://ci.emc.gs/nexus/content/repositories/aikar/</url>
|
<url>http://ci.emc.gs/nexus/content/repositories/aikar/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>destroystokyo-releases</id>
|
||||||
|
<url>https://repo.destroystokyo.com/repository/maven-releases/</url>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
|
Loading…
Reference in New Issue