From 7e961fc2a36e2a98c2c4ef3e4a3d196be2a7c51a Mon Sep 17 00:00:00 2001
From: zreed <zach@digitalforgemc.com>
Date: Wed, 15 Oct 2014 22:00:11 -0400
Subject: [PATCH] Actually include Tomcat (and dependencies)

---
 pom.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2901042e..de4aa4b0a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,8 @@
                         <includes>
                             <include>com.turt2live.metrics:MetricsExtension</include>
                             <include>commons-logging:commons-logging</include>
-                            <include>net.snaq:dbpool</include>
+                            <include>org.apache.tomcat:tomcat-jdbc</include>
+                            <include>org.apache.tomcat:tomcat-juli</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -90,8 +91,12 @@
                             <shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>org.apache.tomcat.jdbc</pattern>
-                            <shadedPattern>com.gmail.nossr50.org.apache.tomcat.jdbc</shadedPattern>
+                            <pattern>org.apache.juli</pattern>
+                            <shadedPattern>com.gmail.nossr50.database.tomcat.juli</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.tomcat</pattern>
+                            <shadedPattern>com.gmail.nossr50.database.tomcat</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -150,7 +155,7 @@
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jdbc</artifactId>
             <version>7.0.52</version>
-        <scope>compile</scope>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
     <distributionManagement>