X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=springboot%2Fspring-boot-setup%2Fsrc%2Fmain%2Fresources%2Fpom-template-jdk11.xml;h=354d16274bf6f386468f95a98666766446170626;hb=43836a9e53e965e6057ff08824d2cc4660a90049;hp=ccf67dde5755593b5b640cf2a4e2df60ddde242c;hpb=9d4203e3683a9ef94011b9d2ae015f216287b6f3;p=ccsdk%2Fparent.git

diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml
index ccf67dde..354d1627 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk11.xml
@@ -51,7 +51,7 @@
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
         <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
+        <jacoco.version>${springboot.jacoco.version}</jacoco.version>
         <!-- properties from oparent -->
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -92,10 +92,10 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.4.99999,1.5.99999-SNAPSHOT]</ccsdk.cds.version>
-        <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.5.99999,1.6.99999-SNAPSHOT]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.6.99999, 1.7.99999-SNAPSHOT]</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
@@ -107,14 +107,14 @@
 
         <!-- Kotlin versions -->
         <kotlin.compiler.jvmTarget>1.11</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.5.32</kotlin.version>
-        <kotlin.maven.version>1.5.32</kotlin.maven.version>
-        <kotlin.couroutines.version>1.5.2</kotlin.couroutines.version>
-        <kotlinpoet.version>1.5.0</kotlinpoet.version>
+        <kotlin.version>${springboot.kotlin.version}</kotlin.version>
+        <kotlin.maven.version>${springboot.kotlin.maven.version}</kotlin.maven.version>
+        <kotlin.couroutines.version>${springboot.kotlin.coroutines.version}</kotlin.couroutines.version>
+        <kotlinpoet.version>${springboot.kotlinpoet.version}</kotlinpoet.version>
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <nats.version>2.6.6</nats.version>
         <nats.streaming.version>2.2.3</nats.streaming.version>
-        <mockk.version>1.9.3</mockk.version>
+        <mockk.version>${springboot.mockk.version}</mockk.version>
 
         <!-- Managed dependency versions -->
         <antlr.version>4.8-1</antlr.version>
@@ -123,15 +123,15 @@
         <apache.httpcomponents.client.version>${springboot.httpcomponents.client.version}</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>
+        <grpc.version>1.29.0</grpc.version>
         <netty-ssl>${springboot.netty.ssl.version}</netty-ssl>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
         <jersey.version>${springboot.jersey.version}</jersey.version>
         <jersey.client.version>${springboot.jersey.version}</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
-        <log4j.version>2.17.1</log4j.version>
-        <log4j2.version>2.17.1</log4j2.version>
+        <log4j.version>2.17.2</log4j.version>
+        <log4j2.version>2.17.2</log4j2.version>
         <logback.version>${springboot.logback.version}</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
@@ -287,18 +287,7 @@
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
-        <!-- Black Duck plugin dependencies -->
-        <pluginRepository>
-            <id>JCenter</id>
-            <name>JCenter Repository</name>
-            <url>http://jcenter.bintray.com</url>
-        </pluginRepository>
 
-        <pluginRepository>
-            <id>Restlet</id>
-            <name>Restlet Repository</name>
-            <url>http://maven.restlet.com</url>
-        </pluginRepository>
     </pluginRepositories>
 
     <build>