Revert "Fix tomcat dependency versions." This reverts commit 3e65e78c33ca47404905cea8558d9e0e2800241f.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2cae8662 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2cae8662 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2cae8662 Branch: refs/heads/master Commit: 2cae8662d13cc0e51380552a0e46a2f6b5163c27 Parents: 3e65e78 Author: Michael Russo <[email protected]> Authored: Wed Jul 6 22:21:53 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Jul 6 22:21:53 2016 -0700 ---------------------------------------------------------------------- stack/pom.xml | 3 +-- stack/test-utils/pom.xml | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2cae8662/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index 5fd0817..1bf1f92 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -118,7 +118,6 @@ <slf4j-version>1.7.2</slf4j-version> <snakeyaml-version>1.9</snakeyaml-version> <tomcat-version>8.5.3</tomcat-version> - <tomcat-logging-version>8.5.2</tomcat-logging-version> <antlr.version>3.4</antlr.version> <tika.version>1.4</tika.version> <mockito.version>1.10.8</mockito.version> @@ -909,7 +908,7 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcat-logging-version}</version> + <version>${tomcat-version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/usergrid/blob/2cae8662/stack/test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml index b460198..c104f0a 100644 --- a/stack/test-utils/pom.xml +++ b/stack/test-utils/pom.xml @@ -245,31 +245,26 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat-version}</version> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcat-logging-version}</version> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> - <version>${tomcat-version}</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jasper-el</artifactId> - <version>${tomcat-version}</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jsp-api</artifactId> - <version>${tomcat-version}</version> </dependency> </dependencies>
