airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata git commit: AIRAVATA-2342 Cleaning up dependencies for Keycloak client
Date Wed, 24 May 2017 15:39:14 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 0eda7d202 -> ff0ccae99


AIRAVATA-2342 Cleaning up dependencies for Keycloak client

* Keycloak client requires version 2.5.4 of Jackson libraries.
* Keycloak client requires the 2.0 JAX-RS API. The 1.0 JAX-RS API was
  included transitively because of the jersey-core dependency. It
  doesn't look like we are using jersey-client or any other
  com.sun.jersey dependencies, so I removed them. For similar reasons I
  removed org.apache.whirr dependencies.


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

Branch: refs/heads/develop
Commit: ff0ccae998a3a289df76afe31220cde126ba1795
Parents: 0eda7d2
Author: Marcus Christie <machristie@apache.org>
Authored: Wed May 24 11:33:48 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Wed May 24 11:33:48 2017 -0400

----------------------------------------------------------------------
 .../iam-admin-services-core/pom.xml             | 11 +++-
 modules/distribution/pom.xml                    | 61 ++------------------
 2 files changed, 12 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ff0ccae9/airavata-services/profile-service/iam-admin-services-core/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml
index 51bde16..5a2d6e8 100644
--- a/airavata-services/profile-service/iam-admin-services-core/pom.xml
+++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml
@@ -37,15 +37,20 @@
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>
-            <version>3.1.2.Final</version>
+            <version>3.0.14.Final</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-jackson2-provider
-->
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson2-provider</artifactId>
-            <version>3.1.2.Final</version>
+            <version>3.0.14.Final</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.5.4</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-admin-client -->
         <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-admin-client -->
         <dependency>
             <groupId>org.keycloak</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/ff0ccae9/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 7eb50d0..336820c 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -272,11 +272,6 @@
             <version>1.2.1</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.0.1</version>
@@ -293,35 +288,6 @@
             <version>7.0.22</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>${jersey.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <!--dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId>
-            <version>${jersey.version}</version> </dependency -->
-        <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
             <version>1.9.2</version>
@@ -374,26 +340,6 @@
             <version>1.0.3</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.whirr</groupId>
-            <artifactId>whirr-core</artifactId>
-            <version>0.7.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk16</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jclouds.driver</groupId>
-                    <artifactId>jclouds-bouncycastle</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.whirr</groupId>
-            <artifactId>whirr-hadoop</artifactId>
-            <version>0.7.1</version>
-        </dependency>
-        <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
             <version>1.1</version>
@@ -441,20 +387,21 @@
             <artifactId>libthrift</artifactId>
             <version>${thrift.version}</version>
         </dependency>
+        <!-- Keycloak admin client requires Jackson 2.8.6 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.0.0</version>
+            <version>2.5.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.0.0</version>
+            <version>2.5.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.0.0</version>
+            <version>2.5.4</version>
         </dependency>
         <!-- zookeeper dependencies -->
 


Mime
View raw message