Merge "Update versions of dependencies"

diff --combined odlparent/binding-parent/pom.xml
index 5bb2dea,353984b..8c1e434
--- 1/odlparent/binding-parent/pom.xml
--- 2/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/bundle-parent/pom.xml
index e8673c6,cc85f9e..d1dc573
--- 1/odlparent/bundle-parent/pom.xml
--- 2/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/feature-repo-parent/pom.xml
index 0536d77,584888c..1ce404e
--- 1/odlparent/feature-repo-parent/pom.xml
--- 2/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/karaf4-parent/pom.xml
index da23632,45d652b..164e3b1
--- 1/odlparent/karaf4-parent/pom.xml
--- 2/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/mdsal-it-parent/pom.xml
index 5b2d927,48b9fb6..4042074
--- 1/odlparent/mdsal-it-parent/pom.xml
--- 2/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/odlparent-lite/pom.xml
index d907e30,5f7f062..b3f9a87
--- 1/odlparent/odlparent-lite/pom.xml
--- 2/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/odlparent/pom.xml
index a727d77,fe3c9ba..651874d
--- 1/odlparent/odlparent/pom.xml
--- 2/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/setup/src/main/resources/pom-template.xml
index 30b7649,8369bbd..d663031
--- 1/odlparent/setup/src/main/resources/pom-template.xml
--- 2/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>\${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>\${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined odlparent/single-feature-parent/pom.xml
index 0246a82,c2b69dd..809676c
--- 1/odlparent/single-feature-parent/pom.xml
--- 2/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@@ -52,7 -52,8 +52,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -90,10 -91,10 +90,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -170,14 -171,14 +170,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 --combined springboot/springboot1/pom.xml
index 10387b2,7716922..63c1c50
--- 1/springboot/springboot1/pom.xml
--- 2/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@@ -49,7 -49,8 +49,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -82,10 -83,10 +82,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -97,7 -98,7 +97,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 --combined springboot/springboot2/pom.xml
index 2dd8260,1d353d0..c1034b9
--- 1/springboot/springboot2/pom.xml
--- 2/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@@ -48,7 -48,8 +48,7 @@@
          <jacoco.version>0.7.7.201606060606</jacoco.version>
          <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
          <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 -        <!-- Default Sonar configuration -->
 -        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
 +
          <!-- Note: This list should match jacoco-maven-plugin's exclusion list
              below -->
          <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@@ -81,10 -82,10 +81,10 @@@
          <sonar.language>java</sonar.language>
          <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
          <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 -        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
          <sonar.projectVersion>${project.version}</sonar.projectVersion>
  
          <!-- CCSDK component versions -->
 +        <ccsdk.cds.version>0.7.0-SNAPSHOT</ccsdk.cds.version>
          <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
          <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
          <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
@@@ -109,8 -110,8 +109,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>
@@@ -121,8 -122,8 +121,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>