You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/07/26 21:17:56 UTC
[17/50] usergrid git commit: Fix tomcat dependency versions.
Fix tomcat dependency versions.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3e65e78c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3e65e78c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3e65e78c
Branch: refs/heads/apigee-sso-provider
Commit: 3e65e78c33ca47404905cea8558d9e0e2800241f
Parents: 4613e09
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 17:25:56 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 17:25:56 2016 -0700
----------------------------------------------------------------------
stack/pom.xml | 3 ++-
stack/test-utils/pom.xml | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3e65e78c/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1bf1f92..5fd0817 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -118,6 +118,7 @@
<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>
@@ -908,7 +909,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat-version}</version>
+ <version>${tomcat-logging-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3e65e78c/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index c104f0a..b460198 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -245,26 +245,31 @@
<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>