From 2ea2303444f45adecd0b6298caa6940163433b08 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Jun 2017 14:02:16 -0400
Subject: [PATCH] Fix some deps, timings shouldnt of been in core, target Guava
 15 (MC1.7)

---
 bukkit/pom.xml        |  6 ++++++
 bungee/acf-bungee.iml | 11 +++++------
 core/acf-core.iml     |  3 +--
 core/pom.xml          |  8 +-------
 sponge/acf-sponge.iml |  1 -
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index be07b11e..ae9c2ba7 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -46,6 +46,12 @@
             <version><!--VERSION-->0.5.0-SNAPSHOT<!--VERSION--></version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>co.aikar</groupId>
+            <artifactId>minecraft-timings</artifactId>
+            <version>1.0.3</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
diff --git a/bungee/acf-bungee.iml b/bungee/acf-bungee.iml
index 7eae67f3..51d9b321 100644
--- a/bungee/acf-bungee.iml
+++ b/bungee/acf-bungee.iml
@@ -19,7 +19,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="acf-core" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-api:1.12-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
@@ -27,11 +26,11 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.18" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-event:1.12-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-protocol:1.12-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec:4.1.9.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport:4.1.9.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-buffer:4.1.9.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-common:4.1.9.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-resolver:4.1.9.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec:4.1.12.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport:4.1.12.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-buffer:4.1.12.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-common:4.1.12.Final" level="project" />
+    <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:20.0" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
diff --git a/core/acf-core.iml b/core/acf-core.iml
index 5882babb..6dbf4a62 100644
--- a/core/acf-core.iml
+++ b/core/acf-core.iml
@@ -16,8 +16,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:15.0" 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/core/pom.xml b/core/pom.xml
index 3e55f8d1..18696a9e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,16 +40,10 @@
     <name>ACF (Core)</name>
 
     <dependencies>
-        <dependency>
-            <groupId>co.aikar</groupId>
-            <artifactId>minecraft-timings</artifactId>
-            <version>1.0.3</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>17.0</version>
+            <version>15.0</version>
              <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/sponge/acf-sponge.iml b/sponge/acf-sponge.iml
index 33bee6f1..8b98d79d 100644
--- a/sponge/acf-sponge.iml
+++ b/sponge/acf-sponge.iml
@@ -19,7 +19,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="acf-core" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spongepowered:spongeapi:5.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />