From 48f5577e8a373f6a22f1f40112232d179a4a42a7 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 17 Dec 2019 10:44:04 -0500
Subject: Update versions of dependencies

Updated versions of third party dependencies that are not
constrained by OpenDaylight to latest minor version.

Change-Id: I0640f50b02f0cee4669b6a4c4c87754861a686ce
Issue-ID: CCSDK-2005
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 dependencies-bom/pom.xml                           | 42 ++++++++--------
 dependencies-odl-bom/pom.xml                       | 58 ++++++++++++++--------
 odlparent/binding-parent/pom.xml                   | 12 ++---
 odlparent/bundle-parent/pom.xml                    | 12 ++---
 odlparent/feature-repo-parent/pom.xml              | 12 ++---
 odlparent/karaf4-parent/pom.xml                    | 12 ++---
 odlparent/mdsal-it-parent/pom.xml                  | 12 ++---
 odlparent/odlparent-lite/pom.xml                   | 12 ++---
 odlparent/odlparent/pom.xml                        | 12 ++---
 .../setup/src/main/resources/pom-template.xml      | 12 ++---
 odlparent/single-feature-parent/pom.xml            | 12 ++---
 springboot/springboot1/pom.xml                     |  2 +-
 springboot/springboot2/pom.xml                     |  8 +--
 13 files changed, 118 insertions(+), 100 deletions(-)

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 56aeb0b0..b8794ea9 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>ch.vorburger.mariaDB4j</groupId>
                 <artifactId>mariaDB4j</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -44,10 +44,15 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.9.8</version>
+                <version>2.10.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>3.6.1</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java-util</artifactId>
@@ -56,7 +61,7 @@
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
-                <version>2.3.0</version>
+                <version>2.4.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>
@@ -71,17 +76,17 @@
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-protobuf</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-stub</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
@@ -91,12 +96,12 @@
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-annotations</artifactId>
-                <version>1.5.22</version>
+                <version>1.6.0</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-core</artifactId>
-                <version>1.5.22</version>
+                <version>1.6.0</version>
             </dependency>
             <dependency>
                 <groupId>javax</groupId>
@@ -117,7 +122,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.1</version>
+                <version>1.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
@@ -128,12 +133,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.10</version>
+                <version>4.4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.6</version>
+                <version>4.5.10</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
@@ -153,35 +158,30 @@
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
-                <version>2.25.1</version>
+                <version>2.29.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>3.6.1</version>
-            </dependency>
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.8.3</version>
+                <version>1.12.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>2.1.1</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.7.25</version>
+                <version>1.7.29</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.11</version>
+                <version>6.14.3</version>
             </dependency>
         </dependencies>
 
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index bbb96170..33f1cd1a 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -93,7 +93,7 @@
             <dependency>
                 <groupId>ch.vorburger.mariaDB4j</groupId>
                 <artifactId>mariaDB4j</artifactId>
-                <version>2.2.3</version>
+                <version>2.4.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -106,6 +106,7 @@
                 <artifactId>hppc</artifactId>
                 <version>0.7.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -121,13 +122,13 @@
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
                 <artifactId>wiremock</artifactId>
-                <version>2.7.1</version>
+                <version>2.25.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.8.5</version>
+                <version>2.8.6</version>
             </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
@@ -137,7 +138,7 @@
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
-                <version>2.3.0</version>
+                <version>2.4.0</version>
             </dependency>
             <dependency>
                 <groupId>com.ning</groupId>
@@ -159,6 +160,7 @@
                 <artifactId>jsr166e</artifactId>
                 <version>1.1.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
@@ -169,11 +171,13 @@
                 <artifactId>commons-cli</artifactId>
                 <version>1.3.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>2.6</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -184,31 +188,33 @@
                 <artifactId>dom4j</artifactId>
                 <version>1.6.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
                 <version>4.1.34.Final</version>
                 <type>pom</type>
             </dependency>
+            <!-- Indirect ODL constraint : should be compatible with io.netty version -->
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-protobuf</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-stub</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-testing</artifactId>
-                <version>1.17.1</version>
+                <version>1.21.1</version>
             </dependency>
             <dependency>
                 <groupId>jakarta-regexp</groupId>
@@ -220,6 +226,7 @@
                 <artifactId>javaee-api</artifactId>
                 <version>7.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
@@ -230,6 +237,7 @@
                 <artifactId>servlet-api</artifactId>
                 <version>2.5</version>
             </dependency>
+
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
@@ -246,11 +254,13 @@
                 <artifactId>commons-io</artifactId>
                 <version>1.3.2</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
                 <version>3.8.1</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
@@ -265,13 +275,15 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.10</version>
+                <version>4.4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.6</version>
+                <version>4.5.10</version>
             </dependency>
+
+            <!-- There are newer major releases of lucene available -->
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-analyzers-common</artifactId>
@@ -345,8 +357,9 @@
             <dependency>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-                <version>2.3.2</version>
+                <version>2.3.10</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
@@ -370,23 +383,27 @@
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
                 <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlets</artifactId>
                 <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty.websocket</groupId>
                 <artifactId>websocket-api</artifactId>
                 <version>9.4.12.v20180830</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.eclipse.jetty.websocket</groupId>
                 <artifactId>websocket-servlet</artifactId>
@@ -407,6 +424,7 @@
                 <artifactId>delete-by-query</artifactId>
                 <version>2.2.0</version>
             </dependency>
+            <!-- Constrained by OpenDaylight -->
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
@@ -422,7 +440,7 @@
             <dependency>
                 <groupId>org.java-websocket</groupId>
                 <artifactId>Java-WebSocket</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.0</version>
             </dependency>
             <dependency>
                 <groupId>org.joda</groupId>
@@ -438,40 +456,40 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.8.3</version>
+                <version>1.12.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>2.1.1</version>
+                <version>2.4.4</version>
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito2</artifactId>
-                <version>1.6.6</version>
+                <version>1.7.4</version>
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-module-junit4</artifactId>
-                <version>1.6.6</version>
+                <version>1.7.4</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.7.25</version>
+                <version>1.7.29</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>4.3.24.RELEASE</version>
+                <version>4.3.25.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.11</version>
+                <version>6.14.3</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index c463add0..353984be 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 83ade459..cc85f9ea 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 1d085e8b..584888c9 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index ac65065b..45d652b0 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 8af423c9..48b9fb69 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 03de7128..5f7f0629 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 33c0fcbf..fe3c9ba1 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 3daddd11..8369bbd2 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index e7671a60..c2b69dde 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -171,14 +171,14 @@
         <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
 
         <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.17.1</grpc.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
-        <testng.version>6.11</testng.version>
+        <grpc.version>1.21.1</grpc.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
+        <testng.version>6.14.3</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
         <jetty.version>9.4.12.v20180830</jetty.version>
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index b5da5bfa..7716922f 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -98,7 +98,7 @@
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
 
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
 
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 6bda7168..1d353d02 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -110,8 +110,8 @@
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <mockk.version>1.9.3</mockk.version>
 
-        <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.25.0</grpc.version>
@@ -122,8 +122,8 @@
         <jettison.version>1.3.8</jettison.version>
         <junit.version>4.12</junit.version>
         <logback.version>1.2.3</logback.version>
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <mariadb4j.version>2.2.3</mariadb4j.version>
+        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
         <testng.version>6.11</testng.version>
         <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
-- 
cgit 1.2.3-korg