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>

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