X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=springboot%2Fspring-boot-setup%2Fsrc%2Fmain%2Fresources%2Fpom-template.xml;h=903aee080b9e57c0dc6cbadac3fd9a3ecb59cbdd;hb=b2db3c41156f0855daafa8afe29f0aca43cc225d;hp=c69394c551cf566017b65ce6a33e15c4c633a748;hpb=c57dd5f1d9f693c960d34c9e85027bbd742ae94c;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 c69394c5..903aee08 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,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.1-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.1-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.1-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.1-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>${springbootparent.version}</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>
@@ -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>
@@ -331,6 +335,7 @@
                     </executions>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.17</version>
                     <dependencies>
@@ -507,7 +512,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <!-- Plugins from ONAP oparent -->
             <!-- Jacoco / Sonar -->
@@ -605,6 +609,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>
@@ -998,6 +1007,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.)  -->