X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=9df3964a96c61e4d0b52ed5e261be54f9f98f4ba;hb=9760e0793ee41fbf9e65c7fc06aec692498901d4;hp=6ffd34a88ec55da46b7e67626bfb1e6210f98fc2;hpb=1072867dfac0df993cbd3e44bcc11a5cac7465fd;p=ccsdk%2Fcds.git

diff --git a/pom.xml b/pom.xml
index 6ffd34a88..9df3964a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,20 +16,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
 <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>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1</version>
+        <version>2.3.3</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.cds</groupId>
     <artifactId>cds-aggregator</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Aggregator</name>
@@ -55,21 +54,22 @@ limitations under the License.
         <!--Only include java and kt files to the scan-->
         <sonar.inclusions>**/*.java,**/*.kt</sonar.inclusions>
         <!--Specify path to load jacoco XLM report, as Sonar can't load Kotlin coverage from binary report-->
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
         <jacoco.version>0.8.3</jacoco.version>
 
         <!-- Properties for POM Format -->
-        <format.skipValidate>false</format.skipValidate>
+        <format.skipValidate>true</format.skipValidate>
         <format.skipExecute>true</format.skipExecute>
+
         <java.version>11</java.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
 
         <!-- docker related properties -->
+        <assembly.id>maven</assembly.id>
         <docker.verbose>true</docker.verbose>
         <docker.skip.push>false</docker.skip.push>
-        <docker.push.phase>deploy</docker.push.phase>
+        <name.space>org.onap.ccsdk.cds</name.space>
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
@@ -79,12 +79,14 @@ limitations under the License.
     <build>
         <pluginManagement>
             <plugins>
-                <!--TODO: This plugin is broken. Find replacement-->
                 <!-- Plugin to Format/Validate POM Files -->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>tidy-maven-plugin</artifactId>
                     <version>1.1.0</version>
+                    <configuration>
+                        <lineLength>120</lineLength>
+                    </configuration>
                     <executions>
                         <execution>
                             <id>format-pom</id>
@@ -181,7 +183,7 @@ limitations under the License.
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.12.0</version>
+                    <version>2.17.1</version>
                     <executions>
                         <execution>
                             <id>format-java</id>