Release version 2.3.2 parent poms

[ccsdk/parent.git] / springboot / springboot25 / pom.xml

diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml
index cfe2298..b3ab589 100644 (file)
--- a/springboot/springboot25/pom.xml
+++ b/springboot/springboot25/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-25-starter-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.3.3-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,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.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-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -95,7 +92,7 @@
         <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.sli.version>1.3.1</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>
@@ -130,6 +127,8 @@
         <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.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
@@ -148,7 +147,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.2.0-SNAPSHOT</version>
+                <version>2.3.3-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -196,6 +195,11 @@
                 <artifactId>logging-filter-base</artifactId>
                 <version>${logging-analytics.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.liquibase</groupId>
+                <artifactId>liquibase-core</artifactId>
+                <version>4.4.2-nordix</version>
+            </dependency>   
         </dependencies>
     </dependencyManagement>
 
@@ -247,6 +251,11 @@
                 <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>
@@ -433,10 +442,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven.compile.plugin.version}</version>
+                    <version>${maven-compiler-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>