Refactoring springboot related template and pom-generation
Issue-ID: CCSDK-3629
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0d0bb47e55a1f27131795e609e38c0952e763856
diff --git a/springboot/springboot26/pom.xml b/springboot/springboot26/pom.xml
index d23cf3a..532b17e 100644
--- a/springboot/springboot26/pom.xml
+++ b/springboot/springboot26/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
@@ -17,7 +18,7 @@
<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.6)</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>
@@ -78,7 +79,7 @@
<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>
+ <maven.compile.plugin.version>3.8.1</maven.compile.plugin.version>
<features.file>features.xml</features.file>
<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -88,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.3.99999,1.4.99999-SNAPSHOT]</ccsdk.cds.version>
+ <ccsdk.features.version>(1.3.99999, 1.4.99999-SNAPSHOT]</ccsdk.features.version>
+ <ccsdk.distribution.version>(1.3.99999, 1.4.99999-SNAPSHOT]</ccsdk.distribution.version>
+ <ccsdk.sli.version>(1.4.99999, 1.5.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>
@@ -99,6 +100,7 @@
<!-- Spring versions -->
<spring.boot.version>2.6.6</spring.boot.version>
+ <spring.version>5.3.18</spring.version>
<!-- Kotlin versions -->
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
@@ -197,7 +199,7 @@
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>4.4.2-nordix</version>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -435,7 +437,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-->