X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=springboot%2Fspringboot25%2Fpom.xml;h=a062f624ccdd8400f46a1210def6dca4695ffc63;hb=7061ca22c0b2833784f6c9b1e3c55ea3a67b42ca;hp=294bda86f3af185099e94660d35f648364f1e154;hpb=95395e80b9e994c8fa801570f689b26870457951;p=ccsdk%2Fparent.git

diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml
index 294bda86..a062f624 100644
--- a/springboot/springboot25/pom.xml
+++ b/springboot/springboot25/pom.xml
@@ -2,19 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template.xml
+    <!-- PLEASE READ !!!!! This file is generated from ccsdk/parent/springboot/spring-boot-setup/src/main/template/pom-template-jdk11.xml
         Any updates needed should be made to that template and not to the generated
         pom.xml file -->
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.10</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-25-starter-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.5.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -54,8 +54,6 @@
         <jacoco.version>0.8.5</jacoco.version>
         <!-- properties from oparent -->
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- sitePath may be overridden in the inheriting POM if desired -->
@@ -79,10 +77,12 @@
         <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-        <java.version.source>1.8</java.version.source>
-        <java.version.target>1.8</java.version.target>
+        <java.version>11</java.version>
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+        <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -92,24 +92,24 @@
         <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.99999,1.2.99999-SNAPSHOT)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version>
-        <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999-SNAPSHOT)</ccsdk.sli.version>
+        <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.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>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
 
         <!-- Spring versions -->
-        <spring.boot.version>2.5.3</spring.boot.version>
-        <spring.version>5.3.9</spring.version>
+        <spring.boot.version>2.5.10</spring.boot.version>
+        <spring.version>5.3.16</spring.version>
 
         <!-- Kotlin versions -->
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.3.61</kotlin.version>
-        <kotlin.maven.version>1.3.61</kotlin.maven.version>
-        <kotlin.couroutines.version>1.3.3</kotlin.couroutines.version>
+        <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>
         <kroto-plus.version>0.5.0</kroto-plus.version>
         <nats.version>2.6.6</nats.version>
@@ -119,24 +119,26 @@
         <!-- Managed dependency versions -->
         <antlr.version>4.8-1</antlr.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
+        <apache.httpcomponents.core.version>4.4.15</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.13</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>
-        <netty-ssl>2.0.40.Final</netty-ssl>
+        <grpc.version>1.29.0</grpc.version>
+        <netty-ssl>2.0.50.Final</netty-ssl>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
         <jersey.version>2.33</jersey.version>
         <jersey.client.version>2.33</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
-        <logback.version>1.2.3</logback.version>
+        <log4j.version>2.17.2</log4j.version>
+        <log4j2.version>2.17.2</log4j2.version>
+        <logback.version>1.2.11</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
-        <slf4j.version>1.7.32</slf4j.version>
+        <slf4j.version>1.7.36</slf4j.version>
         <springfox.version>3.0.0</springfox.version>
         <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.50</tomcat-jdbc.version>
+        <tomcat-jdbc.version>9.0.58</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
@@ -148,14 +150,14 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.2.0-SNAPSHOT</version>
+                <version>2.5.4-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.12.4</version>
+                <version>2.12.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -200,7 +202,7 @@
                 <groupId>org.liquibase</groupId>
                 <artifactId>liquibase-core</artifactId>
                 <version>4.4.2-nordix</version>
-            </dependency>   
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -252,11 +254,6 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>nordix-liquibase-repo</id>
-            <name>liquibase</name>
-            <url>https://artifactory.nordix.org/artifactory/liquibase</url>
-        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -290,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>
@@ -445,8 +431,10 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven.compile.plugin.version}</version>
                     <configuration>
-                        <source>${java.version.source}</source>
-                        <target>${java.version.target}</target>
+                        <release>${java.version}</release>
+                        <!--explicitly remove source and target-->
+                        <source combine.self="override"/>
+                        <target combine.self="override"/>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -885,7 +873,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
+                        <version>${maven-antrun-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>initialize</phase>