You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/02/02 10:41:36 UTC

[nifi] branch main updated: NIFI-9649 Upgraded SLF4J from 1.7.32 to 1.7.35

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new cbb5909  NIFI-9649 Upgraded SLF4J from 1.7.32 to 1.7.35
cbb5909 is described below

commit cbb5909466fcecb4f7b0ab8c10cc4655d82f5ecd
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Tue Feb 1 19:20:53 2022 -0600

    NIFI-9649 Upgraded SLF4J from 1.7.32 to 1.7.35
    
    - Added slf4j-log4j12 to banned dependencies
    
    Signed-off-by: Pierre Villard <pi...@gmail.com>
    
    This closes #5736.
---
 pom.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93f5db3..6ea33dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
         <org.apache.httpcomponents.httpclient.version>4.5.13</org.apache.httpcomponents.httpclient.version>
         <org.apache.httpcomponents.httpcore.version>4.4.15</org.apache.httpcomponents.httpcore.version>
         <org.bouncycastle.version>1.70</org.bouncycastle.version>
-        <org.slf4j.version>1.7.32</org.slf4j.version>
+        <org.slf4j.version>1.7.35</org.slf4j.version>
         <ranger.version>2.1.0</ranger.version>
         <jetty.version>9.4.44.v20210927</jetty.version>
         <jackson.version>2.13.1</jackson.version>
@@ -249,11 +249,6 @@
                 <version>${org.slf4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${org.slf4j.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
                 <version>${org.bouncycastle.version}</version>
@@ -804,6 +799,8 @@
                                         <exclude>c3p0:c3p0:*:*:compile</exclude>
                                         <!-- Versions of JSR305 before 3.0.1 are not allowed https://github.com/findbugsproject/findbugs/issues/128 -->
                                         <exclude>com.google.code.findbugs:jsr305:*:*:compile</exclude>
+                                        <!-- SLF4J routing to Log4j 1.2 is a runtime implementation that conflicts with Logback -->
+                                        <exclude>org.slf4j:slf4j-log4j12</exclude>
                                         <!-- Log4J excluded in favor of log4j-over-slf4j and logback -->
                                         <exclude>log4j:log4j:*</exclude>
                                         <!-- Log4j 2 log4j-core excluded in favor of log4j-to-slf4j routing to logback -->