From 685744a93666253ca779bd866c6d2af4addc16bb Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 17 Feb 2023 19:10:16 +0000
Subject: [PATCH] Clean up dependencies for London Release

Issue-ID: POLICY-4482
Change-Id: Ic9770039900c8aa9a950c7b0e20ee6b48ef8ff6f
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 integration/pom.xml | 285 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 161 insertions(+), 124 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index f89289ec..d43af376 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -20,7 +20,11 @@
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
-<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">
+<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.policy.parent</groupId>
@@ -43,68 +47,65 @@
         <version.aaf>2.1.21</version.aaf>
         <version.assertj>3.24.2</version.assertj>
         <version.awaitility>4.2.0</version.awaitility>
-        <version.bind-jaxb-api>2.3.1</version.bind-jaxb-api>
         <version.ccsdk>1.4.0</version.ccsdk>
         <version.commons-cli>1.5.0</version.commons-cli>
         <version.commons-codec>1.15</version.commons-codec>
-        <version.commons-fileupload>1.4</version.commons-fileupload>
+        <version.commons-collections4>4.4</version.commons-collections4>
+        <version.commons-fileupload>1.5</version.commons-fileupload>
         <version.commons-io>2.11.0</version.commons-io>
         <version.commons-lang3>3.12.0</version.commons-lang3>
+        <version.commons-math3>3.6.1</version.commons-math3>
         <version.commons-text>1.10.0</version.commons-text>
         <version.cucumber>7.11.0</version.cucumber>
         <version.dmaap>1.1.12</version.dmaap>
         <version.docker-java>3.2.14</version.docker-java>
-        <version.drools>8.32.0.Final</version.drools>
+        <version.drools>8.33.0.Final</version.drools>
+        <version.glassfish.jaxb-runtime>2.3.8</version.glassfish.jaxb-runtime>
         <version.google-re2j>1.7</version.google-re2j>
         <version.gson>2.10.1</version.gson>
         <version.h2>2.1.214</version.h2>
         <version.hibernate>5.6.15.Final</version.hibernate>
         <version.hibernate.persistence>1.0.2.Final</version.hibernate.persistence>
         <version.httpcore>4.4.16</version.httpcore>
-        <version.io.micrometer>1.10.3</version.io.micrometer>
+        <version.io.micrometer>1.10.4</version.io.micrometer>
         <version.io.prometheus>0.16.0</version.io.prometheus>
         <version.jackson>2.14.2</version.jackson>
-        <version.jakarta-api>2.0.2</version.jakarta-api>
-        <!--version.jakarta-api>3.0.2</version.jakarta-api-->
+        <version.jakarta.validation-api>2.0.2</version.jakarta.validation-api>
+        <version.javax.bind-jaxb-api>2.3.1</version.javax.bind-jaxb-api>
+        <version.javax.servlet-api>4.0.1</version.javax.servlet-api>
+        <version.javax.ws.rs-api>2.1.1</version.javax.ws.rs-api>
         <version.jboss-jaxrs-api>2.0.2-Final</version.jboss-jaxrs-api>
         <version.jersey>2.38</version.jersey>
-        <!--version.jersey>3.1.0</version.jersey-->
-        <version.jetty>9.4.50.v20221201</version.jetty>
-        <!--version.jetty>11.0.12</version.jetty-->
+        <version.jetty>10.0.13</version.jetty> <!-- Downgrade from oparent -->
         <version.json>20220924</version.json> <!-- Keep this until Cambria Client is removed-->
-        <version.junit-vintage>5.9.2</version.junit-vintage>
         <version.junit>4.13.2</version.junit>
+        <version.junit.jupiter>5.9.2</version.junit.jupiter>
+        <version.junit-vintage>5.9.2</version.junit-vintage>
         <version.kafka>3.4.0</version.kafka>
-        <version.log4j>2.17.1</version.log4j>
-        <!--version.log4j>2.19.0</version.log4j-->
-        <version.logback>1.2.11</version.logback>
-        <!--version.logback>1.4.5</version.logback-->
+        <version.log4j>2.19.0</version.log4j>
+        <version.logback>1.2.11</version.logback> <!-- Downgrade from oparent -->
         <version.lombok>1.18.26</version.lombok>
         <version.mariadb>3.1.2</version.mariadb>
         <version.medeia>1.1.1</version.medeia>
         <version.mockito-all>1.10.19</version.mockito-all>
         <version.mockito-core>5.1.1</version.mockito-core>
         <version.mockserver>5.15.0</version.mockserver>
-        <version.netty>4.1.87.Final</version.netty>
+        <version.netty>4.1.89.Final</version.netty>
         <version.nsa-cambria>1.2.1-oss</version.nsa-cambria>
         <version.nsa-sa-client>1.3.0-oss</version.nsa-sa-client>
         <version.openpojo>0.9.1</version.openpojo>
         <version.plexus>3.5.0</version.plexus>
         <version.postgresql>42.5.3</version.postgresql>
         <version.sdc>2.0.0</version.sdc>
-        <version.servlet>4.0.1</version.servlet>
-        <version.slf4j>1.7.30</version.slf4j>
-        <!--version.slf4j>2.0.5</version.slf4j-->
+        <version.slf4j>1.7.36</version.slf4j>
         <version.snakeyaml>1.33</version.snakeyaml>
-        <version.spring>5.3.25</version.spring>
+        <version.spring>5.3.25</version.spring> <!-- Downgrade from oparent -->
         <version.spring-security>5.8.1</version.spring-security>
         <version.springboot>2.7.8</version.springboot>
         <version.springdoc>1.6.14</version.springdoc>
-        <version.swagger.codegen.v3>3.0.36</version.swagger.codegen.v3>
         <version.swagger.core.v3>2.2.8</version.swagger.core.v3>
-        <version.swagger>1.6.9</version.swagger>
-        <version.tomcat>9.0.71</version.tomcat>
-        <!--version.tomcat>10.1.2</version.tomcat-->
+        <version.swagger-jersey2-jaxrs>1.6.9</version.swagger-jersey2-jaxrs>
+        <version.tomcat>9.0.71</version.tomcat> <!-- Downgrade from oparent -->
         <version.websocket>1.5.3</version.websocket>
     </properties>
     <distributionManagement>
@@ -123,7 +124,7 @@
             <dependency>
                 <groupId>jakarta.validation</groupId>
                 <artifactId>jakarta.validation-api</artifactId>
-                <version>${version.jakarta-api}</version>
+                <version>${version.jakarta.validation-api}</version>
             </dependency>
             <!-- Jackson - needed by glassfish jersey -->
             <dependency>
@@ -327,35 +328,35 @@
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-jersey2-jaxrs</artifactId>
-                <version>${version.swagger}</version>
-            </dependency>
-            <!--  Swagger Models -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${version.swagger}</version>
+                <version>${version.swagger-jersey2-jaxrs}</version>
             </dependency>
+            <!-- Swagger -->
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-models</artifactId>
+                <artifactId>swagger-annotations</artifactId>
                 <version>${version.swagger.core.v3}</version>
             </dependency>
-            <!-- Encoder and decoders for various formats -->
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${version.commons-codec}</version>
-            </dependency>
-            <!-- Java Servlet API -->
+            <!-- Javax -->
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
-                <version>${version.servlet}</version>
+                <version>${version.javax.servlet-api}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs-api</artifactId>
+                <version>${version.javax.ws.rs-api}</version>
             </dependency>
+            <!-- JAXB -->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>${version.bind-jaxb-api}</version>
+                <version>${version.javax.bind-jaxb-api}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${version.glassfish.jaxb-runtime}</version>
             </dependency>
             <!-- HttpComponents Core (blocking I/O) -->
             <dependency>
@@ -479,12 +480,6 @@
                 <artifactId>saClientLibrary</artifactId>
                 <version>${version.nsa-sa-client}</version>
             </dependency>
-            <!-- Commons CLI for command line parsing -->
-            <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>${version.commons-cli}</version>
-            </dependency>
             <!-- Web Sockets -->
             <dependency>
                 <groupId>org.java-websocket</groupId>
@@ -590,12 +585,7 @@
                 <artifactId>springdoc-openapi-ui</artifactId>
                 <version>${version.springdoc}</version>
             </dependency>
-            <!-- File upload -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${version.commons-fileupload}</version>
-            </dependency>
+            <!-- SDC -->
             <dependency>
                 <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                 <artifactId>sdc-distribution-client</artifactId>
@@ -701,16 +691,41 @@
                 <version>${version.netty}</version>
             </dependency>
             <!-- Apache Commons -->
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>${version.commons-cli}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${version.commons-codec}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${version.commons-fileupload}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${version.commons-lang3}</version>
+                <artifactId>commons-collections4</artifactId>
+                <version>${version.commons-collections4}</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>${version.commons-io}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${version.commons-lang3}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-math3</artifactId>
+                <version>${version.commons-math3}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
@@ -1032,101 +1047,146 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.8.1</version>
+                    <groupId>com.coderplus.maven.plugins</groupId>
+                    <artifactId>copy-rename-maven-plugin</artifactId>
+                    <version>1.0.1</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <groupId>com.github.eirslett</groupId>
+                    <artifactId>frontend-maven-plugin</artifactId>
+                    <version>1.12.1</version>
                 </plugin>
                 <plugin>
-                    <!-- THIS PLUGIN IS RETIRED -->
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-reactor-plugin</artifactId>
-                    <version>1.1</version>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>0.41.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>io.github.git-commit-id</groupId>
+                    <artifactId>git-commit-id-maven-plugin</artifactId>
+                    <version>5.0.0</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>revision</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <skipPoms>false</skipPoms>
+                        <generateGitPropertiesFile>false</generateGitPropertiesFile>
+                        <includeOnlyProperties>
+                            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                        </includeOnlyProperties>
+                        <commitIdGenerationMode>full</commitIdGenerationMode>
+                        <dateFormat>yyyy-MM-dd'T'HH:mm:ss.SSS'Z'</dateFormat>
+                        <dateFormatTimeZone>UTC</dateFormatTimeZone>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>io.swagger.codegen.v3</groupId>
+                    <artifactId>swagger-codegen-maven-plugin</artifactId>
+                    <version>3.0.36</version>
                 </plugin>
                 <plugin>
-                    <!-- THIS PLUGIN IS RETIRED -->
-                    <!-- Advise to use m2e -->
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.10</version>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.4.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
+                    <artifactId>maven-clean-plugin</artifactId>
                     <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.10.1</version>
+                    <configuration>
+                        <encoding>${project.build.sourceEncoding}</encoding>
+                        <release>${java.version}</release>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.0-M1</version>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <artifactId>maven-eclipse-plugin</artifactId>
+                    <version>2.10</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.4</version>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <version>3.20.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>3.0.0-M7</version>
                 </plugin>
                 <plugin>
-                    <groupId>com.coderplus.maven.plugins</groupId>
-                    <artifactId>copy-rename-maven-plugin</artifactId>
-                    <version>1.0.1</version>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
-                    <configuration>
-                        <encoding>${project.build.sourceEncoding}</encoding>
-                        <release>${java.version}</release>
-                    </configuration>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.40.1</version>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>groovy-maven-plugin</artifactId>
+                    <version>2.1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>2.14.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.kie</groupId>
@@ -1139,29 +1199,6 @@
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <version>${version.springboot}</version>
                 </plugin>
-                <plugin>
-                    <groupId>io.github.git-commit-id</groupId>
-                    <artifactId>git-commit-id-maven-plugin</artifactId>
-                    <version>5.0.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>revision</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <skipPoms>false</skipPoms>
-                        <generateGitPropertiesFile>false</generateGitPropertiesFile>
-                        <includeOnlyProperties>
-                            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
-                            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
-                        </includeOnlyProperties>
-                        <commitIdGenerationMode>full</commitIdGenerationMode>
-                        <dateFormat>yyyy-MM-dd'T'HH:mm:ss.SSS'Z'</dateFormat>
-                        <dateFormatTimeZone>UTC</dateFormatTimeZone>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
-- 
2.16.6