From 7aedd8a2820985d2054999cd5c6a4ea9bf497bfc Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Tue, 13 Dec 2022 12:51:42 +0000
Subject: [PATCH] Upgrade dependency versions in oparent

Tidied up the version handling and took the latest versions for oparent
dependencies.

Issue-ID: POLICY-4482
Signed-off-by: liamfallon <liam.fallon@est.tech>
Change-Id: Ie7c9a863d3050a0a57b5ba03a8625f85322dad3a
---
 dependencies/pom.xml | 57 ++++++++++++++++++++++++++++++----------------------
 oparent/pom.xml      |  6 ++++--
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 67fe7e0..b2f93b8 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -27,120 +27,129 @@
   <name>oparent/dependencies</name>
   <packaging>pom</packaging>
   <properties>
-    <spring.version>6.0.2</spring.version>
-    <jetty.version>9.4.48.v20220622</jetty.version>
+    <version.beanutils>1.9.4</version.beanutils>
+    <version.bootstrap>5.2.3</version.bootstrap>
+    <version.guava>31.1-jre</version.guava>
+    <version.httpclient>4.5.14</version.httpclient>
+    <version.jackson>2.14.1</version.jackson>
+    <version.jetty>11.0.12</version.jetty>
+    <version.jquery>3.6.1</version.jquery>
+    <version.logback>1.4.5</version.logback>
+    <version.spring>6.0.2</version.spring>
+    <version.tomcat>10.1.2</version.tomcat>
+    <version.xerces>2.9.1</version.xerces>
   </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>30.1.1-jre</version>
+        <version>${version.guava}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-http</artifactId>
-        <version>${jetty.version}</version>
+        <version>${version.jetty}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-servlet</artifactId>
-        <version>${jetty.version}</version>
+        <version>${version.jetty}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-servlets</artifactId>
-        <version>${jetty.version}</version>
+        <version>${version.jetty}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>${jetty.version}</version>
+        <version>${version.jetty}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-security</artifactId>
-        <version>${jetty.version}</version>
+        <version>${version.jetty}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-jdbc</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webflux</artifactId>
-        <version>${spring.version}</version>
+        <version>${version.spring}</version>
       </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.9.4</version>
+        <version>${version.beanutils}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat.embed</groupId>
         <artifactId>tomcat-embed-core</artifactId>
-        <version>9.0.65</version>
+        <version>${version.tomcat}</version>
       </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>bootstrap</artifactId>
-        <version>5.0.1</version>
+        <version>${version.bootstrap}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.12.3</version>
+        <version>${version.jackson}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.12.3</version>
+        <version>${version.jackson}</version>
       </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>jquery</artifactId>
-        <version>3.6.0</version>
+        <version>${version.jquery}</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.2.10</version>
+        <version>${version.logback}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.5.13</version>
+        <version>${version.httpclient}</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
-        <version>2.12.2</version>
+        <version>${version.xerces}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index e1fa81e..8a5345c 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -22,6 +22,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
+    <!-- When changing, also change the oparent.version property -->
     <version>3.3.3-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
@@ -35,6 +36,7 @@
     <url>https://wiki.onap.org/display/DW/Integration+Project</url>
   </scm>
   <properties>
+    <oparent.version>3.3.3-SNAPSHOT</oparent.version>
     <jacoco.version>0.8.5</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -300,7 +302,7 @@
       <dependency>
         <groupId>org.onap.oparent</groupId>
         <artifactId>dependencies</artifactId>
-        <version>${project.version}</version>
+        <version>${oparent.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -457,7 +459,7 @@
           <dependency>
             <groupId>org.onap.oparent</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>${project.version}</version>
+            <version>${oparent.version}</version>
           </dependency>
         </dependencies>
         <executions>
-- 
2.16.6