You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/20 15:46:58 UTC
[30/50] [abbrv] git commit: Fix some issues found during testing.
Fix some issues found during testing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bdcf8050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bdcf8050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bdcf8050
Branch: refs/heads/two-dot-o-events
Commit: bdcf80509e662442ccad312e19b878812f467eac
Parents: 7c06f6b
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 17 15:01:54 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 17 15:01:54 2014 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 21 ---------------------
stack/pom.xml | 4 ++--
stack/rest/src/main/webapp/WEB-INF/web.xml | 2 +-
3 files changed, 3 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdcf8050/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index 30a14d1..7bd4da4 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -540,14 +540,6 @@
<type>jar</type>
</dependency>
-
- <!--<dependency>-->
- <!--<artifactId>lucene-core</artifactId>-->
- <!--<groupId>org.apache.lucene</groupId>-->
- <!--<type>jar</type>-->
- <!--<version>4.7.2</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.jukito</groupId>
<artifactId>jukito</artifactId>
@@ -555,19 +547,6 @@
<scope>test</scope>
</dependency>
-<!-- <dependency>
- <groupId>org.apache.usergrid.chop</groupId>
- <artifactId>chop-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.usergrid.chop</groupId>
- <artifactId>chop-stack</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- -->
-
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdcf8050/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 9231a2f..94135e8 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -115,7 +115,7 @@
<tomcat-version>7.0.52</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
- <elasticsearch.version>1.2.4</elasticsearch.version>
+ <elasticsearch.version>1.3.2</elasticsearch.version>
<usergrid.it.forkCount>3</usergrid.it.forkCount>
<usergrid.it.reuseForks>false</usergrid.it.reuseForks>
@@ -208,7 +208,7 @@
https://issues.apache.org/jira/browse/USERGRID-224
<module>launcher</module>
-->
- <!-- <module>mongo-emulator</module> -->
+ <module>mongo-emulator</module>
<!--
Re-enable when query-validator updated to work with Core Persistence.
https://issues.apache.org/jira/browse/USERGRID-221
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdcf8050/stack/rest/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/webapp/WEB-INF/web.xml b/stack/rest/src/main/webapp/WEB-INF/web.xml
index 92753de..24a82ca 100644
--- a/stack/rest/src/main/webapp/WEB-INF/web.xml
+++ b/stack/rest/src/main/webapp/WEB-INF/web.xml
@@ -59,7 +59,7 @@
<filter-name>contentTypeFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- `
+
<filter>
<filter-name>shiroFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>