aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdctool/pom.xml4
-rw-r--r--catalog-be/pom.xml39
-rw-r--r--catalog-be/src/main/resources/ESAPI.properties2
-rw-r--r--catalog-fe/pom.xml15
-rw-r--r--catalog-fe/src/main/resources/ESAPI.properties2
-rw-r--r--catalog-fe/src/test/resources/config/ESAPI.properties2
-rw-r--r--common-app-api/pom.xml12
-rw-r--r--common-app-logging/pom.xml10
-rw-r--r--integration-tests/pom.xml6
-rw-r--r--pom.xml1
10 files changed, 88 insertions, 5 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 09e203d881..46fc455112 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -123,6 +123,10 @@
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 5e674fa266..dca521f65b 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -489,6 +489,17 @@
<!-- Inserted for ECOMP Portal Integration -->
<dependency>
+ <groupId>org.owasp.esapi</groupId>
+ <artifactId>esapi</artifactId>
+ <version>2.2.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
<version>${ecomp.version}</version>
@@ -514,6 +525,10 @@
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -537,6 +552,12 @@
<artifactId>sigar</artifactId>
<version>${sigar.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
@@ -552,6 +573,14 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>apache-log4j-extras</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -581,6 +610,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -730,6 +763,12 @@
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>security-util-lib</artifactId>
<version>${security.util.lib.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
diff --git a/catalog-be/src/main/resources/ESAPI.properties b/catalog-be/src/main/resources/ESAPI.properties
index 1dedfe6739..a1fcdcdece 100644
--- a/catalog-be/src/main/resources/ESAPI.properties
+++ b/catalog-be/src/main/resources/ESAPI.properties
@@ -75,7 +75,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
-ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer
ESAPI.Validator=org.owasp.esapi.reference.DefaultValidator
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 5ac590ed61..b9a75353cc 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -241,6 +241,11 @@
<!-- Inserted for ECOMP Portal Integration -->
<dependency>
+ <groupId>org.owasp.esapi</groupId>
+ <artifactId>esapi</artifactId>
+ <version>2.2.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
<version>${ecomp.version}</version>
@@ -254,6 +259,10 @@
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
<!-- System metrics -->
@@ -262,6 +271,12 @@
<artifactId>sigar</artifactId>
<version>${sigar.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- TEST -->
diff --git a/catalog-fe/src/main/resources/ESAPI.properties b/catalog-fe/src/main/resources/ESAPI.properties
index 1dedfe6739..a1fcdcdece 100644
--- a/catalog-fe/src/main/resources/ESAPI.properties
+++ b/catalog-fe/src/main/resources/ESAPI.properties
@@ -75,7 +75,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
-ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer
ESAPI.Validator=org.owasp.esapi.reference.DefaultValidator
diff --git a/catalog-fe/src/test/resources/config/ESAPI.properties b/catalog-fe/src/test/resources/config/ESAPI.properties
index 1dedfe6739..a1fcdcdece 100644
--- a/catalog-fe/src/test/resources/config/ESAPI.properties
+++ b/catalog-fe/src/test/resources/config/ESAPI.properties
@@ -75,7 +75,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
-ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer
ESAPI.Validator=org.owasp.esapi.reference.DefaultValidator
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 5b03dfb940..4dbb6ddd4f 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -17,6 +17,12 @@
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>security-util-lib</artifactId>
<version>${security.util.lib.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- functional java -->
<dependency>
@@ -174,6 +180,12 @@
<artifactId>sigar</artifactId>
<version>${sigar.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml
index 51f959acbd..31d1af3de9 100644
--- a/common-app-logging/pom.xml
+++ b/common-app-logging/pom.xml
@@ -13,7 +13,6 @@
</parent>
<dependencies>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -43,9 +42,16 @@
<dependency>
<groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 3051c68b11..726bc5b6f0 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -247,6 +247,12 @@ limitations under the License.
<version>3.3</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.13.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 001a98ca83..78d79a80a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -497,6 +497,7 @@ Modifications copyright (c) 2018-2019 Nokia
<configuration>
<source>11</source>
<target>11</target>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
</plugin>
<plugin>