usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdun...@apache.org
Subject usergrid git commit: Revert "Remove dependency conflicts"
Date Tue, 12 Dec 2017 01:51:00 GMT
Repository: usergrid
Updated Branches:
  refs/heads/3.0.0_experimental ae14dc911 -> d66a525a3


Revert "Remove dependency conflicts"

This reverts commit ae14dc911e8fa7e97cbba839e7700159d5b2be42.


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

Branch: refs/heads/3.0.0_experimental
Commit: d66a525a32bc58774f0a5511c87df328942a63a5
Parents: ae14dc9
Author: Peter Johnson <pjohnson@apigee.com>
Authored: Wed Nov 29 21:11:24 2017 -0800
Committer: Peter Johnson <pjohnson@apigee.com>
Committed: Wed Nov 29 21:11:24 2017 -0800

----------------------------------------------------------------------
 stack/corepersistence/queue/pom.xml                   |  2 +-
 stack/pom.xml                                         |  4 ++--
 stack/rest/pom.xml                                    |  7 -------
 stack/services/pom.xml                                | 14 ++++----------
 .../services/assets/data/GoogleBinaryStore.java       |  2 +-
 5 files changed, 8 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/d66a525a/stack/corepersistence/queue/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml
index 3c8d5cd..005ce0c 100644
--- a/stack/corepersistence/queue/pom.xml
+++ b/stack/corepersistence/queue/pom.xml
@@ -37,7 +37,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <servlet.version>3.0.1</servlet.version>
-        <jersey.version>2.25.1</jersey.version>
+        <jersey.version>2.21</jersey.version>
         <guice-bridge.version>2.4.0</guice-bridge.version>
     </properties>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d66a525a/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e5350d9..53e3732 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -110,7 +110,7 @@
         <jackson-version>1.9.9</jackson-version>
         <jackson-2-version>2.8.6</jackson-2-version>
         <jclouds.version>1.9.0</jclouds.version>
-        <jersey-version>2.25.1</jersey-version>
+        <jersey-version>2.21</jersey-version>
         <junit-version>4.12</junit-version>
         <log4j-version>1.2.16</log4j-version>
         <org.springframework.version>3.2.13.RELEASE</org.springframework.version>
@@ -118,7 +118,7 @@
         <slf4j-version>1.7.2</slf4j-version>
         <snakeyaml-version>1.9</snakeyaml-version>
         <tomcat-version>7.0.64</tomcat-version>
-        <antlr.version>3.5.2</antlr.version>
+        <antlr.version>3.4</antlr.version>
         <tika.version>1.4</tika.version>
         <mockito.version>1.10.8</mockito.version>
         <io.apigee.gcm.version>1.0.1</io.apigee.gcm.version>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d66a525a/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 52c601a..400160b 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -269,13 +269,6 @@
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey-version}</version>
-            <!-- org.glassfish.jersey.media 2.25.1 uses jackson 2.8.4 -->
-            <exclusions>
-                <exclusion>
-                    <artifactId>*</artifactId>
-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d66a525a/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 13aeb4e..a60579b 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -213,19 +213,13 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>2.25</version>
+            <version>2.21</version>
         </dependency>
 
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>2.25</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>*</artifactId>
-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                </exclusion>
-            </exclusions>
+            <version>2.21</version>
         </dependency>
 
         <!--<dependency>-->
@@ -275,7 +269,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>1.12.0</version>
+            <version>0.11.0-beta</version>
         </dependency>
 
         <dependency>
@@ -485,7 +479,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>
             <artifactId>jersey-apache-connector</artifactId>
-            <version>2.25</version>
+            <version>2.21</version>
         </dependency>
 
     </dependencies>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d66a525a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/GoogleBinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/GoogleBinaryStore.java
b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/GoogleBinaryStore.java
index 13c986a..ae661f1 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/GoogleBinaryStore.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/GoogleBinaryStore.java
@@ -19,9 +19,9 @@ package org.apache.usergrid.services.assets.data;
 
 import com.google.api.services.storage.StorageScopes;
 import com.google.auth.oauth2.GoogleCredentials;
+import com.google.cloud.HttpTransportOptions;
 import com.google.cloud.TransportOptions;
 import com.google.cloud.WriteChannel;
-import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.storage.*;
 
 import org.apache.commons.io.FileUtils;


Mime
View raw message