BUG-6341: use common Cassandra and Coda Hale Metrics

This depends on https://git.opendaylight.org/gerrit/43717

This patch pulls in the odlparent-defined version of Netty; this is
currently compatible with the Cassandra driver, and future upgrades
will have to bear this in mind.

Change-Id: I4401553b2e529045bf6f9e19ea8c763834f43210
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aaa-cassandra-store/pom.xml b/aaa-cassandra-store/pom.xml
index 2fe8357db1cf2b9a8fd1db98f722a9f85693ff16..f5414a13debef110c10625cd1e91c61b25db8de7 100644 (file)
--- a/aaa-cassandra-store/pom.xml
+++ b/aaa-cassandra-store/pom.xml
@@ -70,37 +70,30 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>${cassandra.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>${metrics-core.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>${cassandra-netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
-            <version>${cassandra-netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
-            <version>${cassandra-netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>${cassandra-netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>${cassandra-netty.version}</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/features/authn/pom.xml b/features/authn/pom.xml
index 718d5398e376a5b3ce3709da34ea72c906880471..24dd14b7c57484bb1324bf3281036d83a4d608e1 100644 (file)
--- a/features/authn/pom.xml
+++ b/features/authn/pom.xml
@@ -63,37 +63,30 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>2.1.9</version>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>3.0.2</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.0.27.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
-            <version>4.0.27.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
-            <version>4.0.27.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>4.0.27.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>4.0.27.Final</version>
         </dependency>
 
         <!-- odl-aaa-authn -->

diff --git a/features/authn/src/main/features/features.xml b/features/authn/src/main/features/features.xml
index a0e1048b0a2dfee31570b45d1d07347bd9d81148..4a662366a88b29afa2dfaa5b289c2944ae08968d 100644 (file)
--- a/features/authn/src/main/features/features.xml
+++ b/features/authn/src/main/features/features.xml
@@ -296,13 +296,13 @@
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
 
         <!--Cassandra Store -->
-        <bundle>mvn:io.netty/netty-transport/4.0.27.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec/4.0.27.Final</bundle>
-        <bundle>mvn:io.netty/netty-common/4.0.27.Final</bundle>
-        <bundle>mvn:io.netty/netty-buffer/4.0.27.Final</bundle>
-        <bundle>mvn:io.netty/netty-handler/4.0.27.Final</bundle>
-        <bundle>mvn:com.codahale.metrics/metrics-core/3.0.2</bundle>
-        <bundle>mvn:com.datastax.cassandra/cassandra-driver-core/2.1.9</bundle>
+        <bundle>mvn:io.netty/netty-transport/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty-codec/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty-handler/{{VERSION}}</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-core/{{VERSION}}</bundle>
+        <bundle>mvn:com.datastax.cassandra/cassandra-driver-core/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.aaa/aaa-cassandra-store/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/08-aaa-cassandra-store-config.xml">mvn:org.opendaylight.aaa/aaa-cassandra-store/{{VERSION}}/xml/config</configfile>
         <configfile finalname="etc/aaacassandra.cfg">mvn:org.opendaylight.aaa/aaa-cassandra-store/{{VERSION}}/cfg/config-1</configfile>

diff --git a/parent/pom.xml b/parent/pom.xml
index 0f7daae41701cca383ef17b3360ad5244da39d21..16b8f4ea76f93ebe33c408cb2a35ab92849f36ce 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -57,10 +57,6 @@
         <javax.inject.version>1</javax.inject.version>
         <servlet.tester.version>7.0.0.pre5</servlet.tester.version>
         <features.test.version>1.8.0-SNAPSHOT</features.test.version>
-        <!-- Cassandra -->
-        <metrics-core.version>3.0.2</metrics-core.version>
-        <cassandra.version>2.1.9</cassandra.version>
-        <cassandra-netty.version>4.0.27.Final</cassandra-netty.version>
     </properties>
 
     <dependencyManagement>