This is an automated email from the ASF dual-hosted git repository.
nkruber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-training.git
The following commit(s) were added to refs/heads/master by this push:
new 7c323f4 [FLINK-23336][log4j] update Log4J to 2.12.1 as used by Flink
1.13
7c323f4 is described below
commit 7c323f4bb0a4659a57498c099dbe900ba023d43d
Author: Nico Kruber <[email protected]>
AuthorDate: Fri Jul 2 11:42:41 2021 +0200
[FLINK-23336][log4j] update Log4J to 2.12.1 as used by Flink 1.13
---
build.gradle | 9 +++++----
.../src/main/resources/log4j2.properties | 13 +++++++------
.../src/main/resources/log4j2.properties | 13 +++++++------
.../src/main/resources/log4j2.properties | 13 +++++++------
.../src/main/resources/log4j2.properties | 13 +++++++------
.../checkpointing/src/main/resources/log4j2.properties | 13 +++++++------
.../src/main/resources/log4j2.properties | 13 +++++++------
.../introduction/src/main/resources/log4j2.properties | 13 +++++++------
.../object-reuse/src/main/resources/log4j2.properties | 13 +++++++------
.../exercise/src/main/resources/log4j2.properties | 13 +++++++------
.../src/main/resources/log4j2.properties | 13 +++++++------
.../solution/src/main/resources/log4j2.properties | 13 +++++++------
.../throughput/src/main/resources/log4j2.properties | 13 +++++++------
13 files changed, 89 insertions(+), 76 deletions(-)
diff --git a/build.gradle b/build.gradle
index 5d0c8e9..6077960 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,8 +37,7 @@ subprojects {
javaVersion = '1.8'
flinkVersion = '1.13.1'
scalaBinaryVersion = '2.12'
- slf4jVersion = '1.7.15'
- log4jVersion = '1.2.17'
+ log4jVersion = '2.12.1'
junitVersion = '4.12'
}
@@ -73,6 +72,7 @@ subprojects {
flinkShadowJar.exclude group: 'com.google.code.findbugs', module:
'jsr305'
flinkShadowJar.exclude group: 'org.slf4j'
flinkShadowJar.exclude group: 'log4j'
+ flinkShadowJar.exclude group: 'org.apache.logging.log4j', module:
'log4j-to-slf4j'
// already provided dependencies from serializer frameworks
flinkShadowJar.exclude group: 'com.esotericsoftware.kryo', module:
'kryo'
@@ -82,8 +82,9 @@ subprojects {
// common set of dependencies
dependencies {
- implementation "log4j:log4j:${log4jVersion}"
- implementation "org.slf4j:slf4j-log4j12:${slf4jVersion}"
+ implementation
"org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
+ implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+ implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
if (project != project(":common")) {
implementation project(path: ':common')
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/hourly-tips/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to hourly-tips/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++ b/hourly-tips/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/hourly-tips/src/main/resources/log4j.properties
b/long-ride-alerts/src/main/resources/log4j2.properties
similarity index 78%
rename from hourly-tips/src/main/resources/log4j.properties
rename to long-ride-alerts/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/hourly-tips/src/main/resources/log4j.properties
+++ b/long-ride-alerts/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/long-ride-alerts/src/main/resources/log4j.properties
b/ride-cleansing/src/main/resources/log4j2.properties
similarity index 78%
rename from long-ride-alerts/src/main/resources/log4j.properties
rename to ride-cleansing/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/long-ride-alerts/src/main/resources/log4j.properties
+++ b/ride-cleansing/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/ride-cleansing/src/main/resources/log4j.properties
b/rides-and-fares/src/main/resources/log4j2.properties
similarity index 78%
rename from ride-cleansing/src/main/resources/log4j.properties
rename to rides-and-fares/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/ride-cleansing/src/main/resources/log4j.properties
+++ b/rides-and-fares/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/checkpointing/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to troubleshooting/checkpointing/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++ b/troubleshooting/checkpointing/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/external-enrichment/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to troubleshooting/external-enrichment/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++ b/troubleshooting/external-enrichment/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/introduction/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to troubleshooting/introduction/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++ b/troubleshooting/introduction/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/object-reuse/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to troubleshooting/object-reuse/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++ b/troubleshooting/object-reuse/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/state-migration/exercise/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to
troubleshooting/state-migration/exercise/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++
b/troubleshooting/state-migration/exercise/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/state-migration/solution-custom-to-avro/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to
troubleshooting/state-migration/solution-custom-to-avro/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++
b/troubleshooting/state-migration/solution-custom-to-avro/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/state-migration/solution/src/main/resources/log4j2.properties
similarity index 78%
copy from rides-and-fares/src/main/resources/log4j.properties
copy to
troubleshooting/state-migration/solution/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++
b/troubleshooting/state-migration/solution/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/rides-and-fares/src/main/resources/log4j.properties
b/troubleshooting/throughput/src/main/resources/log4j2.properties
similarity index 78%
rename from rides-and-fares/src/main/resources/log4j.properties
rename to troubleshooting/throughput/src/main/resources/log4j2.properties
index da32ea0..8319d24 100644
--- a/rides-and-fares/src/main/resources/log4j.properties
+++ b/troubleshooting/throughput/src/main/resources/log4j2.properties
@@ -15,9 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
################################################################################
-
-log4j.rootLogger=INFO, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x
- %m%n
+loogers=rootLooger
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
