From: aravind.est <aravindhan.a@est.tech>
Date: Wed, 9 Aug 2023 10:11:15 +0000 (+0100)
Subject: Add maven versions in root POM
X-Git-Tag: 0.0.1~53
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=fbe2221a42effc6c410ef7c74f4179b97e0aa754;p=nonrtric%2Fplt%2Frappmanager.git

Add maven versions in root POM

Maven dependency versions moved to root POM to be consistent across projects

Issue-ID: NONRTRIC-905
Signed-off-by: aravind.est <aravindhan.a@est.tech>
Change-Id: Id2ca721798b2a747b688fb90ec070c328db5809b
---

diff --git a/pom.xml b/pom.xml
index e512d7c..9117296 100755
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,19 @@
     <properties>
         <java.version>17</java.version>
         <openapi.maven.version>6.6.0</openapi.maven.version>
-        <docker-maven-plugin>0.43.2</docker-maven-plugin>
+        <docker-maven-plugin>0.30.0</docker-maven-plugin>
         <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
+        <onap.acm.models.version>6.4.2</onap.acm.models.version>
+        <openapi.jackson.databind.nullable.version>0.2.6</openapi.jackson.databind.nullable.version>
+        <spring.statemachine.version>3.2.1</spring.statemachine.version>
+        <spring.context.version>6.0.8</spring.context.version>
+        <javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
+        <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
+        <javax.servlet.api.version>2.5</javax.servlet.api.version>
+        <io.swagger.version>2.2.9</io.swagger.version>
+        <slf4j.version>2.0.7</slf4j.version>
+        <apache.httpcore.version>4.3.2</apache.httpcore.version>
+        <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
     </properties>
     <build>
         <plugins>
diff --git a/rapp-manager-acm/pom.xml b/rapp-manager-acm/pom.xml
index 29e05af..0e5849d 100755
--- a/rapp-manager-acm/pom.xml
+++ b/rapp-manager-acm/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.onap.policy.clamp</groupId>
             <artifactId>policy-clamp-models</artifactId>
-            <version>6.4.2</version>
+            <version>${onap.acm.models.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.6</version>
+            <version>${openapi.jackson.databind.nullable.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/rapp-manager-application/pom.xml b/rapp-manager-application/pom.xml
index 7ebc145..88a9c87 100755
--- a/rapp-manager-application/pom.xml
+++ b/rapp-manager-application/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.onap.policy.clamp</groupId>
             <artifactId>policy-clamp-models</artifactId>
-            <version>6.4.2</version>
+            <version>${onap.acm.models.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -77,20 +77,15 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.retry</groupId>
-            <artifactId>spring-retry</artifactId>
-            <version>2.0.1</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.statemachine</groupId>
             <artifactId>spring-statemachine-core</artifactId>
-            <version>3.2.1</version>
+            <version>${spring.statemachine.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.statemachine</groupId>
             <artifactId>spring-statemachine-test</artifactId>
-            <version>3.2.1</version>
+            <version>${spring.statemachine.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,33 +101,33 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.6</version>
+            <version>${openapi.jackson.databind.nullable.version}</version>
         </dependency>
         <!-- Bean Validation API support -->
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <version>${javax.validation.api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <version>${javax.annotation.api.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>2.2.9</version>
+            <version>${io.swagger.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>2.2.9</version>
+            <version>${io.swagger.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <version>${javax.servlet.api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/rapp-manager-models/pom.xml b/rapp-manager-models/pom.xml
index 4d1414d..0b1b3c0 100755
--- a/rapp-manager-models/pom.xml
+++ b/rapp-manager-models/pom.xml
@@ -22,28 +22,28 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>6.0.8</version>
+            <version>${spring.context.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>6.0.8</version>
+            <version>${spring.context.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.statemachine</groupId>
             <artifactId>spring-statemachine-core</artifactId>
-            <version>3.2.1</version>
+            <version>${spring.statemachine.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.statemachine</groupId>
             <artifactId>spring-statemachine-test</artifactId>
-            <version>3.2.1</version>
+            <version>${spring.statemachine.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.7</version>
+            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.3.2</version>
+            <version>${apache.httpcore.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml
index 6f80741..1ee16ea 100755
--- a/rapp-manager-sme/pom.xml
+++ b/rapp-manager-sme/pom.xml
@@ -13,10 +13,10 @@
     <artifactId>rapp-manager-sme</artifactId>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+
     </properties>
 
     <profiles>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.6</version>
+            <version>${openapi.jackson.databind.nullable.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.3.2</version>
+            <version>${apache.httpcore.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>