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/07 05:22:26 UTC
[1/2] usergrid git commit: Revert "Fix tomcat dependency versions."
Repository: usergrid
Updated Branches:
refs/heads/release-2.1.1 3e65e78c3 -> 86ae2cd01
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/release-2.1.1
Commit: 2cae8662d13cc0e51380552a0e46a2f6b5163c27
Parents: 3e65e78
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 22:21:53 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
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>
[2/2] usergrid git commit: Revert "Add support for later versions of
tomcat."
Posted by mr...@apache.org.
Revert "Add support for later versions of tomcat."
This reverts commit 4613e09ee9d5b6df8fae3cc6419142d09a98c312.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/86ae2cd0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/86ae2cd0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/86ae2cd0
Branch: refs/heads/release-2.1.1
Commit: 86ae2cd01175a9f861e4fdcf0fbc0c0e96004334
Parents: 2cae866
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 22:22:03 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 22:22:03 2016 -0700
----------------------------------------------------------------------
stack/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/86ae2cd0/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1bf1f92..dd35891 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -117,7 +117,7 @@
<shiro-version>1.2.4</shiro-version>
<slf4j-version>1.7.2</slf4j-version>
<snakeyaml-version>1.9</snakeyaml-version>
- <tomcat-version>8.5.3</tomcat-version>
+ <tomcat-version>7.0.64</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
<mockito.version>1.10.8</mockito.version>