Revert "Remove dependency conflicts"

This reverts commit fb7c75c.

Author: peterj99a

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>
 

stack/pom.xml

@@ -110,15 +110,15 @@
         <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>
         <shiro-version>1.2.4</shiro-version>
         <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>

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>

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>

stack/services/src/main/java/org/apache/usergrid/services/assets/data/GoogleBinaryStore.java

@@ -19,9 +19,9 @@
 
 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;