Repository: rave Updated Branches: refs/heads/angular 7ac9d69d3 -> 3ae74e7aa
RAVE-1097 - Upgraded to spring mongo 1.1.2 to resolve dependency issue - Fixed unit test that was failing after upgrade. Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/18d5ae2b Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/18d5ae2b Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/18d5ae2b Branch: refs/heads/angular Commit: 18d5ae2b6d6b3741f1c9828cd5f8ea317fa39194 Parents: 1e068c5 Author: Chris Geer <[email protected]> Authored: Sun Jul 6 14:03:55 2014 -0700 Committer: Chris Geer <[email protected]> Committed: Sun Jul 6 14:03:55 2014 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/18d5ae2b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1df8300..706915a 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ <org.springframework.version>3.2.3.RELEASE</org.springframework.version> <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version> <org.springframework.mobile.version>1.0.1.RELEASE</org.springframework.mobile.version> - <org.springframework.data.mongodb.version>1.0.3.RELEASE</org.springframework.data.mongodb.version> + <org.springframework.data.mongodb.version>1.1.2.RELEASE</org.springframework.data.mongodb.version> <jstl.version>1.2</jstl.version> <javax.servlet.version>2.5</javax.servlet.version> <jsp-api.version>2.1</jsp-api.version> http://git-wip-us.apache.org/repos/asf/rave/blob/18d5ae2b/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java ---------------------------------------------------------------------- diff --git a/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java b/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java index 0ec2d95..3adde54 100644 --- a/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java +++ b/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java @@ -305,7 +305,7 @@ public class MongoDbRegionWidgetRepositoryTest { } private Query getQuery(String id) { - return new Query(new Criteria().orOperator(where("subPages").elemMatch(where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id)))),where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id))))); + return new Query(new Criteria().orOperator(where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id))),where("subPages").elemMatch(where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id)))))); } @Test
