usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [03/50] [abbrv] git commit: update dependencies versiona and remove duplicates
Date Mon, 07 Jul 2014 18:16:20 GMT
update dependencies versiona and remove duplicates


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/97eaead3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/97eaead3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/97eaead3

Branch: refs/pull/229/merge
Commit: 97eaead30c180c647351d393c477ab67201ec58e
Parents: c7b8612
Author: Strong Liu <stliu@hibernate.org>
Authored: Fri Jun 27 16:45:41 2014 +0800
Committer: Strong Liu <stliu@hibernate.org>
Committed: Fri Jun 27 16:45:41 2014 +0800

----------------------------------------------------------------------
 stack/core/pom.xml                              | 10 +----
 .../persistence/hector/CountingMutator.java     | 12 +++++
 stack/pom.xml                                   | 46 +++++++++++++++-----
 stack/rest/pom.xml                              |  2 +-
 stack/test-utils/pom.xml                        | 27 ------------
 stack/websocket/pom.xml                         |  2 +-
 6 files changed, 50 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97eaead3/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index dad4a6b..1decb2d 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -300,13 +300,6 @@
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-all</artifactId>
-      <!-- Exclude the old and problematic Snappy -->
-      <exclusions>
-        <exclusion>
-          <artifactId>snappy-java</artifactId>
-          <groupId>org.xerial.snappy</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -318,7 +311,6 @@
     <dependency>
       <artifactId>snappy-java</artifactId>
       <groupId>org.xerial.snappy</groupId>
-      <version>1.0.5</version>
     </dependency>
 
     <dependency>
@@ -521,7 +513,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.netty</groupId>
+      <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97eaead3/stack/core/src/main/java/org/apache/usergrid/persistence/hector/CountingMutator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/hector/CountingMutator.java
b/stack/core/src/main/java/org/apache/usergrid/persistence/hector/CountingMutator.java
index 8f8107a..14b2c9e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/hector/CountingMutator.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/hector/CountingMutator.java
@@ -316,6 +316,18 @@ public class CountingMutator<K> implements Mutator<K> {
         return target.getPendingMutationCount();
     }
 
+    @Override
+    public <N> Mutator<K> addDeletion(K k, String s, N n, N n2, Serializer<N>
nSerializer) {
+        target.addDeletion(k, s, n, n2, nSerializer);
+        return this;
+    }
+
+    @Override
+    public <N> Mutator<K> addDeletion(K k, String s, N n, N n2, Serializer<N>
nSerializer, long l) {
+        target.addDeletion(k, s, n, n2, nSerializer, l);
+        checkAndFlush();
+        return this;
+    }
 
     /**
      * If our size is >= than our max, we'll flush

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97eaead3/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 3a37577..6966010 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -98,21 +98,21 @@
     <amber-version>0.22-incubating</amber-version>
     <cassandra-version>1.2.12</cassandra-version>
     <hector-om-version>3.0-03</hector-om-version>
-    <hector-version>1.1-4</hector-version>
+    <hector-version>2.0-0</hector-version>
     <hector-test-version>1.1-4</hector-test-version>
-    <jackson-version>1.9.9</jackson-version>
+    <jackson-version>1.9.13</jackson-version>
     <jclouds.version>1.6.2-incubating</jclouds.version>
     <jersey-version>1.18</jersey-version>
     <junit-version>4.11</junit-version>
     <log4j-version>1.2.16</log4j-version>
     <metrics-version>2.1.2</metrics-version>
     <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
-    <shiro-version>1.2.0</shiro-version>
-    <slf4j-version>1.6.1</slf4j-version>
+    <shiro-version>1.2.3</shiro-version>
+    <slf4j-version>1.7.7</slf4j-version>
     <snakeyaml-version>1.8</snakeyaml-version>
     <tomcat-version>7.0.42</tomcat-version>
     <antlr.version>3.4</antlr.version>
-    <tika.version>1.4</tika.version>
+    <tika.version>1.5</tika.version>
 
   </properties>
 
@@ -428,12 +428,18 @@
           </exclusion>
 
           <exclusion>
-                   <artifactId>snappy-java</artifactId>
-                   <groupId>org.xerial.snappy</groupId>
-            </exclusion>
+             <artifactId>snappy-java</artifactId>
+             <groupId>org.xerial.snappy</groupId>
+          </exclusion>
         </exclusions>
       </dependency>
 
+        <dependency>
+            <artifactId>snappy-java</artifactId>
+            <groupId>org.xerial.snappy</groupId>
+            <version>1.1.1-M3</version>
+        </dependency>
+
       <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-core</artifactId>
@@ -596,6 +602,11 @@
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
           </exclusion>
+            <exclusion>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+            </exclusion>
+
         </exclusions>
       </dependency>
 
@@ -814,6 +825,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
           </exclusion>
+
         </exclusions>
       </dependency>
 
@@ -882,12 +894,18 @@
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
         <version>1.2</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>stax</groupId>
+                  <artifactId>stax-api</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.netty</groupId>
+        <groupId>io.netty</groupId>
         <artifactId>netty</artifactId>
-        <version>3.2.7.Final</version>
+        <version>3.6.6.Final</version>
       </dependency>
 
       <dependency>
@@ -1198,7 +1216,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit-dep</artifactId>
-        <version>4.10</version>
+        <version>4.11</version>
       </dependency>
 
       <dependency>
@@ -1251,6 +1269,12 @@
         <groupId>org.apache.jclouds.driver</groupId>
         <artifactId>jclouds-netty</artifactId>
         <version>${jclouds.version}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
 
       <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97eaead3/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 90311e5..39fc3e7 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -366,7 +366,7 @@
               <groupId>${project.groupId}</groupId>
               <version>${project.version}</version>
               <file>
-                ${project.build.directory}/${project.artifactId}-${project.version}.jar
+                ${project.build.directory}/${project.artifactId}-${project.version}-classes.jar
               </file>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97eaead3/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 4be950b..d1d4784 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -73,31 +73,15 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!--<dependency>-->
-    <!--<groupId>org.apache.usergrid</groupId>-->
-    <!--<artifactId>usergrid-services</artifactId>-->
-    <!--<version>${project.version}</version>-->
-    <!--</dependency>-->
-
-    <!-- Apache Dependencies -->
-
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-all</artifactId>
-      <!-- Exclude the old and problematic Snappy -->
-      <exclusions>
-        <exclusion>
-          <artifactId>snappy-java</artifactId>
-          <groupId>org.xerial.snappy</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- Include the slighly newer and less problematic snappy -->
     <dependency>
       <artifactId>snappy-java</artifactId>
       <groupId>org.xerial.snappy</groupId>
-      <version>1.0.5</version>
     </dependency>
 
     <dependency>
@@ -248,17 +232,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!--<dependency>-->
-    <!--<groupId>org.slf4j</groupId>-->
-    <!--<artifactId>slf4j-log4j12</artifactId>-->
-    <!--<scope>test</scope>-->
-    <!--</dependency>-->
-
-    <!--<dependency>-->
-    <!--<groupId>log4j</groupId>-->
-    <!--<artifactId>log4j</artifactId>-->
-    <!--<scope>test</scope>-->
-    <!--</dependency>-->
 
     <dependency>
       <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97eaead3/stack/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/stack/websocket/pom.xml b/stack/websocket/pom.xml
index 665ba18..10a7df5 100644
--- a/stack/websocket/pom.xml
+++ b/stack/websocket/pom.xml
@@ -142,7 +142,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.netty</groupId>
+      <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>
 


Mime
View raw message