0048258: How to manually backport log4j 2.17 to Openbravo version >= 19Q1

diff --git a/legal/Licensing.txt b/legal/Licensing.txt index eca2decd2b..8bf1364c99 100644 --- a/legal/Licensing.txt +++ b/legal/Licensing.txt @@ -102,11 +102,11 @@ http://people.apache.org/~andyc/neko/doc/html/ # commons-pool-1.5.6.jar # jakarta-oro-2.0.8.jar # jettison-1.3-patched.jar -# log4j-api-2.14.1.jar -# log4j-core-2.14.1.jar -# log4j-web-2.14.1.jar -# log4j-slf4j-impl-2.14.1.jar -# log4j-1.2-api-2.14.1.jar +# log4j-api-2.17.0.jar +# log4j-core-2.17.0.jar +# log4j-web-2.17.0.jar +# log4j-slf4j-impl-2.17.0.jar +# log4j-1.2-api-2.17.0.jar # quartz-2.3.2.jar # servlet-api.jar # wstx-asl-3.0.2.jar diff --git a/src-core/.classpath b/src-core/.classpath index 727024fed8..4fd370e74c 100644 --- a/src-core/.classpath +++ b/src-core/.classpath @@ -15,8 +15,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/commons-io-2.4.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.14.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.14.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.14.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/src-trl/.classpath b/src-trl/.classpath index c7f51e9b81..ee8ec68123 100644 --- a/src-trl/.classpath +++ b/src-trl/.classpath @@ -7,8 +7,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/nekohtml.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl-2.9.0-patched.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.14.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.14.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.14.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/src-wad/.classpath b/src-wad/.classpath index 0152c32145..fabc71cfd7 100644 --- a/src-wad/.classpath +++ b/src-wad/.classpath @@ -7,8 +7,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl-2.9.0-patched.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.14.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.14.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.14.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath>

diff --git a/src-core/.classpath b/src-core/.classpath index cb2853d6b0..0dfc86995a 100644 --- a/src-core/.classpath +++ b/src-core/.classpath @@ -15,8 +15,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/commons-io-2.4.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.11.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/src-test/src/org/openbravo/test/base/TestLogAppender.java b/src-test/src/org/openbravo/test/base/TestLogAppender.java index 8bfe2bee75..081252105e 100644 --- a/src-test/src/org/openbravo/test/base/TestLogAppender.java +++ b/src-test/src/org/openbravo/test/base/TestLogAppender.java @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2016-2018 Openbravo SLU + * All portions are Copyright (C) 2016-2021 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.Core; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginElement; @@ -50,7 +51,7 @@ public class TestLogAppender extends AbstractAppender { private boolean logStackTraces = false; protected TestLogAppender(String name, Filter filter) { - super(name, filter, null); + super(name, filter, null, true, Property.EMPTY_ARRAY); } @Override diff --git a/src-trl/.classpath b/src-trl/.classpath index 136d841d47..ee8ec68123 100644 --- a/src-trl/.classpath +++ b/src-trl/.classpath @@ -7,8 +7,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/nekohtml.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl-2.9.0-patched.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.11.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/src-wad/.classpath b/src-wad/.classpath index 3e8d4f7eb7..fabc71cfd7 100644 --- a/src-wad/.classpath +++ b/src-wad/.classpath @@ -7,8 +7,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl-2.9.0-patched.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.11.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath>

diff --git a/build.xml b/build.xml index 31eb24a85e..87290584b1 100644 --- a/build.xml +++ b/build.xml @@ -997,9 +997,9 @@ export.database: exports database structure and data to xml files. <arg line="'${base.config}/Openbravo.properties' ${logFileName}" /> <classpath> <pathelement path="${build.core.lib}/openbravo-core.jar" /> - <pathelement path="${base.lib}/runtime/log4j-1.2-api-2.11.1.jar" /> - <pathelement path="${base.lib}/runtime/log4j-api-2.11.1.jar" /> - <pathelement path="${base.lib}/runtime/log4j-core-2.11.1.jar" /> + <pathelement path="${base.lib}/runtime/log4j-1.2-api-2.17.0.jar" /> + <pathelement path="${base.lib}/runtime/log4j-api-2.17.0.jar" /> + <pathelement path="${base.lib}/runtime/log4j-core-2.17.0.jar" /> <pathelement path="${base.lib}/runtime/commons-pool-1.5.6.jar" /> <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.jar" /> <pathelement path="${base.lib}/runtime/postgresql-42.2.2.jre7.jar" /> diff --git a/src-core/.classpath b/src-core/.classpath index d59b172c9b..d1c9920d55 100644 --- a/src-core/.classpath +++ b/src-core/.classpath @@ -13,8 +13,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/commons-io-2.4.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.11.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/src-core/src/org/openbravo/utils/OBRebuildAppender.java b/src-core/src/org/openbravo/utils/OBRebuildAppender.java index 8ebd873df1..a08b477c3f 100644 --- a/src-core/src/org/openbravo/utils/OBRebuildAppender.java +++ b/src-core/src/org/openbravo/utils/OBRebuildAppender.java @@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginElement; @@ -50,7 +51,12 @@ public class OBRebuildAppender extends AbstractAppender { } protected OBRebuildAppender(String name, Filter filter, Layout<? extends Serializable> layout) { - super(name, filter, layout); + this(name, filter, layout, false, Property.EMPTY_ARRAY); + } + + protected OBRebuildAppender(String name, Filter filter, Layout<? extends Serializable> layout, + boolean ignoreExceptions, Property[] properties) { + super(name, filter, layout, ignoreExceptions, properties); } @Override diff --git a/src-test/src/org/openbravo/test/base/TestLogAppender.java b/src-test/src/org/openbravo/test/base/TestLogAppender.java index 8bfe2bee75..081252105e 100644 --- a/src-test/src/org/openbravo/test/base/TestLogAppender.java +++ b/src-test/src/org/openbravo/test/base/TestLogAppender.java @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2016-2018 Openbravo SLU + * All portions are Copyright (C) 2016-2021 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.Core; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginElement; @@ -50,7 +51,7 @@ public class TestLogAppender extends AbstractAppender { private boolean logStackTraces = false; protected TestLogAppender(String name, Filter filter) { - super(name, filter, null); + super(name, filter, null, true, Property.EMPTY_ARRAY); } @Override diff --git a/src-trl/.classpath b/src-trl/.classpath index 7bd220e142..f513ec798a 100644 --- a/src-trl/.classpath +++ b/src-trl/.classpath @@ -7,8 +7,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/nekohtml.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.11.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/src-wad/.classpath b/src-wad/.classpath index fcbc1b949f..09095cc1a6 100644 --- a/src-wad/.classpath +++ b/src-wad/.classpath @@ -8,8 +8,8 @@ <classpathentry kind="lib" path="/openbravo/lib/runtime/commons-collections-3.2.1.jar"/> <classpathentry kind="lib" path="/openbravo/lib/build/servlet-api.jar"/> <classpathentry kind="lib" path="/openbravo/lib/runtime/ant-1.9.2.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.11.1.jar"/> - <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.11.1.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.2-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-api-2.17.0.jar"/> + <classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-core-2.17.0.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath>

Issue History
Date Modified	Username	Field	Change
2021-12-15 16:13	shuehner	New Issue
2021-12-15 16:13	shuehner	Assigned To	=> Triage Platform Base
2021-12-15 16:13	shuehner	Modules	=> Core
2021-12-15 16:13	shuehner	Triggers an Emergency Pack	=> No
2021-12-15 18:18	shuehner	File Added: log4j-2.16.0-jar-files.zip
2021-12-15 18:19	shuehner	File Added: log4j-21Q4.diff
2021-12-15 18:19	shuehner	File Added: log4j-pre21Q4.diff
2021-12-15 18:25	shuehner	Proposed Solution updated
2021-12-15 18:26	shuehner	Proposed Solution updated
2021-12-15 18:29	shuehner	Note Added: 0133742
2021-12-15 18:30	shuehner	Assigned To	Triage Platform Base => shuehner
2021-12-15 18:30	shuehner	Status	new => scheduled
2021-12-15 18:33	shuehner	Relationship added	related to 0047901
2021-12-15 18:33	shuehner	Relationship added	related to 0048228
2021-12-15 18:33	shuehner	Relationship added	related to 0048254
2021-12-15 18:44	shuehner	Relationship added	related to 0047091
2021-12-15 18:44	shuehner	Relationship deleted	related to 0047901
2021-12-15 18:44	shuehner	Note Edited: 0133742	View Revisions
2021-12-15 18:47	shuehner	Proposed Solution updated
2021-12-15 19:03	shuehner	Note Added: 0133745
2021-12-15 19:03	shuehner	Status	scheduled => closed
2021-12-15 19:03	shuehner	Resolution	open => suspended
2021-12-17 13:44	AugustoMauch	Proposed Solution updated
2021-12-17 13:46	AugustoMauch	Note Edited: 0133742	View Revisions
2021-12-17 13:46	AugustoMauch	File Deleted: log4j-pre21Q4.diff
2021-12-17 13:47	AugustoMauch	File Added: log4j-21Q1-21Q4.diff
2021-12-17 13:47	AugustoMauch	Proposed Solution updated
2021-12-17 13:47	AugustoMauch	File Deleted: log4j-21Q1-21Q4.diff
2021-12-17 13:48	AugustoMauch	File Added: log4j-21Q1-pre21Q4.diff
2021-12-17 13:53	AugustoMauch	File Added: log4j-pre21Q1.diff
2021-12-17 13:55	AugustoMauch	File Added: after-cherrypick-log4j-21Q1-pre21Q4.diff
2021-12-17 13:55	AugustoMauch	Note Edited: 0133742	View Revisions
2021-12-20 09:00	alostale	Relationship added	related to 0048279
2021-12-20 10:44	cberner	Note Edited: 0133742	View Revisions
2021-12-20 10:51	cberner	Summary	How to manually backport log4j 2.16 to Openbravo version >= 19Q1 => How to manually backport log4j 2.17 to Openbravo version >= 19Q1
2021-12-20 10:51	cberner	Description Updated	View Revisions
2021-12-20 10:51	cberner	Steps to Reproduce Updated	View Revisions
2021-12-20 10:51	cberner	Proposed Solution updated
2021-12-20 10:51	cberner	File Added: log4j-2.17.0-jar-files.zip
2021-12-20 10:52	cberner	File Deleted: log4j-21Q4.diff
2021-12-20 10:52	cberner	File Deleted: log4j-2.16.0-jar-files.zip
2021-12-20 10:52	cberner	File Deleted: log4j-21Q1-pre21Q4.diff
2021-12-20 10:52	cberner	File Deleted: log4j-pre21Q1.diff
2021-12-20 10:53	cberner	File Deleted: after-cherrypick-log4j-21Q1-pre21Q4.diff
2021-12-20 10:53	cberner	File Added: log4j-21Q4.diff
2021-12-20 10:53	cberner	File Added: log4j-21Q1-pre21Q4.diff
2021-12-20 10:53	cberner	File Added: log4j-pre21Q1.diff
2021-12-20 10:53	cberner	File Added: after-cherrypick-log4j-21Q1-pre21Q4.diff

Notes
(0133742) shuehner (administrator) 2021-12-15 18:29 edited on: 2021-12-20 10:44	Above steps just simplify applying the following commits/issues as backports. a.) <21Q1 - f9a3d51ca55107fca4092b7a6e34f6454889df62 (log4j 2.11.1 -> 2.14.1, issue 47091) - 84357bd2eeaac2bf3be42f2151ef1834eebfa467 (log4j 2.14.1 -> 2.15.0, issue 48228) - ac8698d34f048f78e4c04e7e3a2155ce8cf4030e (log4j 2.15.0 -> 2.16.0, issue 48254) - 75a344ae2459ed375b81f9f94ac4dbad4c431412 (log4j 2.16.0 -> 2.17.0, issue 48279) Apply patch after-cherrypick-log4j-21Q1-pre21Q4.diff b.) >=21Q1 and < 21Q4 - f9a3d51ca55107fca4092b7a6e34f6454889df62 (log4j 2.11.1 -> 2.14.1, issue 47091) - 84357bd2eeaac2bf3be42f2151ef1834eebfa467 (log4j 2.14.1 -> 2.15.0, issue 48228) - ac8698d34f048f78e4c04e7e3a2155ce8cf4030e (log4j 2.15.0 -> 2.16.0, issue 48254) - 75a344ae2459ed375b81f9f94ac4dbad4c431412 (log4j 2.16.0 -> 2.17.0, issue 48279) c.) >= 21Q4 - 84357bd2eeaac2bf3be42f2151ef1834eebfa467 (log4j 2.14.1 -> 2.15.0, issue 48228) - ac8698d34f048f78e4c04e7e3a2155ce8cf4030e (log4j 2.15.0 -> 2.16.0, issue 48254) - 75a344ae2459ed375b81f9f94ac4dbad4c431412 (log4j 2.16.0 -> 2.17.0, issue 48279)

(0133745) shuehner (administrator) 2021-12-15 19:03	This issue is just about documenting how to easily backport the log4j change to older releases. Marked as closed as no action required on product side (there the changes are already done (see linked issues))