Update mockito version

Updated mockito version to resolve build errors in ccsdk/sli with
Sulfur version of parents

Issue-ID: CCSDK-3691
Change-Id: I5e20c70c20e15e62bdf015d69a6e2ef959f4ace2
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 8c04732..39a9e7b 100644 (file)
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -286,7 +286,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>1.10.19</version>
+                <version>3.12.4</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 054f966..12a6b49 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -183,7 +183,7 @@
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
-                <version>2.7.0</version>
+                <version>2.8.0</version>
             </dependency>
             <!-- Below highstreet odl artifacts -->
             <dependency>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 1b34211..ba194c4 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>9.0.2</version>
+        <version>9.0.4</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 140f917..4a3b115 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 0069ada..8629a83 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index be7871d..e2be76c 100644 (file)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index b3c2633..71e56ee 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-it-parent</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.5</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 7c12d58..faacb74 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 30b38bc..f34eebe 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index beaf7a4..be4fb43 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -157,7 +157,7 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
         <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index f70a978..7038bba 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 
@@ -111,13 +111,13 @@
         <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
 
         <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>9.0.2</odl.controller.mdsal.version>
-        <odl.mdsal.version>10.0.0</odl.mdsal.version>
-        <odl.mdsal.model.version>10.0.0</odl.mdsal.model.version>
+        <odl.controller.mdsal.version>9.0.4</odl.controller.mdsal.version>
+        <odl.mdsal.version>10.0.2</odl.mdsal.version>
+        <odl.mdsal.model.version>10.0.2</odl.mdsal.model.version>
         <odl.mdsal.generator.version>8.0.5</odl.mdsal.generator.version>
-        <odl.netconf.restconf.version>9.0.2</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>9.0.2</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>9.0.2</odl.netconf.sal.rest.docgen.version>
+        <odl.netconf.restconf.version>9.0.4</odl.netconf.restconf.version>
+        <odl.netconf.netconf.version>9.0.4</odl.netconf.netconf.version>
+        <odl.netconf.sal.rest.docgen.version>9.0.4</odl.netconf.sal.rest.docgen.version>
 
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.15</commons.codec.version>
@@ -137,7 +137,7 @@
         <guava.version>31.1-jre</guava.version>
         <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
             integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <!-- Used by snmp4sdn, yangtools -->
         <javassist.version>3.28.0-GA</javassist.version>
 
@@ -157,9 +157,9 @@
         <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <logback.version>1.11.7</logback.version>
         <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>3.3.3</mockito.version>
+        <mockito.version>3.12.4</mockito.version>
         <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.74.Final</netty.version>
+        <netty.version>4.1.76.Final</netty.version>
         <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
         <slf4j.version>1.7.32</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
@@ -179,7 +179,7 @@
         <grpc.version>1.21.1</grpc.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>

diff --git a/oparent/pom.xml b/oparent/pom.xml
index d3d7fb5..14b9e87 100755 (executable)
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/standalone/pom.xml b/standalone/pom.xml
index 241ed6f..5e99bea 100755 (executable)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -145,7 +145,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>1.10.19</version>
+                <version>3.12.4</version>
                 <scope>test</scope>
             </dependency>
             <dependency>