removed slf4j-log4j12, added log4j-slf4j-impl

Issue-ID: VNFSDK-554

Signed-off-by: priyanka.akhade <priyanka.akhade@huawei.com>
Change-Id: I8a1abc846101d48b0e4db1fd23297b3aaf6dcbb8

diff --git a/vnfmarket-be/vnf-sdk-marketplace/pom.xml b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
index cddf21c..f8b8a6d 100644 (file)
--- a/vnfmarket-be/vnf-sdk-marketplace/pom.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
@@ -35,7 +35,7 @@
           <dependency>
             <groupId>org.onap.cli</groupId>
             <artifactId>oclip-grpc-client</artifactId>
-            <version>4.0.0</version>
+            <version>5.0.2</version>
           </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -53,9 +53,15 @@
             <version>${cxf.version}</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.13.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-ext</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/log4j.properties b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/log4j.properties
deleted file mode 100644 (file)
index f1a00ee..0000000
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootLogger=INFO,root
-log4j.appender.root.Append=true
-log4j.appender.root.File=${catalina.base}/logs/vnfsdkmarketplace.log
-log4j.appender.root.layout.ConversionPattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n
-log4j.appender.root.layout=org.apache.log4j.PatternLayout
-log4j.appender.root.MaxBackupIndex=50
-log4j.appender.root.MaxFileSize=20MB
-log4j.appender.root=org.apache.log4j.RollingFileAppender
\ No newline at end of file

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/log4j2.properties b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/log4j2.properties
new file mode 100644 (file)
index 0000000..7758336
--- /dev/null
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/log4j2.properties
@@ -0,0 +1,33 @@
+# Copyright 2020 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+rootLogger.level=INFO
+rootLogger.appenderRefs=root
+rootLogger.appenderRef.root.ref=RollingFile
+
+appender.root.type = RollingFile
+appender.root.name = RollingFile
+appender.root.fileName=${env:CATALINA_HOME}/logs/vnfsdkmarketplace.log
+appender.root.filePattern=${env:CATALINA_HOME}/logs/vnfsdkmarketplace.%d{yyyy-MM-dd-HH:mm:ss}.log
+appender.root.append=true
+appender.root.policies.type=Policies
+appender.root.policies.size.type=SizeBasedTriggeringPolicy
+appender.root.policies.size.size=20MB
+appender.root.strategy.type=DefaultRolloverStrategy
+appender.root.strategy.max=50
+appender.root.layout.type=PatternLayout
+appender.root.layout.pattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n
\ No newline at end of file