Actually include Tomcat (and dependencies)

This commit is contained in:
zreed 2014-10-15 22:00:11 -04:00
parent 8fcd286eb0
commit 7e961fc2a3

13
pom.xml
View File

@ -77,7 +77,8 @@
<includes> <includes>
<include>com.turt2live.metrics:MetricsExtension</include> <include>com.turt2live.metrics:MetricsExtension</include>
<include>commons-logging:commons-logging</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> </includes>
</artifactSet> </artifactSet>
<relocations> <relocations>
@ -90,8 +91,12 @@
<shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern> <shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.tomcat.jdbc</pattern> <pattern>org.apache.juli</pattern>
<shadedPattern>com.gmail.nossr50.org.apache.tomcat.jdbc</shadedPattern> <shadedPattern>com.gmail.nossr50.database.tomcat.juli</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.tomcat</pattern>
<shadedPattern>com.gmail.nossr50.database.tomcat</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
</configuration> </configuration>
@ -150,7 +155,7 @@
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId> <artifactId>tomcat-jdbc</artifactId>
<version>7.0.52</version> <version>7.0.52</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<distributionManagement> <distributionManagement>