X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=springboot%2Fspringboot1%2Fpom.xml;h=d3ad2bcea97e284a37a753d6362eef7ef824e480;hb=9714cfc592c9ca285bc0c70b659c024289690e6c;hp=380654d0c9ee43cea13234b4f397e82464e46f0d;hpb=2f11eebcc264e77a7fe5440178e910764278c9ff;p=ccsdk%2Fparent.git

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 380654d0..d3ad2bce 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-1-starter-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -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,16 +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>1.0.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.cds.version>1.2.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.2.0-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.3.0-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>1.5.22.RELEASE</spring.boot.version>
@@ -115,7 +117,7 @@
         <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>
@@ -144,7 +146,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
+                <version>2.2.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -237,6 +239,7 @@
             </snapshots>
         </repository>
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>onap-public</id>
@@ -293,6 +296,7 @@
                     <version>2.8</version>
                     <configuration>
                         <skip/>
+                        <deployAtEnd>true</deployAtEnd>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -436,7 +440,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>
@@ -480,6 +484,7 @@
                                 <version>${commons.lang.version}</version>
                             </additionalDependency>
                         </additionalDependencies>
+                        <failOnError>false</failOnError>
                     </configuration>
                     <executions>
                         <execution>
@@ -506,7 +511,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <!-- Plugins from ONAP oparent -->
             <!-- Jacoco / Sonar -->
@@ -603,6 +607,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
@@ -612,10 +620,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>
@@ -665,6 +669,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>
 
@@ -989,6 +1005,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.)  -->