From: Dan Timoney <dtimoney@att.com>
Date: Wed, 8 Nov 2023 14:09:18 +0000 (+0000)
Subject: Merge "Upgrade to Argon SR2"
X-Git-Tag: 2.6.1~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6a8fed92d8c89692b3aae58166fa4f5475ded2c2;hp=-c;p=ccsdk%2Fparent.git

Merge "Upgrade to Argon SR2"
---

6a8fed92d8c89692b3aae58166fa4f5475ded2c2
diff --combined dependencies-odl-bom/pom.xml
index f0a79d0a,3bd0460b..44084e79
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
          <groupId>org.opendaylight.odlparent</groupId>
          <artifactId>odlparent</artifactId>
          <version>8.1.2</version>
 -        <relativePath/>
 +        <relativePath />
      </parent>
  
      <groupId>org.onap.ccsdk.parent</groupId>
@@@ -51,21 -51,21 +51,21 @@@
              <dependency>
                  <groupId>org.opendaylight.controller</groupId>
                  <artifactId>controller-artifacts</artifactId>
-                 <version>7.0.6</version>
+                 <version>7.0.9</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
              <dependency>
                  <groupId>org.opendaylight.mdsal</groupId>
                  <artifactId>mdsal-artifacts</artifactId>
-                 <version>11.0.9</version>
+                 <version>11.0.12</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
              <dependency>
                  <groupId>org.opendaylight.netconf</groupId>
                  <artifactId>netconf-artifacts</artifactId>
-                 <version>5.0.6</version>
+                 <version>5.0.7</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
@@@ -85,11 -85,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>
@@@ -205,7 -200,7 +205,7 @@@
                  <!-- This version supports the "deployAtEnd" parameter -->
                  <version>2.8</version>
                  <configuration>
 -                    <skip/>
 +                    <skip />
                      <deployAtEnd>true</deployAtEnd>
                  </configuration>
              </plugin>