PRODSEC-6083 migrate to reload4j (#949)

This commit is contained in:
Stefan Kopf
2022-02-09 11:15:26 +01:00
committed by GitHub
parent 85b5b2660e
commit fea50a2206
4 changed files with 17 additions and 7 deletions

View File

@@ -44,7 +44,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<version>1.7.35</version> <version>1.7.35</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

View File

@@ -54,9 +54,9 @@
<classifier>asl</classifier> <classifier>asl</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>1.2.17</version> <version>1.2.19</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
@@ -114,7 +114,7 @@
<!-- Test only dependencies, as popped up while running mvn test --> <!-- Test only dependencies, as popped up while running mvn test -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -563,6 +563,12 @@
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-log-sanitizer</artifactId> <artifactId>alfresco-log-sanitizer</artifactId>
<version>${dependency.alfresco-log-sanitizer.version}</version> <version>${dependency.alfresco-log-sanitizer.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.aos-module</groupId> <groupId>org.alfresco.aos-module</groupId>
@@ -606,7 +612,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<version>${dependency.slf4j.version}</version> <version>${dependency.slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -46,6 +46,10 @@
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@@ -219,7 +223,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>