X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=springboot%2Fspringboot25%2Fpom.xml;h=bf76bd9b5c0bce4c677eabfd1bb305346b3a15cc;hb=e718a166dadeca3e606386da1720313d8d71119f;hp=d7e828dacfcab8f5f5f1aaa5e5e1277ecac22c89;hpb=386549759ed349d266a6310bb590070dd272e9f3;p=ccsdk%2Fparent.git

diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml
index d7e828da..bf76bd9b 100644
--- a/springboot/springboot25/pom.xml
+++ b/springboot/springboot25/pom.xml
@@ -2,7 +2,9 @@
 <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 was originally 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-jdk17.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>
@@ -12,11 +14,11 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-25-starter-parent</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
-    <description>Root POM to be used in place of spring-boot parent for CCSDK based projects (Spring-boot 2.5)</description>
+    <description>Root POM to be used in place of spring-boot parent for CCSDK based projects</description>
     <url>http://wiki.onap.org</url>
     <organization>
         <name>ONAP</name>
@@ -49,7 +51,7 @@
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
         <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
+        <jacoco.version>0.8.8</jacoco.version>
         <!-- properties from oparent -->
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,9 +77,9 @@
         <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>11</java.version>
-        <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <java.version>17</java.version>
+        <maven.compile.plugin.version>3.10.0</maven.compile.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>
@@ -87,10 +89,10 @@
         <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.3.1</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>
@@ -101,39 +103,21 @@
         <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>
         <nats.streaming.version>2.2.3</nats.streaming.version>
         <mockk.version>1.9.3</mockk.version>
 
+
+        <antlr.version>4.12.0</antlr.version>
+        <antlr4.version>4.12.0</antlr4.version>
+
         <!-- Managed dependency versions -->
-        <antlr.version>4.8-1</antlr.version>
-        <commons.lang.version>2.6</commons.lang.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.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>
-        <log4j.version>2.17.1</log4j.version>
-        <log4j2.version>2.17.1</log4j2.version>
-        <logback.version>1.2.10</logback.version>
-        <mariadb.connector.version>2.7.3</mariadb.connector.version>
-        <mariadb4j.version>2.4.0</mariadb4j.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.58</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
@@ -145,7 +129,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.4.0-SNAPSHOT</version>
+                <version>2.6.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -197,7 +181,7 @@
                 <groupId>org.liquibase</groupId>
                 <artifactId>liquibase-core</artifactId>
                 <version>4.4.2-nordix</version>
-            </dependency>   
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -282,18 +266,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>
@@ -403,7 +376,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
                     <configuration>
                         <!-- Sets the VM argument line used when unit tests are run. -->
                         <argLine>${surefireArgLine}</argLine>
@@ -416,7 +388,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.19.1</version>
                     <executions>
                         <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. -->
                         <execution>
@@ -435,7 +406,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven-compiler-plugin.version}</version>
+                    <version>${maven.compile.plugin.version}</version>
                     <configuration>
                         <release>${java.version}</release>
                         <!--explicitly remove source and target-->
@@ -446,7 +417,7 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.6.0.1398</version>
+                    <version>3.7.0.1746</version>
                 </plugin>
 
                 <!-- End of plugins from ONAP oparent -->
@@ -454,50 +425,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
                     <configuration>
-                        <additionalDependencies>
-                            <additionalDependency>
-                                <groupId>org.slf4j</groupId>
-                                <artifactId>slf4j-api</artifactId>
-                                <version>${slf4j.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>org.antlr</groupId>
-                                <artifactId>antlr4</artifactId>
-                                <version>${antlr.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>org.antlr</groupId>
-                                <artifactId>antlr4-runtime</artifactId>
-                                <version>${antlr.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>com.sun.jersey</groupId>
-                                <artifactId>jersey-client</artifactId>
-                                <version>${jersey.client.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>com.sun.jersey</groupId>
-                                <artifactId>jersey-core</artifactId>
-                                <version>${jersey.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>org.apache.httpcomponents</groupId>
-                                <artifactId>httpcore-osgi</artifactId>
-                                <version>${apache.httpcomponents.core.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>org.apache.httpcomponents</groupId>
-                                <artifactId>httpclient-osgi</artifactId>
-                                <version>${apache.httpcomponents.client.version}</version>
-                            </additionalDependency>
-                            <additionalDependency>
-                                <groupId>commons-lang</groupId>
-                                <artifactId>commons-lang</artifactId>
-                                <version>${commons.lang.version}</version>
-                            </additionalDependency>
-                        </additionalDependencies>
                         <failOnError>false</failOnError>
                     </configuration>
                     <executions>
@@ -879,7 +807,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>
@@ -959,7 +887,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.5.0</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>swagger-generate-sources</id>
@@ -1085,4 +1013,4 @@
         </profile>
         <!-- End of profiles from ONAP oparent -->
     </profiles>
-</project>
\ No newline at end of file
+</project>