Skip to content

Commit e98ef49

Browse files
ShahimSharafudeenyingsu00
authored andcommitted
Remove reload4j dependency in response to WS-2022-0467
Remove the reload4j dependency and add the org.apache.logging.log4j dependency for log4j support in response to WS-2022-0467
1 parent 8ef0071 commit e98ef49

File tree

1 file changed

+21
-32
lines changed

1 file changed

+21
-32
lines changed

presto-accumulo/pom.xml

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
1717
<dep.accumulo.version>1.10.1</dep.accumulo.version>
1818
<dep.curator.version>2.12.0</dep.curator.version>
19-
<dep.reload4j.version>1.2.22</dep.reload4j.version>
19+
<dep.log4j.version>2.24.3</dep.log4j.version>
2020
</properties>
2121

2222
<dependencyManagement>
@@ -265,20 +265,6 @@
265265
<artifactId>jackson-databind</artifactId>
266266
</dependency>
267267

268-
<dependency>
269-
<groupId>ch.qos.reload4j</groupId>
270-
<artifactId>reload4j</artifactId>
271-
<version>${dep.reload4j.version}</version>
272-
</dependency>
273-
274-
<!-- log4j removed from reload4j version 1.2.18.4-->
275-
<dependency>
276-
<groupId>org.apache.logging.log4j</groupId>
277-
<artifactId>log4j-1.2-api</artifactId>
278-
<version>2.24.3</version>
279-
<scope>test</scope>
280-
</dependency>
281-
282268
<!-- Presto SPI -->
283269
<dependency>
284270
<groupId>com.facebook.presto</groupId>
@@ -316,6 +302,26 @@
316302
<scope>provided</scope>
317303
</dependency>
318304

305+
<dependency>
306+
<groupId>org.apache.logging.log4j</groupId>
307+
<artifactId>log4j-core</artifactId>
308+
<version>${dep.log4j.version}</version>
309+
<scope>runtime</scope>
310+
</dependency>
311+
312+
<dependency>
313+
<groupId>org.apache.logging.log4j</groupId>
314+
<artifactId>log4j-api</artifactId>
315+
<version>${dep.log4j.version}</version>
316+
<scope>runtime</scope>
317+
</dependency>
318+
319+
<dependency>
320+
<groupId>org.apache.logging.log4j</groupId>
321+
<artifactId>log4j-1.2-api</artifactId>
322+
<version>${dep.log4j.version}</version>
323+
</dependency>
324+
319325
<!-- for testing -->
320326
<dependency>
321327
<groupId>com.facebook.presto</groupId>
@@ -398,21 +404,4 @@
398404
</build>
399405
</profile>
400406
</profiles>
401-
402-
<build>
403-
<plugins>
404-
<plugin>
405-
<groupId>org.basepom.maven</groupId>
406-
<artifactId>duplicate-finder-maven-plugin</artifactId>
407-
<configuration>
408-
<ignoredResourcePatterns>
409-
<ignoredResourcePattern>org/apache/log4j/xml/log4j.dtd</ignoredResourcePattern>
410-
</ignoredResourcePatterns>
411-
<ignoredClassPatterns>
412-
<ignoredClassPattern>org.apache.log4j.*</ignoredClassPattern>
413-
</ignoredClassPatterns>
414-
</configuration>
415-
</plugin>
416-
</plugins>
417-
</build>
418407
</project>

0 commit comments

Comments
 (0)