From c62c0298a2eb0560a4fa16f7c0ae2ba240f7f342 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 22:56:02 -0500
Subject: [PATCH] Fix JB annotation deps

---
 acf-parent.iml          | 2 +-
 bukkit/acf-bukkit.iml   | 2 +-
 bungee/acf-bungee.iml   | 2 +-
 core/acf-core.iml       | 2 +-
 core/pom.xml            | 5 -----
 example/acf-example.iml | 2 +-
 paper/acf-paper.iml     | 2 +-
 pom.xml                 | 2 +-
 sponge/acf-sponge.iml   | 2 +-
 9 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/acf-parent.iml b/acf-parent.iml
index 5c58bc6f..80200244 100644
--- a/acf-parent.iml
+++ b/acf-parent.iml
@@ -9,6 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:15.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/bukkit/acf-bukkit.iml b/bukkit/acf-bukkit.iml
index 7a23b06c..81e6649a 100644
--- a/bukkit/acf-bukkit.iml
+++ b/bukkit/acf-bukkit.iml
@@ -32,6 +32,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.18" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:15.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/bungee/acf-bungee.iml b/bungee/acf-bungee.iml
index d6bcb2d6..6fce7dba 100644
--- a/bungee/acf-bungee.iml
+++ b/bungee/acf-bungee.iml
@@ -36,6 +36,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-resolver:4.1.12.Final" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:15.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/acf-core.iml b/core/acf-core.iml
index 9fb1fe8b..750c642e 100644
--- a/core/acf-core.iml
+++ b/core/acf-core.iml
@@ -16,10 +16,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:15.0" level="project" />
     <orderEntry type="library" name="Maven: co.aikar:locales:1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:15.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 54fffc55..242857cf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,11 +40,6 @@
     <name>ACF (Core)</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>15.0</version>
-        </dependency>
         <dependency>
             <groupId>co.aikar</groupId>
             <artifactId>locales</artifactId>
diff --git a/example/acf-example.iml b/example/acf-example.iml
index 38a1074f..b14239c2 100644
--- a/example/acf-example.iml
+++ b/example/acf-example.iml
@@ -36,10 +36,10 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
     <orderEntry type="module" module-name="acf-bukkit" />
     <orderEntry type="module" module-name="acf-core" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:15.0" level="project" />
     <orderEntry type="library" name="Maven: co.aikar:locales:1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/paper/acf-paper.iml b/paper/acf-paper.iml
index 7ac82efa..9269e893 100644
--- a/paper/acf-paper.iml
+++ b/paper/acf-paper.iml
@@ -41,6 +41,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:15.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 280bccd1..aa3117af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>13.0</version>
+            <version>15.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sponge/acf-sponge.iml b/sponge/acf-sponge.iml
index 7e5963f4..ca8de4b2 100644
--- a/sponge/acf-sponge.iml
+++ b/sponge/acf-sponge.iml
@@ -43,6 +43,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.flowpowered:flow-noise:1.0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:15.0" level="project" />
   </component>
 </module>
\ No newline at end of file