From 89e951208e78118bdf29ae90e465bd7c668b4462 Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Thu, 14 May 2020 07:32:25 +0200
Subject: Reorganize pom.xml

Remove commented section. Extract library versions to properties.

Change-Id: Ia3fd5b38ae456acde375a2ac7aff581c6f3e04d1
Issue-ID: DCAEGEN2-2243
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
---
 pom.xml | 129 +++++++++++++++++++++++++++-------------------------------------
 1 file changed, 55 insertions(+), 74 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b7280b6..75dc48cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <!--
     ================================================================================
 	Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
-	Copyright (c) 2018 Nokia. All rights reserved.
+	Copyright (c) 2020 Nokia. All rights reserved.
 	================================================================================
 	Licensed under the Apache License, Version 2.0 (the "License"); you may not
 	use this file except in compliance with the License. You may obtain a copy
@@ -49,9 +49,35 @@
     <sonar.coverage.jacoco.xmlReportPaths>
 	${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
+    <!-- DEPENDENCY RELATED SETTINGS -->
     <crypt-password.version>1.3.5</crypt-password.version>
     <micrometer.version>1.4.2</micrometer.version>
     <spring.version>2.2.2.RELEASE</spring.version>
+    <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
+    <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+    <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
+    <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
+    <docker-maven-plugin.version>1.2.0</docker-maven-plugin.version>
+    <json-simple.version>1.1.1</json-simple.version>
+    <json-schema-validator.version>1.0.29</json-schema-validator.version>
+    <gson.version>2.8.5</gson.version>
+    <json.version>20160810</json.version>
+    <cambriaClient.version>0.0.1</cambriaClient.version>
+    <unirest-java.version>1.4.9</unirest-java.version>
+    <commons-collections.version>3.2.2</commons-collections.version>
+    <commons-configuration.version>1.10</commons-configuration.version>
+    <vavr.version>0.9.2</vavr.version>
+    <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>
+    <springfox-swagger2.version>2.8.0</springfox-swagger2.version>
+    <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
+    <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
+    <assertj-core.version>3.8.0</assertj-core.version>
+    <jimfs.version>1.1</jimfs.version>
+    <wiremock-standalone.version>2.17.0</wiremock-standalone.version>
+    <spring-security-test.version>5.1.1.RELEASE</spring-security-test.version>
+    <spring-boot-starter-test.version>2.1.0.RELEASE</spring-boot-starter-test.version>
+    <api-custom-header.version>1.1.4</api-custom-header.version>
+    <functionaljava.version>4.8.1</functionaljava.version>
   </properties>
   <build>
     <pluginManagement>
@@ -62,25 +88,25 @@
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>${maven-assembly-plugin.version}</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>${maven-javadoc-plugin.version}</version>
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.9</version>
+          <version>${maven-project-info-reports-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M1</version>
+          <version>${maven-surefire-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>com.spotify</groupId>
           <artifactId>docker-maven-plugin</artifactId>
-          <version>1.2.0</version>
+          <version>${docker-maven-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -186,51 +212,6 @@
           </exposes>
           <cmd>bin/docker-entry.sh</cmd>
         </configuration>
-        <!--<executions>
-          <execution>
-            <id>build-image</id>
-            <phase>package</phase>
-            <goals>
-              <goal>deploy</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>tag-and-push-image-latest</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName>
-              <pushImage>true</pushImage>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tag-and-push-image-with-version</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
-              <pushImage>true</pushImage>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tag-and-push-image-with-version-and-date</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>${docker.image.name}:latest</image>
-              <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName>
-              <pushImage>true</pushImage>
-            </configuration>
-          </execution>
-        </executions> -->
       </plugin>
     </plugins>
   </build>
@@ -322,12 +303,12 @@
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
+      <version>${json-simple.version}</version>
     </dependency>
     <dependency>
       <groupId>com.networknt</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>1.0.29</version>
+      <version>${json-schema-validator.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -338,39 +319,39 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.5</version>
+      <version>${gson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20160810</version>
+      <version>${json.version}</version>
     </dependency>
     <!-- REST API RELATED -->
     <dependency>
       <groupId>com.att.nsa</groupId>
       <artifactId>cambriaClient</artifactId>
-      <version>0.0.1</version>
+      <version>${cambriaClient.version}</version>
     </dependency>
     <dependency>
       <groupId>com.mashape.unirest</groupId>
       <artifactId>unirest-java</artifactId>
-      <version>1.4.9</version>
+      <version>${unirest-java.version}</version>
     </dependency>
     <!-- MISCELLANEOUS -->
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <version>${commons-collections.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-      <version>1.10</version>
+      <version>${commons-configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>io.vavr</groupId>
       <artifactId>vavr</artifactId>
-      <version>0.9.2</version>
+      <version>${vavr.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -385,72 +366,72 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-log4j2</artifactId>
-      <version>2.1.5.RELEASE</version>
+      <version>${spring-boot-starter-log4j2.version}</version>
     </dependency>
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger2</artifactId>
-      <version>2.8.0</version>
+      <version>${springfox-swagger2.version}</version>
     </dependency>
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger-ui</artifactId>
-      <version>2.8.0</version>
+      <version>${springfox-swagger2.version}</version>
       <scope>compile</scope>
     </dependency>
     <!-- TESTING -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.3.1</version>
+      <version>${junit-jupiter-api.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.3.1</version>
+      <version>${junit-jupiter-api.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
-      <version>5.3.1</version>
+      <version>${junit-jupiter-api.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>2.23.0</version>
+      <version>${mockito-junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.8.0</version>
+      <version>${assertj-core.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.jimfs</groupId>
       <artifactId>jimfs</artifactId>
-      <version>1.1</version>
+      <version>${jimfs.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>2.17.0</version>
+      <version>${wiremock-standalone.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-test</artifactId>
-      <version>5.1.1.RELEASE</version>
+      <version>${spring-security-test.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
-      <version>2.1.0.RELEASE</version>
+      <version>${spring-boot-starter-test.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -466,12 +447,12 @@
     <dependency>
       <groupId>org.onap.dcaegen2.services.sdk.standardization</groupId>
       <artifactId>api-custom-header</artifactId>
-      <version>1.1.4</version>
+      <version>${api-custom-header.version}</version>
     </dependency>
     <dependency>
       <groupId>org.functionaljava</groupId>
       <artifactId>functionaljava</artifactId>
-      <version>4.8.1</version>
+      <version>${functionaljava.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
-- 
cgit 1.2.3-korg