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/03 15:19:33 UTC
[1/2] git commit: Build fails on Ubuntu / OpenJDK without this fix
which is needed because of changes in JUnit 4.11. Not sure why builds don't
fail on other platforms.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o ae9c9c05e -> 9c4b26ea3
Build fails on Ubuntu / OpenJDK without this fix which is needed because of changes in JUnit 4.11. Not sure why builds don't fail on other platforms.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/efece5bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/efece5bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/efece5bf
Branch: refs/heads/two-dot-o
Commit: efece5bf0f75c27adcd2308a33bd2e6b18cc0126
Parents: 8930071
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 3 09:15:22 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 3 09:15:22 2014 -0400
----------------------------------------------------------------------
stack/test-utils/pom.xml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/efece5bf/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 9b242e6..0e7d7be 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -204,13 +204,11 @@
</dependency>
<dependency>
- <!-- TODO - should not scope be 'test' ? -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <!-- TODO - should not scope be 'test' ? -->
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -222,9 +220,16 @@
<dependency>
<groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <artifactId>junit</artifactId>
+ <!-- we need this in all scopes, not just test -->
</dependency>
+ <!-- "The artifact junit:junit-dep:jar:4.11 has been relocated to junit:junit:jar:4.11"
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </dependency>-->
+
<!-- Test Dependencies -->
<dependency>
@@ -234,12 +239,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9c4b26ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9c4b26ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9c4b26ea
Branch: refs/heads/two-dot-o
Commit: 9c4b26ea3246829926b9789c4dbb2d9a3aabe468
Parents: efece5b ae9c9c0
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 3 09:18:10 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 3 09:18:10 2014 -0400
----------------------------------------------------------------------
.../collection/event/EntityDeleted.java | 17 +
.../collection/event/EntityVersionCreated.java | 17 +
.../collection/event/EntityVersionDeleted.java | 17 +
stack/corepersistence/map/pom.xml | 65 ++++
.../usergrid/persistence/map/MapManager.java | 69 ++++
.../persistence/map/MapManagerFactory.java | 30 ++
.../usergrid/persistence/map/MapScope.java | 40 +++
.../persistence/map/guice/MapModule.java | 61 ++++
.../persistence/map/impl/MapManagerImpl.java | 114 +++++++
.../persistence/map/impl/MapScopeImpl.java | 91 ++++++
.../persistence/map/impl/MapSerialization.java | 64 ++++
.../map/impl/MapSerializationImpl.java | 327 +++++++++++++++++++
.../persistence/map/MapManagerTest.java | 207 ++++++++++++
.../persistence/map/guice/TestMapModule.java | 16 +
stack/corepersistence/pom.xml | 1 +
.../apache/usergrid/rest/SystemResource.java | 120 +++++++
.../services/notifications/QueueListener.java | 6 +-
17 files changed, 1261 insertions(+), 1 deletion(-)
----------------------------------------------------------------------