From 73e13f7adb234fb098fb786b11f6ff1fc4320879 Mon Sep 17 00:00:00 2001 From: Victor Vitvitskiy Date: Wed, 12 Jan 2022 21:50:57 +0000 Subject: [PATCH 1/5] Upgraded log4j to v2.3.2. Adds log4j2.xml file containing log4j configuration compatible with log4j v2 --- pom.xml | 8 ++-- src/main/resources/log4j2.xml | 69 +++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index fedab43a..59eb19bd 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.salesforce-marketingcloud fuelsdk - 1.5.1 + 1.6.0 Salesforce Marketing Cloud Java SDK Salesforce Marketing Cloud Java SDK https://github.com/salesforce-marketingcloud/FuelSDK-Java @@ -37,7 +37,7 @@ 2.3.1 4.12 2.6 - 1.2.17 + 2.3.2 2.3.0 2.3.0 1.5.0 @@ -133,8 +133,8 @@ ${lang.version} - log4j - log4j + org.apache.logging.log4j + log4j-1.2-api ${log4j.version} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 00000000..88fab001 --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + xml----%d %-5p %c: %m%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + \ No newline at end of file From 1b171bd05441173518998f9e9064744430560445 Mon Sep 17 00:00:00 2001 From: Victor Vitvitskiy Date: Wed, 12 Jan 2022 22:13:43 +0000 Subject: [PATCH 2/5] Updating readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 175d7def..9b129cba 100755 --- a/README.md +++ b/README.md @@ -25,6 +25,10 @@ Java platform. Among other things, the SDK: For more information about the Java SDK and how to use it, please see the Javadocs at http://salesforce-marketingcloud.github.io/FuelSDK-Java/. +New Features in Version 1.6.0 +------------ +* This version upgrades SDK to use log4j version 2.3.2 that contains fix for Security Vulnerability CVE-2021-44832. Log4j upgrade introduces breaking changes to the way log4j is configured. This version of SDK is using Log4j2 bridge to help mitigate the issue. If client overrides log4j properties they might need to be converted to the new log4j2 format. Please see this link for more details on migrating to log4j v2: https://logging.apache.org/log4j/log4j-2.3.2/manual/migration.html. + New Features in Version 1.5.1 ------------ * Added Support for Java 11 From 40d6c546f9867d8e98e104b31e43c5da5c0d2eea Mon Sep 17 00:00:00 2001 From: Victor Vitvitskiy Date: Wed, 12 Jan 2022 22:19:25 +0000 Subject: [PATCH 3/5] Readme update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b129cba..e32630e0 100755 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ the Javadocs at http://salesforce-marketingcloud.github.io/FuelSDK-Java/. New Features in Version 1.6.0 ------------ -* This version upgrades SDK to use log4j version 2.3.2 that contains fix for Security Vulnerability CVE-2021-44832. Log4j upgrade introduces breaking changes to the way log4j is configured. This version of SDK is using Log4j2 bridge to help mitigate the issue. If client overrides log4j properties they might need to be converted to the new log4j2 format. Please see this link for more details on migrating to log4j v2: https://logging.apache.org/log4j/log4j-2.3.2/manual/migration.html. +* This version upgrades SDK to use log4j version 2.3.2 that contains fix for [Security Vulnerability CVE-2021-44832](https://logging.apache.org/log4j/2.x/security.html#CVE-2021-44832). Log4j upgrade introduces breaking changes to the way log4j is configured. This version of SDK is using Log4j2 bridge to help with version migration. If client overrides log4j properties they might need to be converted to the new log4j2 format. Please see this link for more details on migrating to log4j v2: https://logging.apache.org/log4j/log4j-2.3.2/manual/migration.html. New Features in Version 1.5.1 ------------ From 4fb06213271bf7ed9b21a3221234f852c1a1956e Mon Sep 17 00:00:00 2001 From: Victor Vitvitskiy Date: Thu, 13 Jan 2022 15:02:26 +0000 Subject: [PATCH 4/5] Removing unneeded attributes and nodes in log4j2 config xml --- src/main/resources/log4j2.xml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 88fab001..ae6c8a0c 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,15 +1,8 @@ - - - - - + - + @@ -17,7 +10,7 @@ - xml----%d %-5p %c: %m%n + %d %-5p %c: %m%n From f26990329f0dbc7909fc79b76cf01265e8532f72 Mon Sep 17 00:00:00 2001 From: Victor Vitvitskiy Date: Thu, 13 Jan 2022 18:31:29 +0000 Subject: [PATCH 5/5] Minor changes to readme and log4j2 config --- README.md | 2 +- src/main/resources/log4j2.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e32630e0..2156f8f5 100755 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ the Javadocs at http://salesforce-marketingcloud.github.io/FuelSDK-Java/. New Features in Version 1.6.0 ------------ -* This version upgrades SDK to use log4j version 2.3.2 that contains fix for [Security Vulnerability CVE-2021-44832](https://logging.apache.org/log4j/2.x/security.html#CVE-2021-44832). Log4j upgrade introduces breaking changes to the way log4j is configured. This version of SDK is using Log4j2 bridge to help with version migration. If client overrides log4j properties they might need to be converted to the new log4j2 format. Please see this link for more details on migrating to log4j v2: https://logging.apache.org/log4j/log4j-2.3.2/manual/migration.html. +* This version upgrades the SDK to use Log4j version 2.3.2 which contains a fix for [Security Vulnerability CVE-2021-44832](https://logging.apache.org/log4j/2.x/security.html#CVE-2021-44832). The Log4j upgrade introduces breaking changes to the way Log4j is configured. This version of the SDK is using the Log4j2 bridge to help with version migration. If you override Log4j properties they might need to be converted to the new Log4j2 format. Please see this link for more details on migrating to Log4j v2: https://logging.apache.org/log4j/log4j-2.3.2/manual/migration.html. New Features in Version 1.5.1 ------------ diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index ae6c8a0c..766e5081 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -50,7 +50,7 @@ - + -->