From eb1df9233e80c2f4819eb89259f3e7093041da28 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Tue, 19 Jan 2021 16:23:57 -0500
Subject: Upgrade dependency versions in parent

Also removed javax.persistence, as the classes can be found in
eclipselink instead; both cannot be used together as the jar signatures
are incompatible.

Issue-ID: POLICY-3005
Change-Id: I72d32cf7942383b12a78e014c685d9cac6e7b78b
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 integration/pom.xml | 78 ++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 43 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index 90e75136..6815729b 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2018-2020 AT&T. All rights reserved.
+   Modifications Copyright (C) 2018-2021 AT&T. All rights reserved.
    Modifications Copyright (C) 2019-2020 Nordix Foundation.
    Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
@@ -37,12 +37,12 @@
     <properties>
         <java.version>11</java.version>
         <version.logback>1.2.3</version.logback>
-        <version.dmaap>1.1.11</version.dmaap>
-        <version.powermock>2.0.4</version.powermock>
-        <version.eclipselink>2.7.5</version.eclipselink>
+        <version.dmaap>1.1.12</version.dmaap>
+        <version.powermock>2.0.9</version.powermock>
+        <version.eclipselink>2.7.8</version.eclipselink>
         <version.drools>7.33.0.Final</version.drools>
-        <version.jersey>2.30.1</version.jersey>
-        <version.jackson>2.11.1</version.jackson>
+        <version.jersey>2.33</version.jersey>
+        <version.jackson>2.11.4</version.jackson>
         <version.ccsdk>0.4.4</version.ccsdk>
         <version.swagger>1.6.2</version.swagger>
         <version.javax.bind>2.3.1</version.javax.bind>
@@ -162,14 +162,14 @@
             <dependency>
                 <groupId>com.google.re2j</groupId>
                 <artifactId>re2j</artifactId>
-                <version>1.4</version>
+                <version>1.5</version>
             </dependency>
 
             <!-- MariaDB -->
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>2.2.6</version>
+                <version>2.7.1</version>
             </dependency>
 
             <!-- Swagger Jersey2 JAXRS -->
@@ -189,21 +189,13 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.14</version>
+                <version>1.15</version>
             </dependency>
 
             <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
-                <version>1.4.12</version>
-            </dependency>
-
-            <!-- Eclipse Persistence API -->
-            <!-- NOTE: use this instead of persistence-api -->
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>javax.persistence</artifactId>
-                <version>2.1.0</version>
+                <version>1.4.15</version>
             </dependency>
 
             <!-- Eclipse JPA API -->
@@ -231,14 +223,14 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.12</version>
+                <version>4.5.13</version>
             </dependency>
 
             <!-- HttpComponents Core (blocking I/O) -->
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.13</version>
+                <version>4.4.14</version>
             </dependency>
 
             <!-- JSON marshalling and unmarshalling -->
@@ -250,14 +242,14 @@
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20200518</version>
+                <version>20201115</version>
             </dependency>
 
             <!-- Lombok -->
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.12</version>
+                <version>1.18.16</version>
             </dependency>
 
             <!-- Logging -->
@@ -339,7 +331,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.26</version>
+                <version>1.27</version>
             </dependency>
 
             <!-- Drools -->
@@ -433,7 +425,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.13</version>
+                <version>4.13.1</version>
                 <scope>test</scope>
             </dependency>
 
@@ -441,13 +433,13 @@
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-java</artifactId>
-                <version>6.1.2</version>
+                <version>6.9.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-junit</artifactId>
-                <version>6.1.2</version>
+                <version>6.9.1</version>
                 <scope>test</scope>
             </dependency>
 
@@ -455,7 +447,7 @@
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.16.1</version>
+                <version>3.18.1</version>
                 <scope>test</scope>
             </dependency>
 
@@ -493,7 +485,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>3.3.3</version>
+                <version>3.7.7</version>
                 <scope>test</scope>
             </dependency>
 
@@ -526,14 +518,14 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.10</version>
+                <version>3.11</version>
             </dependency>
 
             <!-- Commons IO -->
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.7</version>
+                <version>2.8.0</version>
             </dependency>
         </dependencies>
 
@@ -553,12 +545,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>2.8</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <!-- THIS PLUGIN IS RETIRED -->
@@ -581,22 +573,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
+                    <version>3.0.0-M1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -606,22 +598,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.2.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.archetype</groupId>
                     <artifactId>archetype-packaging</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.coderplus.maven.plugins</groupId>
@@ -640,17 +632,17 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.31.0</version>
+                    <version>0.34.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.kie</groupId>
-- 
cgit 1.2.3-korg