BUG-2082: fix TCPMD5 dependency

This installs proper reference to TPCMD5 feature, as provided by
companion patch (*https://git.opendaylight.org/gerrit/#/c/11575/).

Change-Id: I9c475fa2fb5ab58f1e69fdf000866fe345ff4e35
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/feature/pom.xml b/bgp/feature/pom.xml
index 60d7da4f4c7e60016a5a0a0a23ed647ce2a85e7a..881e97fad4526ecc6558bcb6622e8480921e25a3 100644 (file)
--- a/bgp/feature/pom.xml
+++ b/bgp/feature/pom.xml
@@ -25,6 +25,7 @@
         <mdsal.version>1.1-SNAPSHOT</mdsal.version>
         <netconf.version>0.2.5-SNAPSHOT</netconf.version>
         <commons.opendaylight.version>1.4.2-SNAPSHOT</commons.opendaylight.version>
+        <tcpmd5.version>1.0.0-SNAPSHOT</tcpmd5.version>
     </properties>
 
     <!-- Testing -->
@@ -50,6 +51,13 @@
             <type>xml</type>
             <version>${netconf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.tcpmd5</groupId>
+            <artifactId>features-tcpmd5</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <version>${tcpmd5.version}</version>
+        </dependency>
         <!-- Required for testing -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -294,23 +302,25 @@
           <artifactId>commons-codec</artifactId>
       </dependency>
 
-   <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-   </dependency>
-   <!-- test to validate features.xml -->
-   <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-test</artifactId>
-      <version>${yangtools.version}</version>
-   </dependency>
-   <!-- dependency for opendaylight-karaf-empty for use by testing -->
-   <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.4.2-SNAPSHOT</version>
-      <type>zip</type>
-   </dependency>
+      <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+      </dependency>
+
+      <!-- test to validate features.xml -->
+      <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>features-test</artifactId>
+          <version>${yangtools.version}</version>
+      </dependency>
+
+      <!-- dependency for opendaylight-karaf-empty for use by testing -->
+      <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>opendaylight-karaf-empty</artifactId>
+          <version>${commons.opendaylight.version}</version>
+          <type>zip</type>
+      </dependency>
   </dependencies>
 
   <build>

diff --git a/bgp/feature/src/main/resources/features.xml b/bgp/feature/src/main/resources/features.xml
index b2eaa100e064ece111c67015aa8f3364280f6193..9ef7fed2e4c1a63d2a0c45c350ac7dfff51e0f06 100644 (file)
--- a/bgp/feature/src/main/resources/features.xml
+++ b/bgp/feature/src/main/resources/features.xml
@@ -12,9 +12,10 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
-  <repository>mvn:org.opendaylight.controller/features-netconf/${netconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-netconf/${netconf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/${tcpmd5.version}/xml/features</repository>
 
     <feature name='odl-bgpcep-all' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
@@ -65,8 +66,7 @@
         <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/netty-config-api/${netconf.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/protocol-framework/${controller.framework.version}</bundle>
-        <bundle>mvn:org.opendaylight.tcpmd5/tcpmd5-api/${tcpmd5.version}</bundle>
-        <bundle>mvn:org.opendaylight.tcpmd5/tcpmd5-netty/${tcpmd5.version}</bundle>
+        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
     </feature>
 
     <feature name='odl-bgpcep-util' version='${project.version}'>