You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2021/12/20 14:19:50 UTC
[incubator-hop] branch master updated: HOP-3566: remove log4j and change slf4j to slf4j-nop
This is an automated email from the ASF dual-hosted git repository.
mcasters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 5b3365c HOP-3566: remove log4j and change slf4j to slf4j-nop
new de5039b Merge pull request #1232 from hansva/master
5b3365c is described below
commit 5b3365c90017ab3c1cdeed8b40e34b451b314215
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Mon Dec 20 15:01:07 2021 +0100
HOP-3566: remove log4j and change slf4j to slf4j-nop
---
assemblies/core/lib/pom.xml | 14 +---
assemblies/lib/pom.xml | 14 +---
.../databases/clickhouse-assemblies/pom.xml | 7 +-
.../src/assembly/assembly.xml | 2 +-
assemblies/plugins/tech/aws/pom.xml | 1 -
core/pom.xml | 8 +-
core/src/main/resources/log4j.xml | 90 ----------------------
plugins/tech/aws/pom.xml | 2 +-
8 files changed, 18 insertions(+), 120 deletions(-)
diff --git a/assemblies/core/lib/pom.xml b/assemblies/core/lib/pom.xml
index bb7e271..e0d2e80 100644
--- a/assemblies/core/lib/pom.xml
+++ b/assemblies/core/lib/pom.xml
@@ -36,9 +36,8 @@
<!-- third party -->
<geronimo-servlet_3.0_spec.version>1.0</geronimo-servlet_3.0_spec.version>
- <slf4j-api.version>1.7.7</slf4j-api.version>
- <slf4j-log4j12.version>1.7.7</slf4j-log4j12.version>
- <apache-log4j-extras>1.2.17</apache-log4j-extras>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
+ <slf4j-nop.version>1.7.32</slf4j-nop.version>
<webservices-api.version>2.3.1</webservices-api.version>
<webservices-rt.version>2.3.1</webservices-rt.version>
<asm.version>3.2</asm.version>
@@ -111,19 +110,14 @@
<!-- Other third-party dependencies -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-extras</artifactId>
- <version>${apache-log4j-extras}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j-nop.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.metro</groupId>
diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
index 66d362c..1a3f19b 100644
--- a/assemblies/lib/pom.xml
+++ b/assemblies/lib/pom.xml
@@ -34,9 +34,8 @@
<properties>
<!-- third party -->
- <slf4j-api.version>1.7.7</slf4j-api.version>
- <slf4j-log4j12.version>1.7.7</slf4j-log4j12.version>
- <apache-log4j-extras>1.2.17</apache-log4j-extras>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
+ <slf4j-nop.version>1.7.32</slf4j-nop.version>
<webservices-api.version>2.3.1</webservices-api.version>
<webservices-rt.version>2.3.1</webservices-rt.version>
<asm.version>3.2</asm.version>
@@ -121,19 +120,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-extras</artifactId>
- <version>${apache-log4j-extras}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j-nop.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.metro</groupId>
diff --git a/assemblies/plugins/databases/clickhouse-assemblies/pom.xml b/assemblies/plugins/databases/clickhouse-assemblies/pom.xml
index 25a639a..062538f 100644
--- a/assemblies/plugins/databases/clickhouse-assemblies/pom.xml
+++ b/assemblies/plugins/databases/clickhouse-assemblies/pom.xml
@@ -35,7 +35,8 @@
<description></description>
<properties>
- <slf4j-api.version>1.7.30</slf4j-api.version>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
+ <slf4j-nop.version>1.7.32</slf4j-nop.version>
<clickhouse.jdbc.version>1.4.4</clickhouse.jdbc.version>
</properties>
@@ -57,8 +58,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-api.version}</version>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j-nop.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/databases/clickhouse-assemblies/src/assembly/assembly.xml b/assemblies/plugins/databases/clickhouse-assemblies/src/assembly/assembly.xml
index d909446..5ff08c9 100644
--- a/assemblies/plugins/databases/clickhouse-assemblies/src/assembly/assembly.xml
+++ b/assemblies/plugins/databases/clickhouse-assemblies/src/assembly/assembly.xml
@@ -53,7 +53,7 @@
<includes>
<include>cc.blynk.clickhouse:clickhouse4j</include>
<include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-log4j12</include>
+ <include>org.slf4j:slf4j-nop</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/assemblies/plugins/tech/aws/pom.xml b/assemblies/plugins/tech/aws/pom.xml
index fd25278..59d6446 100644
--- a/assemblies/plugins/tech/aws/pom.xml
+++ b/assemblies/plugins/tech/aws/pom.xml
@@ -36,7 +36,6 @@
<properties>
<!-- Third-party dependencies -->
- <slf4j-api.version>1.7.7</slf4j-api.version>
<guava.version>19.0</guava.version>
<aws-java-sdk-s3.version>1.11.974</aws-java-sdk-s3.version>
<aws-java-sdk-core.version>1.11.974</aws-java-sdk-core.version>
diff --git a/core/pom.xml b/core/pom.xml
index 84b1245..e949f58 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,8 +40,8 @@
<maven-surefire-plugin.argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US
</maven-surefire-plugin.argLine>
<!-- Third-party dependencies -->
- <slf4j-api.version>1.7.30</slf4j-api.version>
- <slf4j-log4j12.version>1.7.30</slf4j-log4j12.version>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
+ <slf4j-nop.version>1.7.32</slf4j-nop.version>
<xml-apis-ext.version>1.3.04</xml-apis-ext.version>
<spring.framework.version>4.3.2.RELEASE</spring.framework.version>
<commons-collections4.version>4.4</commons-collections4.version>
@@ -76,8 +76,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j-nop.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/core/src/main/resources/log4j.xml b/core/src/main/resources/log4j.xml
deleted file mode 100644
index dff71b5..0000000
--- a/core/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You 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.
- ~
- -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!--
- | For more configuration information and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="HOPFILE" class="org.apache.log4j.DailyRollingFileAppender">
-
- <param name="File" value="logs/pdi.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="HOPCONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <priority value="ERROR"/>
- <!-- <appender-ref ref="HOPCONSOLE"/> -->
- <!--<appender-ref ref="HOPFILE"/>-->
- </root>
-
-</log4j:configuration>
\ No newline at end of file
diff --git a/plugins/tech/aws/pom.xml b/plugins/tech/aws/pom.xml
index 73fb78b..e5bac5f 100644
--- a/plugins/tech/aws/pom.xml
+++ b/plugins/tech/aws/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!-- Third-party dependencies -->
- <slf4j-api.version>1.7.7</slf4j-api.version>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
<guava.version>19.0</guava.version>
<!-- Test dependencies -->