BUG-4692: remove TCPMD5 dependencies

Remove tcpmd5 library dependencies from bgpcep's parent pom
and features xmls and poms. This is a last step of migration
from ODL's tcpmd5.

Change-Id: I7a43a6954e54618a3cddbc912ed84bbc26d404ce
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/controller-config/src/main/resources/initial/32-bmp.xml b/bgp/controller-config/src/main/resources/initial/32-bmp.xml
index 26c403eb273bcaa142afdee7a4cc3b7bdc9ab957..67c611b862c88eeba2e5ca319e56a5cf0700cf61 100644 (file)
--- a/bgp/controller-config/src/main/resources/initial/32-bmp.xml
+++ b/bgp/controller-config/src/main/resources/initial/32-bmp.xml
@@ -36,21 +36,6 @@
                         <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
                         <name>global-worker-group</name>
                     </worker-group>
-
-                    <!--
-                         Uncomment this block to enable TCP MD5 Signature support
-
-                    <md5-channel-factory>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">prefix:md5-channel-factory</type>
-                        <name>md5-client-channel-factory</name>
-                    </md5-channel-factory>
-
-                    <md5-server-channel-factory>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">prefix:md5-server-channel-factory</type>
-                        <name>md5-server-channel-factory</name>
-                    </md5-server-channel-factory>
-                    -->
-
                 </module>
             </modules>
 

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 593fd96df3af8c99a663d10392963446c0f71b35..8d6b6bdb3e02fa1da5df645df89f4309354df809 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -28,7 +28,6 @@
         <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
         <config.version>0.5.0-SNAPSHOT</config.version>
         <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
-        <tcpmd5.version>1.3.0-SNAPSHOT</tcpmd5.version>
         <netconf.version>1.1.0-SNAPSHOT</netconf.version>
     </properties>
 
@@ -42,15 +41,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- TCP/MD5 support -->
-            <dependency>
-                <groupId>org.opendaylight.tcpmd5</groupId>
-                <artifactId>tcpmd5-artifacts</artifactId>
-                <version>${tcpmd5.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- YANG tools -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
@@ -153,12 +143,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.tcpmd5</groupId>
-            <artifactId>features-tcpmd5</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-netconf-connector</artifactId>

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index ec90ac9432d5bfe3ccdd7d5e3f3ee66e5ba658fe..d5ff5e76b27adf2894712e59a655f662f1b4706a 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -15,7 +15,6 @@
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
@@ -145,7 +144,6 @@
 
     <feature name='odl-bgpcep-bgp-rib-impl' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-dependencies</feature>
-        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-rib-api</feature>

diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml
index 11aad48e3834fb0d67d1d2d001a37e43e2ffb569..8a1e2c74244c5227ac897409fbd0264437b8141f 100644 (file)
--- a/features/bmp/pom.xml
+++ b/features/bmp/pom.xml
@@ -16,7 +16,6 @@
         <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
         <config.version>0.5.0-SNAPSHOT</config.version>
         <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
-        <tcpmd5.version>1.3.0-SNAPSHOT</tcpmd5.version>
     </properties>
 
       <dependencyManagement>
@@ -29,14 +28,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.opendaylight.tcpmd5</groupId>
-                <artifactId>tcpmd5-artifacts</artifactId>
-                <version>${tcpmd5.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- YANG tools -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
@@ -97,12 +88,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.tcpmd5</groupId>
-            <artifactId>features-tcpmd5</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>

diff --git a/features/bmp/src/main/features/features.xml b/features/bmp/src/main/features/features.xml
index 89d3656fa1aea1dbe940571e1d5603a04f61dc50..2bdb6ae9b5ab4ddaaf137bcc662960864eb642f3 100644 (file)
--- a/features/bmp/src/main/features/features.xml
+++ b/features/bmp/src/main/features/features.xml
@@ -16,11 +16,9 @@
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features</repository>
 
     <feature name='odl-bgpcep-bmp' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-dependencies</feature>
-        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
         <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${config.version}'>odl-config-netty</feature>
         <feature version='${config.version}'>odl-config-netty-config-api</feature>

diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml
index d96342342ddffde3fad7ca0e9b9c09dc7053c04e..c53ded1a198d6ac4f1b7bb2bc58cf9681e8f353f 100644 (file)
--- a/features/pcep/pom.xml
+++ b/features/pcep/pom.xml
@@ -27,7 +27,6 @@
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
         <config.version>0.5.0-SNAPSHOT</config.version>
         <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
-        <tcpmd5.version>1.3.0-SNAPSHOT</tcpmd5.version>
         <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     </properties>
 
@@ -41,15 +40,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- TCP/MD5 support -->
-            <dependency>
-                <groupId>org.opendaylight.tcpmd5</groupId>
-                <artifactId>tcpmd5-artifacts</artifactId>
-                <version>${tcpmd5.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- YANG tools -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
@@ -128,12 +118,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.tcpmd5</groupId>
-            <artifactId>features-tcpmd5</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>features-odlparent</artifactId>

diff --git a/features/pcep/src/main/features/features.xml b/features/pcep/src/main/features/features.xml
index a7fb6c16caaeb5e750f8683cee97acf9d9b02fde..6debc0d576b2e016fb1b2d90bdffdb5f2161d3e2 100644 (file)
--- a/features/pcep/src/main/features/features.xml
+++ b/features/pcep/src/main/features/features.xml
@@ -15,7 +15,6 @@
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
 
@@ -49,7 +48,6 @@
     <feature name='odl-bgpcep-pcep-api' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-dependencies</feature>
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/{{VERSION}}</bundle>
-        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
         <feature version='${config.version}'>odl-config-netty-config-api</feature>
         <feature version='${config.version}'>odl-config-netty</feature>
         <bundle>mvn:org.opendaylight.bgpcep/pcep-api/{{VERSION}}</bundle>
@@ -78,7 +76,6 @@
     <feature name='odl-bgpcep-programming-impl' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-programming-api</feature>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
         <bundle>mvn:org.opendaylight.bgpcep/programming-impl/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/30-programming.xml">mvn:org.opendaylight.bgpcep/programming-controller-config/{{VERSION}}/xml/config</configfile>
     </feature>

diff --git a/parent/pom.xml b/parent/pom.xml
index fa591b1e76e3411e8e9f270414dc3000edde9cbd..3bd6597957a04eabcca1b3ff8fb6d62e0efffd52 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -57,9 +57,6 @@
         <!-- Netconf artifacts -->
         <netconf.version>1.1.0-SNAPSHOT</netconf.version>
 
-        <!-- TCP-MD5 artifacts -->
-        <tcpmd5.version>1.3.0-SNAPSHOT</tcpmd5.version>
-
         <!-- EPOLL artifacts -->
         <os.detected.classifier>linux-x86_64</os.detected.classifier>
 
@@ -76,15 +73,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- TCP/MD5 support -->
-            <dependency>
-                <groupId>org.opendaylight.tcpmd5</groupId>
-                <artifactId>tcpmd5-artifacts</artifactId>
-                <version>${tcpmd5.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- YANG tools -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>

diff --git a/pcep/controller-config/src/main/resources/initial/32-pcep.xml b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
index 9bb51fc20222c73b9db77fa02b80f857addd6122..7f65c6a34e381293fce8b8e6d62a0e21b4a48b24 100644 (file)
--- a/pcep/controller-config/src/main/resources/initial/32-pcep.xml
+++ b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
@@ -89,21 +89,6 @@
                         <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
                         <name>global-worker-group</name>
                     </worker-group>
-
-                    <!--
-                         Uncomment this block to enable TCP MD5 Signature support
-
-                    <md5-channel-factory>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">prefix:md5-channel-factory</type>
-                        <name>md5-client-channel-factory</name>
-                    </md5-channel-factory>
-
-                    <md5-server-channel-factory>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:tcpmd5:netty:cfg">prefix:md5-server-channel-factory</type>
-                        <name>md5-server-channel-factory</name>
-                    </md5-server-channel-factory>
-                    -->
-
                     <!--
                         Uncomment this block to enable PCEPS TLS communication. Change example values as needed.
                     <tls>