Merge "Upgrade to Argon SR2"

[ccsdk/parent.git] / dependencies-odl-bom / pom.xml

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 273113d..44084e7 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -6,12 +6,12 @@
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
         <version>8.1.2</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>dependencies-odl-bom</artifactId>
-    <version>2.5.4-SNAPSHOT</version>
+    <version>2.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <distributionManagement>
@@ -44,49 +44,31 @@
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
                 <artifactId>bgp-artifacts</artifactId>
-                <version>0.18.4</version>
+                <version>0.19.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>7.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>10.0.5</version>
+                <version>11.0.12</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>4.0.4</version>
+                <version>5.0.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>4.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>4.0.4</version>
-                <type>test-jar</type>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-test-model</artifactId>
-                <version>4.0.4</version>
-            </dependency>
             <dependency>
                 <groupId>org.java-websocket</groupId>
                 <artifactId>Java-WebSocket</artifactId>
@@ -103,6 +85,11 @@
                 <artifactId>dmaapClient</artifactId>
                 <version>1.1.14</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-clients</artifactId>
+                <version>3.0.0</version>
+            </dependency>
             <!-- Below provides javax.annotations -->
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
@@ -183,7 +170,7 @@
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
-                <version>2.8.0</version>
+                <version>2.10.0</version>
             </dependency>
             <!-- Below highstreet odl artifacts -->
             <dependency>
@@ -218,7 +205,7 @@
                 <!-- This version supports the "deployAtEnd" parameter -->
                 <version>2.8</version>
                 <configuration>
-                    <skip/>
+                    <skip />
                     <deployAtEnd>true</deployAtEnd>
                 </configuration>
             </plugin>