[AAI] Upgrading Log4J to 2.17.1

Issue-ID: AAI-3431
Change-Id: I429665b7d5b217ad0bd0739ab24d92b3965bc86d
Signed-off-by: wr148d <wr148d@att.com>

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index c19830e..a190805 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -398,10 +398,12 @@ limitations under the License.
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+            <type>pom</type>
+        </dependency>
        </dependencies>
 
        <!-- Plugins and repositories -->

diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 7b46257..ff7c7c6 100644 (file)
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -100,7 +100,7 @@ limitations under the License.
     <io.swagger.version>1.5.24</io.swagger.version>
     <logback.version>1.2.3</logback.version>
     <slf4j.version>1.7.25</slf4j.version>
-    <log4j.version>1.2.17</log4j.version>
+    <log4j.version>2.17.1</log4j.version>
     <mockito.all.version>1.10.19</mockito.all.version>
     <mockito.core.version>1.10.19</mockito.core.version>
     <netty.handler.version>4.1.43.Final</netty.handler.version>
@@ -613,15 +613,10 @@ limitations under the License.
       </dependency>
 
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>apache-log4j-extras</artifactId>
-        <version>${log4j.version}</version>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j</artifactId>
+          <version>${log4j.version}</version>
+          <type>pom</type>
       </dependency>
 
       <dependency>

diff --git a/pom.xml b/pom.xml
index 80947ff..1195d15 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -233,6 +233,11 @@
 
     <!-- Start of ONAP Specific Repositories -->
     <repositories>
+        <repository>
+            <id>Log4j</id>
+            <name>Log4J repository</name>
+            <url>https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j</url>
+        </repository>
         <repository>
             <id>AJSC</id>
             <name>AJSC repository</name>