Increasing some dependency versions

diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
index 217dfc2996bb66bc6ca627c7c947460ae9ca15f7..36bf6a218791d98dd627dd4f29bf671a5276a949 100644 (file)
--- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -161,8 +161,10 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
         </exclusion>
-
-
+        <exclusion>
+          <groupId>com.addthis.metrics</groupId>
+          <artifactId>reporter-config3</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -204,6 +206,7 @@
           </exclusion>
       </exclusions>
     </dependency>
+    <!-- Transient dependencies of cassandra that are selected to use a higher version -->
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
@@ -215,6 +218,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.mindrot</groupId>
+      <artifactId>jbcrypt</artifactId>
+      <version>0.4</version>
+    </dependency>
     <!--
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
@@ -245,6 +253,7 @@
       <artifactId>jboss-logging</artifactId>
     </dependency>
     <!-- Dependency of cassandra -> replacing by new version -->
+<!--
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>
@@ -256,8 +265,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-
-
+-->
     <!-- TEST Scope -->
     <dependency>
       <groupId>org.apache.archiva</groupId>

diff --git a/pom.xml b/pom.xml
index 9b1f01c640d0d98d4082896baac2b954836b9fa4..b88d7a3f35d56987c2c15bf9ac6d844ab87cc591 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -83,8 +83,8 @@
     <metrics-core.version>3.1.0</metrics-core.version>
 
     <derbyVersion>10.13.1.1</derbyVersion>
-    <httpclient.version>4.5.2</httpclient.version>
-    <httpclient.core.version>4.4.4</httpclient.core.version>
+    <httpclient.version>4.5.13</httpclient.version>
+    <httpclient.core.version>4.4.14</httpclient.core.version>
 
     <openjpaVersion>3.1.1</openjpaVersion>