X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=springboot%2Fspring-boot-setup%2Fsrc%2Fmain%2Fresources%2Fpom-template.xml;h=9d176c63c64d5b27f2b3ad58e1b61f66567f9a9d;hb=7dc9fd91d3914b0bafae371bde44d13bf1e03e03;hp=763e32b0cf9ef4823f12fead34a5e29440a009d2;hpb=ffff34adfb3495151d11bd1410f2eebf9eca8494;p=ccsdk%2Fparent.git

diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index 763e32b0..9d176c63 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -28,6 +28,7 @@
         <system>JIRA</system>
         <url>https://jira.onap.org/</url>
     </issueManagement>
+
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
@@ -57,7 +58,6 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- sitePath may be overridden in the inheriting POM if desired -->
         <sitePath>/content/sites/site/\${project.groupId}/\${project.artifactId}/\${project.version}</sitePath>
 
@@ -68,6 +68,7 @@
         <!-- end of properties from oparent -->
 
         <!-- ONAP repositories -->
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <onap.nexus.host>nexus.onap.org</onap.nexus.host>
         <onap.nexus.port>443</onap.nexus.port>
         <onap.nexus.protocol>https</onap.nexus.protocol>
@@ -88,15 +89,17 @@
         <checkstyle.skip>true</checkstyle.skip>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.5</logging-analytics.version>
+        <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>0.7.1-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.sli.core.version>0.7.1-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>0.7.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>0.7.1-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>0.7.1-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>0.7.1-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.cds.version>(1.2.99999,1.3.99999-SNAPSHOT]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.2.99999, 1.3.99999-SNAPSHOT]</ccsdk.features.version>
+        <ccsdk.distribution.version>(1.2.99999, 1.3.99999-SNAPSHOT]</ccsdk.distribution.version>
+        <ccsdk.sli.version>(1.3.99999, 1.4.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>${springbootparent.version}</spring.boot.version>
@@ -114,24 +117,28 @@
         <mockk.version>1.9.3</mockk.version>
 
         <!-- Managed dependency versions -->
-        <antlr.version>4.7.2</antlr.version>
+        <antlr.version>4.8-1</antlr.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>${springboot.httpcomponents.core.version}</apache.httpcomponents.core.version>
+        <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>
+        <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>2.25.1</jersey.version>
-        <jersey.client.version>2.25.1</jersey.client.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.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <logback.version>1.2.3</logback.version>
-        <mariadb.connector.version>2.4.4</mariadb.connector.version>
+        <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
-        <slf4j.version>1.7.25</slf4j.version>
+        <slf4j.version>${springboot.slf4j.version}</slf4j.version>
+        <springfox.version>${springboot.springfox.version}</springfox.version>
         <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
+        <tomcat-jdbc.version>${springboot.tomcat.jdbc.version}</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
@@ -147,6 +154,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${springboot.jackson.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-common</artifactId>
@@ -184,6 +198,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>
 
@@ -235,7 +254,13 @@
                 <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>
         <pluginRepository>
             <id>onap-public</id>
@@ -292,6 +317,7 @@
                     <version>2.8</version>
                     <configuration>
                         <skip/>
+                        <deployAtEnd>true</deployAtEnd>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -330,6 +356,7 @@
                     </executions>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.17</version>
                     <dependencies>
@@ -435,7 +462,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.2.0</version>
                     <configuration>
                         <additionalDependencies>
                             <additionalDependency>
@@ -479,6 +506,7 @@
                                 <version>\${commons.lang.version}</version>
                             </additionalDependency>
                         </additionalDependencies>
+                        <failOnError>false</failOnError>
                     </configuration>
                     <executions>
                         <execution>
@@ -505,7 +533,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <!-- Plugins from ONAP oparent -->
             <!-- Jacoco / Sonar -->
@@ -603,6 +630,11 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
             <plugin>
@@ -611,10 +643,6 @@
                 <version>1.12</version>
             </plugin>
             <!-- Jacoco / Sonar -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -664,6 +692,18 @@
                     <tag>\${project.artifactId}-\${project.version}</tag>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.0.0</version>
+                <configuration>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -988,6 +1028,8 @@
             <id>q</id>
             <properties>
                 <skipTests>true</skipTests>
+                <skipPush>true</skipPush>
+                <docker.skip.push>true</docker.skip.push>
                 <!-- But NOT <maven.test.skip>true, as that's for compiling, not running, tests;
                      and that's usually quick.  Skipping test compilation with -Pq with maven.test.skip would be
                      particularly confusing when used in a project with maven-jar-plugin <goal>test-jar, so don't.)  -->