diff options
-rw-r--r-- | archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml | 16 | ||||
-rw-r--r-- | pom.xml | 4 |
2 files changed, 14 insertions, 6 deletions
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 217dfc299..36bf6a218 100644 --- 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> @@ -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> |