You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/28 18:19:03 UTC
git commit: remove extra ref
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-uuid-non-time 1d74ec00e -> 78ce12467
remove extra ref
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/78ce1246
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/78ce1246
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/78ce1246
Branch: refs/heads/two-dot-o-uuid-non-time
Commit: 78ce124675b6d71deed2c73522dd0720fb39e0c3
Parents: 1d74ec0
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Aug 28 10:18:49 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Aug 28 10:18:49 2014 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 39 ++++++++++++++-------------------------
1 file changed, 14 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/78ce1246/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index 41c7244..08c8c1c 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -550,38 +550,15 @@
<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>
- <version>${metrics.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.codahale.metrics</groupId>
- <artifactId>metrics-graphite</artifactId>
- <version>${metrics.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.netflix.rxjava</groupId>
- <artifactId>rxjava-core</artifactId>
- <version>${rx.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.netflix.rxjava</groupId>
- <artifactId>rxjava-math</artifactId>
- <version>${rx.version}</version>
- </dependency>
-
+ -->
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics.version}</version>
</dependency>
+
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
@@ -589,6 +566,18 @@
</dependency>
<dependency>
+ <groupId>com.netflix.rxjava</groupId>
+ <artifactId>rxjava-core</artifactId>
+ <version>${rx.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.netflix.rxjava</groupId>
+ <artifactId>rxjava-math</artifactId>
+ <version>${rx.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
<version>2.7.0</version>