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 2015/11/09 23:31:46 UTC
[3/9] usergrid git commit: fix exclusion with new version of wns lib
fix exclusion with new version of wns lib
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3c20c67f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3c20c67f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3c20c67f
Branch: refs/heads/2.1-release
Commit: 3c20c67f50ecaad1136feea3e9a070b2a993b22f
Parents: d42d82c ad07e2b
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Nov 6 16:02:36 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Nov 6 16:02:36 2015 -0700
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 8 +-
.../read/traverse/AbstractReadGraphFilter.java | 8 +-
.../usergrid/corepersistence/index/RxTest.java | 5 +-
.../persistence/graph/guice/GraphModule.java | 7 -
.../impl/shard/DirectedEdgeMeta.java | 4 +-
.../impl/shard/EdgeShardStrategy.java | 10 +-
.../impl/shard/NodeShardApproximation.java | 66 --
.../impl/shard/ShardEntryGroup.java | 3 +-
.../impl/shard/ShardedEdgeSerialization.java | 2 +-
.../serialization/impl/shard/count/Counter.java | 131 ----
.../shard/count/NodeShardApproximationImpl.java | 272 --------
.../count/NodeShardCounterSerialization.java | 48 --
.../NodeShardCounterSerializationImpl.java | 186 ------
.../impl/shard/count/ShardKey.java | 75 ---
.../shard/impl/NodeShardAllocationImpl.java | 19 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 158 ++---
.../impl/ShardedEdgeSerializationImpl.java | 28 -
.../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 13 +-
.../graph/GraphManagerShardConsistencyIT.java | 5 +
.../graph/GraphManagerShardingIT.java | 208 ------
.../impl/shard/NodeShardAllocationTest.java | 48 +-
.../impl/shard/ShardEntryGroupTest.java | 28 +
.../shard/count/NodeShardApproximationTest.java | 627 -------------------
.../NodeShardCounterSerializationTest.java | 124 ----
.../shard/impl/ShardGroupDeletionImplTest.java | 5 +
.../index/impl/IndexOperationMessage.java | 4 +-
.../exceptions/AbstractExceptionMapper.java | 8 +-
stack/services/pom.xml | 7 -
.../services/AbstractCollectionService.java | 6 +-
30 files changed, 164 insertions(+), 1953 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3c20c67f/stack/services/pom.xml
----------------------------------------------------------------------
diff --cc stack/services/pom.xml
index 5560079,2daa8f6..754b74c
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@@ -438,14 -437,13 +438,7 @@@
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-jaxrs</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- </exclusions>
+ <version>1.3.1-USERGRID</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-jaxrs</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- </exclusions>
</dependency>
-
</dependencies>
</project>