From: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Date: Tue, 14 Dec 2021 21:52:45 +0000 (+0000)
Subject: Merge "Script to update a POM parent reference"
X-Git-Tag: 3.5.1~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e875bce16587acfab8db4980f4c71038f6fd04a0;hp=5946bbfbefc9305961e72681f3bf161e16dfcd5d;p=policy%2Fparent.git

Merge "Script to update a POM parent reference"
---

diff --git a/integration/pom.xml b/integration/pom.xml
index 6b4a5d6f..14e234d4 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -37,7 +37,7 @@
     <properties>
         <java.version>11</java.version>
         <!-- NOTE: For RELEASE/SNAPSHOT always set to the project version -->
-        <version.parent.resources>3.5.0</version.parent.resources>
+        <version.parent.resources>3.5.1-SNAPSHOT</version.parent.resources>
         <version.logback>1.2.3</version.logback>
         <version.dmaap>1.1.12</version.dmaap>
         <version.powermock>2.0.9</version.powermock>
@@ -52,7 +52,7 @@
         <version.netty>4.1.67.Final</version.netty>
         <version.springboot>2.5.0</version.springboot>
         <version.eelf.core>1.0.0</version.eelf.core>
-        <version.camel>3.7.3</version.camel>
+        <version.camel>3.13.0</version.camel>
         <version.tomcat>9.0.45</version.tomcat>
         <version.mockserver>5.11.2</version.mockserver>
         <version.immutable>2.8.8</version.immutable>
@@ -342,6 +342,14 @@
                         <groupId>io.springfox</groupId>
                         <artifactId>springfox-boot-starter</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-to-slf4j</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -349,6 +357,16 @@
                 <artifactId>json-smart</artifactId>
                 <version>2.4.7</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>2.16.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-to-slf4j</artifactId>
+                <version>2.16.0</version>
+            </dependency>
 
             <!-- AAF Client -->
             <dependency>
@@ -1284,4 +1302,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>