Merge "Update versions of dependencies"

[ccsdk/parent.git] / odlparent / setup / src / main / resources / pom-template.xml

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 3daddd1..d663031 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -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>
@@ -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>
@@ -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>