(logging-log4cxx) branch logger_removal created (now 5b936a87)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch logger_removal in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git at 5b936a87 Clarify LoggerInstancePtr usage No new revisions were added by this update.
(logging-site) branch activity-monitor updated: Update project activity data
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch activity-monitor in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/activity-monitor by this push: new 504101ba Update project activity data 504101ba is described below commit 504101bae5475a7fa488fe74b4b1c97d880ae7fd Author: ASF Logging Services RM AuthorDate: Fri Dec 1 00:09:33 2023 + Update project activity data --- stats-instant.txt | 2 +- stats.csv | 316 +- 2 files changed, 53 insertions(+), 265 deletions(-) diff --git a/stats-instant.txt b/stats-instant.txt index bd21b77d..a05afa06 100644 --- a/stats-instant.txt +++ b/stats-instant.txt @@ -1 +1 @@ -2023-11-27T00:08:44Z \ No newline at end of file +2023-12-01T00:09:32Z \ No newline at end of file diff --git a/stats.csv b/stats.csv index 28ae5daa..582cd599 100644 --- a/stats.csv +++ b/stats.csv @@ -441,6 +441,23 @@ log4j-scala,log4j-api-scala-parent,2016-12-30,matt.sic...@spr.com log4j-scala,log4j-api-scala-parent,2016-11-11,mikael.stal...@magine.com log4j-scala,log4j-api-scala-parent,2016-11-08,mikael.stal...@magine.com log4j-scala,log4j-api-scala-parent,2016-11-08,mikael.stal...@magine.com +chainsaw,apache-chainsaw,2023-11-28,sde...@apache.org +chainsaw,apache-chainsaw,2023-11-28,sde...@apache.org +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,c...@grobmeier.de +chainsaw,apache-chainsaw,2023-11-28,garydgreg...@gmail.com chainsaw,apache-chainsaw,2023-10-24,c...@grobmeier.de chainsaw,apache-chainsaw,2023-10-24,c...@grobmeier.de chainsaw,apache-chainsaw,2023-10-24,c...@grobmeier.de @@ -2106,6 +2123,7 @@ log4j-audit,log4j-catalog-editor,2018-06-10,rgo...@apache.org log4j-audit,log4j-catalog-editor,2018-04-08,rgo...@apache.org log4j-audit,log4j-catalog-editor,2018-03-18,rgo...@apache.org log4j-audit,log4j-catalog-editor,2018-03-14,rgo...@apache.org +log4j-audit,log4j-audit-parent,2023-11-30,priv...@logging.apache.org log4j-audit,log4j-audit-parent,2023-11-23,priv...@logging.apache.org log4j-audit,log4j-audit-parent,2023-11-22,priv...@logging.apache.org log4j-audit,log4j-audit-parent,2023-11-21,priv...@logging.apache.org @@ -4486,6 +4504,7 @@ log4j-2,log4j-couchdb,2017-11-19,ralph.go...@dslextreme.com log4j-2,log4j-couchdb,2017-11-19,ralph.go...@dslextreme.com log4j-2,log4j-couchdb,2017-10-19,mik...@staldal.nu log4j-2,log4j-couchdb,2017-10-17,mik...@staldal.nu +log4j-2,log4j-taglib,2023-11-27,vol...@yazi.ci log4j-2,log4j-taglib,2023-11-16,vol...@yazi.ci log4j-2,log4j-taglib,2023-11-01,vol...@yazi.ci log4j-2,log4j-taglib,2023-10-25,piotr.git...@karwasz.org @@ -4741,6 +4760,7 @@ log4j-2,log4j-taglib,2013-09-14,rgo...@apache.org log4j-2,log4j-taglib,2013-09-14,rgo...@apache.org log4j-2,log4j-taglib,2013-08-31,nickwilliams@unknown log4j-2,log4j-taglib,2013-08-26,ggreg...@apache.org +log4j-2,log4j-jakarta-web,2023-11-27,vol...@yazi.ci log4j-2,log4j-jakarta-web,2023-11-16,vol...@yazi.ci log4j-2,log4j-jakarta-web,2023-11-01,vol...@yazi.ci log4j-2,log4j-jakarta-web,2023-10-25,piotr.git...@karwasz.org @@ -4952,6 +4972,7 @@ log4j-2,log4j-mongodb3,2018-03-11,ralph.go...@dslextreme.com log4j-2,log4j-mongodb3,2018-03-11,ralph.go...@dslextreme.com log4j-2,log4j-mongodb3,2018-03-01,garydgreg...@gmail.com log4j-2,log4j-mongodb3,2018-01-25,garydgreg...@gmail.com +log4j-2,log4j-jakarta-smtp,2023-11-27,piotr.git...@karwasz.org log4j-2,log4j-jakarta-smtp,2023-11-16,vol...@yazi.ci log4j-2,log4j-jakarta-smtp,2023-11-01,vol...@yazi.ci log4j-2,log4j-jakarta-smtp,2023-10-08,piotr.git...@karwasz.org @@ -5724,270 +5745,7 @@ log4j-2,log4j-iostreams,2014-09-03,garydgreg...@gmail.com log4j-2,log4j-iostreams,2014-09-03,garydgreg...@gmail.com log4j-2,log4j-iostreams,2014-09-03,mattsic...@apache.org log4j-2,log4j-iostreams,2014-09-03,mattsic...@apache.org -log4j-2,log4j-spring-cloud-config-client,2023-11-16,vol...@yazi.ci -log4j-2,log4j-spring-cloud-config-client,2023-11-01,vol...@yazi.ci -log4j-2,log4j-spring-cloud-config-client,2023-10-08,piotr.git...@karwasz.org -log4j-2,log4j-spring-cloud-config-client,2023-10-05,vol...@yazi.ci -log4j-2,log4j-spring-cloud-config-client,2023-10-05,vol...@yazi.ci
(logging-log4cxx) branch logger_removal deleted (was 5b936a87)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch logger_removal in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git was 5b936a87 Clarify LoggerInstancePtr usage The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4cxx) branch master updated: Allow removal of an individual logger from the single global repository (#303)
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new ff453105 Allow removal of an individual logger from the single global
repository (#303)
ff453105 is described below
commit ff453105b54d895c87d93c0e82727d4484294ef8
Author: Stephen Webb
AuthorDate: Fri Dec 1 10:02:51 2023 +1100
Allow removal of an individual logger from the single global repository
(#303)
* Document LoggerInstancePtr usage
---
src/main/cpp/hierarchy.cpp| 37 -
src/main/cpp/logmanager.cpp | 8 ++
src/main/include/log4cxx/hierarchy.h | 13
src/main/include/log4cxx/loggerinstance.h | 125 ++
src/main/include/log4cxx/logmanager.h | 13
src/site/markdown/concepts.md | 12 +++
src/test/cpp/loggertestcase.cpp | 44 +++
7 files changed, 251 insertions(+), 1 deletion(-)
diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp
index c304fab1..4d6725f8 100644
--- a/src/main/cpp/hierarchy.cpp
+++ b/src/main/cpp/hierarchy.cpp
@@ -258,7 +258,7 @@ LoggerPtr Hierarchy::getLogger(const LogString& name,
{
result = it->second;
}
- if (!result)
+ if (!result && factory)
{
LoggerPtr logger(factory->makeNewLoggerInstance(m_priv->pool,
name));
logger->setHierarchy(this);
@@ -489,3 +489,38 @@ void Hierarchy::addAppender(AppenderPtr appender)
{
m_priv->allAppenders.push_back(appender);
}
+
+bool Hierarchy::removeLogger(const LogString& name, bool ifNotUsed)
+{
+ auto parentRefCount = [this](const LoggerPtr& child) -> int
+ {
+ int result = 0;
+ for (auto& node : m_priv->provisionNodes)
+ {
+ if (node.second.end() != std::find(node.second.begin(),
node.second.end(), child))
+ ++result;
+ }
+ return result;
+ };
+ bool result = false;
+ std::lock_guard lock(m_priv->mutex);
+ auto it = m_priv->loggers.find(name);
+ if (it == m_priv->loggers.end())
+ ;
+ else if (ifNotUsed && 1 + parentRefCount(it->second) <
it->second.use_count())
+ ;
+ else
+ {
+ for (auto& node : m_priv->provisionNodes)
+ {
+ for (size_t i = node.second.size(); 0 < i; )
+ {
+ if (node.second[--i] == it->second)
+ node.second.erase(node.second.begin() +
i);
+ }
+ }
+ m_priv->loggers.erase(it);
+ result = true;
+ }
+ return result;
+}
diff --git a/src/main/cpp/logmanager.cpp b/src/main/cpp/logmanager.cpp
index 16290758..ae03711a 100644
--- a/src/main/cpp/logmanager.cpp
+++ b/src/main/cpp/logmanager.cpp
@@ -210,3 +210,11 @@ void LogManager::resetConfiguration()
{
getLoggerRepository()->resetConfiguration();
}
+
+bool LogManager::removeLogger(const LogString& name, bool ifNotUsed)
+{
+ bool result = false;
+ if (auto r = dynamic_cast(getLoggerRepository().get()))
+ result = r->removeLogger(name, ifNotUsed);
+ return result;
+}
diff --git a/src/main/include/log4cxx/hierarchy.h
b/src/main/include/log4cxx/hierarchy.h
index e43f63d2..e6cb9426 100644
--- a/src/main/include/log4cxx/hierarchy.h
+++ b/src/main/include/log4cxx/hierarchy.h
@@ -228,6 +228,19 @@ class LOG4CXX_EXPORT Hierarchy : public
spi::LoggerRepository
void addAppender(AppenderPtr appender);
+ /**
+ Remove the \c name Logger from the hierarchy.
+
+ Note: The \c name Logger must be retrieved from the hierarchy
+ \b after any subsequent configuration file change
+ for the newly loaded settings to be used.
+
+ @param name The logger to remove.
+ @param ifNotUsed If true and use_count() indicates there are
other references, do not remove the Logger and return false.
+ @returns true if \c name Logger was removed from the hierarchy.
+ */
+ bool removeLogger(const LogString& name, bool ifNotUsed = true);
+
private:
/**
diff --git a/src/main/include/log4cxx/loggerinstance.h
b/src/main/include/log4cxx/loggerinstance.h
new file mode 100644
index ..b858bf1c
--- /dev/null
+++ b/src/main/include/log4cxx/loggerinstance.h
@@ -0,0 +1,125 @@
+/*
+ * 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
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 1f4bb6f9 Automatic Site Publish by Buildbot 1f4bb6f9 is described below commit 1f4bb6f9a4a06822da991fbb23737d36aecebe68 Author: buildbot AuthorDate: Thu Nov 30 19:26:59 2023 + Automatic Site Publish by Buildbot --- content/README.md | 13 + content/feed.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/content/README.md b/content/README.md index 6ce8303b..170ba9b3 100644 --- a/content/README.md +++ b/content/README.md @@ -44,3 +44,16 @@ and connect to it with this command: ``` docker run --rm -p 4000:4000 --mount type=bind,src=$PWD,dst=/root/build --mount type=volume,dst=/root/build/node_modules -it --entrypoint "/bin/bash" apache/logging_site ``` + +## Deploying + +Once you have committed to this branch, your changes will be built and pushed +to the asf-staging branch. From there, it is published to https://logging.staged.apache.org + +If you are happy with your changes, merge the staging branch to the site branch: + +``` +git checkout asf-site +git merge --ff-only asf-staging +git push +``` diff --git a/content/feed.xml b/content/feed.xml index 9a889b97..ba2d9810 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2023-11-30T19:23:13+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] +http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2023-11-30T19:26:58+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] We are thrilled to take this moment to celebrate and acknowledge Stephen Webb, who joined the Apache Logging Services community back in 2020.
(logging-site) branch jekyll updated: added readme how to deploy website
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new 66b6acdc added readme how to deploy website 66b6acdc is described below commit 66b6acdcc3d0f78004795a34491c17907c075752 Author: Christian Grobmeier AuthorDate: Thu Nov 30 20:26:40 2023 +0100 added readme how to deploy website --- README.md | 13 + 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 6ce8303b..170ba9b3 100644 --- a/README.md +++ b/README.md @@ -44,3 +44,16 @@ and connect to it with this command: ``` docker run --rm -p 4000:4000 --mount type=bind,src=$PWD,dst=/root/build --mount type=volume,dst=/root/build/node_modules -it --entrypoint "/bin/bash" apache/logging_site ``` + +## Deploying + +Once you have committed to this branch, your changes will be built and pushed +to the asf-staging branch. From there, it is published to https://logging.staged.apache.org + +If you are happy with your changes, merge the staging branch to the site branch: + +``` +git checkout asf-site +git merge --ff-only asf-staging +git push +```
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 1f744d2d Automatic Site Publish by Buildbot 1f744d2d is described below commit 1f744d2ded35524db29af4fce2eb78807f86458b Author: buildbot AuthorDate: Thu Nov 30 19:23:14 2023 + Automatic Site Publish by Buildbot --- .../2023/12/01/apache-common-logging-1.3.0.html| 296 - .../blog/2023/12/10/20-years-of-innovation.html| 247 - content/blog/index.html| 26 -- content/feed.xml | 140 +- 4 files changed, 1 insertion(+), 708 deletions(-) diff --git a/content/blog/2023/12/01/apache-common-logging-1.3.0.html b/content/blog/2023/12/01/apache-common-logging-1.3.0.html deleted file mode 100644 index 2a1bc4a7.. --- a/content/blog/2023/12/01/apache-common-logging-1.3.0.html +++ /dev/null @@ -1,296 +0,0 @@ - - - - -Apache Logging Services - - - - - - - - - - - - - - - - -Apache Logging Services - - -About - -Guidelines -Charter -Team -Support Help -Retirement Processes -https://cwiki.apache.org/confluence/display/LOGGING/Home;>Wiki -What is logging? - - - - - - -Projects - - - -Apache Log4j® - - - -Apache Log4j® Kotlin - - - -Apache Log4j® Scala - - - -Apache log4cxx - - - -Apache Chainsaw - - - -Apache Log4j® Audit - - - -https://flume.apache.org;>Apache Flume - - - -Apache Log4Net - - - - - - - - - - - - - -Dormant - - - - - - - - - - - - - - - - - - - -Apache Log4j® 1 - - - -Apache Log4j® 1 Extras - - - -Apache log4php - - - - - - -Blog - - - -Security - -Handling Security -Known Vulnerabilities -Activity Monitor - - - - - - -Apache - -https://www.apache.org/;>Home -https://www.apache.org/foundation/sponsorship.html;>Sponsorship -https://www.apache.org/licenses/;>License -https://www.apache.org/foundation/thanks.html;>Thanks -https://www.apache.org/events/current-event.html;>Current Events -
(logging-site) branch jekyll updated: Rollback publishing future posts
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new 87e5b391 Rollback publishing future posts 87e5b391 is described below commit 87e5b391be43489270fb473db3dd34fc153fee3d Author: Piotr P. Karwasz AuthorDate: Thu Nov 30 20:22:56 2023 +0100 Rollback publishing future posts --- _config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.yml b/_config.yml index cb0f41f6..0422c89e 100644 --- a/_config.yml +++ b/_config.yml @@ -58,4 +58,3 @@ exclude: # - vendor/cache/ # - vendor/gems/ # - vendor/ruby/ -future: true
(logging-site) branch jekyll updated: Additional changes to Commons Logging post
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new 26903ba0 Additional changes to Commons Logging post 26903ba0 is described below commit 26903ba00e47f8991b23506a15df16cbbeced931 Author: Piotr P. Karwasz AuthorDate: Thu Nov 30 20:15:23 2023 +0100 Additional changes to Commons Logging post --- _config.yml | 1 + _posts/2023-12-01-apache-common-logging-1.3.0.md | 27 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/_config.yml b/_config.yml index 0422c89e..cb0f41f6 100644 --- a/_config.yml +++ b/_config.yml @@ -58,3 +58,4 @@ exclude: # - vendor/cache/ # - vendor/gems/ # - vendor/ruby/ +future: true diff --git a/_posts/2023-12-01-apache-common-logging-1.3.0.md b/_posts/2023-12-01-apache-common-logging-1.3.0.md index 5b1480df..b3ccc43c 100644 --- a/_posts/2023-12-01-apache-common-logging-1.3.0.md +++ b/_posts/2023-12-01-apache-common-logging-1.3.0.md @@ -20,20 +20,19 @@ layout: post title: "Upgrade to Apache Commons Logging 1.3.0" description: "Instructions to upgrade application to Apache Commons Logging 1.3.0." tags: - - Logging Services - Apache - - Community + - Commmons Logging - Open Source type: post --- # Apache Commons Logging -[Apache Commons Logging](https://commons.apache.org/proper/commons-logging/) (JCL) is one of the oldest Java logging APIs +[Apache Commons Logging](https://commons.apache.org/proper/commons-logging/) (JCL) is one of the oldest Java logging API available. Released for the first time in 2002, it immediately saw a widespread adoption in the Java community. -While newer APIs, like SLF4J and our Log4j API, appeared over time, even in 2023 it is hard to find an application stack +While newer APIs, like SLF4J and our own Log4j API, appeared over time, even in 2023 it is hard to find an application stack that does not depend on JCL. According to Sonatype, Apache Commons Logging is used in [over 1 million artifacts](https://central.sonatype.com/artifact/commons-logging/commons-logging), while the second place is taken by SLF4J with [almost 40 thousand artifacts](https://central.sonatype.com/artifact/org.slf4j/slf4j-api). @@ -48,11 +47,11 @@ Among the most prominent changes, the new version: * also supports forwarding to SLF4J, * adds support for the Java Platform Module System (JPMS) with the module name `org.apache.commons.logging`. -## Upgrade instructions +## Upgrade instructions (Log4j Core/Logback) -For most users the upgrade to Apache Commons Logging 1.3.0 should be flawless. -This category includes users that user Log4j Core or Logback as logging backends. -Maven users just need to upgrade `commons-logging` in their dependency management: +The upgrade path for users of the Log4j Core and Logback logging backends is easy. +The first step is upgrading `commons-logging`. +In Maven this can be done using dependency management. ```xml @@ -66,6 +65,7 @@ Maven users just need to upgrade `commons-logging` in their dependency managemen ``` +The second step consists in removing obsolete dependencies. Since version 1.2 only supported old generation logging backends out-of-the-box ([Log4j 1.x](https//logging.apache.org/log4j/1.2/), [Avalon](https//avalon.apache.org) and [Lumberjack](https://javalogging.sourceforge.net)), the Java community developed many `LogFactory` implementations and complete Apache Commons Logging replacements: @@ -76,7 +76,8 @@ many `LogFactory` implementations and complete Apache Commons Logging replacemen (`LogFactory` implementation). These artifacts can be **safely** removed from your dependency stack. -For JPMS users this operation is **required**. +For JPMS users this operation is even **required**. + To do so Maven users can use exclusions: ```xml @@ -94,13 +95,13 @@ To do so Maven users can use exclusions: and to prevent regressions, add those dependencies to a [`bannedDependencies` Maven Enforcer rule](https://maven.apache.org/enforcer/enforcer-rules/bannedDependencies.html). -## Upgrade instructions (Log4j 1.x users) +## Upgrade instructions (Log4j 1.x/Reload4j users) -For users that use Log4j 1.x as logging backend the upgrade is more complicated: version 1.3.0 disabled the Log4j 1.x backend by default. +For users that use Log4j 1.x or Reload4j as logging backend the upgrade is more complicated: version 1.3.0 disabled the Log4j 1.x backend by default. -Log4j 1.x users are: +Log4j 1.x/Reload4j users are: - * encouraged to migrate to Log4j 2.x Core (cf. [migration guide](https://logging.apache.org/log4j/2.x/manual/migration.html)), + * encouraged to migrate to Log4j 2.x Core (cf. [migration guide](https://logging.apache.org/log4j/2.x/manual/migration.html)) or Logback,
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new bfa32478 Automatic Site Publish by Buildbot bfa32478 is described below commit bfa32478fa1843bbdcae338a5b924eda3dbeb3b6 Author: buildbot AuthorDate: Thu Nov 30 19:15:43 2023 + Automatic Site Publish by Buildbot --- .../12/01/apache-common-logging-1.3.0.html}| 137 ++-- .../12/10/20-years-of-innovation.html} | 88 +++-- content/blog/index.html| 26 content/feed.xml | 140 - 4 files changed, 318 insertions(+), 73 deletions(-) diff --git a/content/blog/index.html b/content/blog/2023/12/01/apache-common-logging-1.3.0.html similarity index 54% copy from content/blog/index.html copy to content/blog/2023/12/01/apache-common-logging-1.3.0.html index e1b96a76..2a1bc4a7 100644 --- a/content/blog/index.html +++ b/content/blog/2023/12/01/apache-common-logging-1.3.0.html @@ -151,50 +151,115 @@ - - + -Apache Logging Services Blog -Latest news from all Logging Services projects +Upgrade to Apache Commons Logging 1.3.0 +Instructions to upgrade application to Apache Commons Logging 1.3.0. + +01 Dec 2023 + + + Apache Commons Logging +https://commons.apache.org/proper/commons-logging/;>Apache Commons Logging (JCL) is one of the oldest Java logging API +available. +Released for the first time in 2002, it immediately saw a widespread adoption in the Java community. - - - -28 Nov 2023 -Welcoming Stephen Webb to the Apache Logging Services PMC - -#Logging Services - -#Apache - -#Community - -#Open Source - - - - -17 Nov 2023 -Welcoming Apache Flume to Apache Logging Services - -#Logging Services - -#Flume - - - - - - +While newer APIs, like SLF4J and our own Log4j API, appeared over time, even in 2023 it is hard to find an application stack +that does not depend on JCL. +According to Sonatype, Apache Commons Logging is used in https://central.sonatype.com/artifact/commons-logging/commons-logging;>over 1 million artifacts, +while the second place is taken by SLF4J with https://central.sonatype.com/artifact/org.slf4j/slf4j-api;>almost 40 thousand artifacts. +Version 1.3.0 - - +After more than 9 years since its previous release (version 1.2 released in July 2014), Apache Commons Logging released +a new 1.3.0 version today (cf. https://lists.apache.org/thread/XXX;>announcement). +Among the most prominent changes, the new version: + + + forwards logging to the Log4j API out-of-the-box (if present), + also supports forwarding to SLF4J, + adds support for the Java Platform Module System (JPMS) with the module name org.apache.commons.logging. + + +Upgrade instructions (Log4j Core/Logback) + +The upgrade path for users of the Log4j Core and Logback logging backends is easy. +The first step is upgrading commons-logging. +In Maven this can be done using dependency management. + +dependencyManagement +dependencies +dependency +groupIdcommons-logging/groupId +artifactIdcommons-logging/artifactId +version1.3.0/version +/dependency +/dependencies +/dependencyManagement + + +The second step consists in removing obsolete dependencies. +Since version 1.2 only supported old generation logging backends out-of-the-box (Log4j 1.x, +Avalon and https://javalogging.sourceforge.net;>Lumberjack), the Java community developed +many LogFactory implementations and complete Apache Commons Logging replacements: + + + https://mvnrepository.com/artifact/org.slf4j/jcl-over-slf4j;>org.slf4j:jcl-over-slf4j (replacement), + https://mvnrepository.com/artifact/org.springframework/spring-jcl;>org.springframework:spring-jcl (replacement), + our own https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-jcl;>org.apache.logging.log4j:log4j-jcl +(LogFactory implementation). + + +These artifacts can be safely removed from your dependency stack. +For JPMS users this operation is even required. +To do so Maven users can use exclusions: + +dependency +groupIdorg.springframework/groupId +artifactIdspring-jcl/artifactId +exclusions +exclusion +groupIdorg.springframework/groupId +artifactIdspring-jcl/artifactId +/exclusion +
(logging-log4j-audit) branch dependabot/maven/master/commons-io-commons-io-2.15.1 deleted (was 778b9f1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/commons-io-commons-io-2.15.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git was 778b9f1 Bump commons-io:commons-io from 2.15.0 to 2.15.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-audit) branch master updated: Update `commons-io:commons-io` to version `2.15.1` (#95)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git The following commit(s) were added to refs/heads/master by this push: new f829b43 Update `commons-io:commons-io` to version `2.15.1` (#95) f829b43 is described below commit f829b434eb12685bc8c0ff281ba7d48bf9973845 Author: ASF Logging Services RM AuthorDate: Thu Nov 30 16:26:40 2023 + Update `commons-io:commons-io` to version `2.15.1` (#95) --- pom.xml | 2 +- src/changelog/.1.x.x/update_commons_io_commons_io.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 317815f..71f1075 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 1.9.4 1.16.0 3.2.2 -2.15.0 +2.15.1 3.14.0 1.2 1.6 diff --git a/src/changelog/.1.x.x/update_commons_io_commons_io.xml b/src/changelog/.1.x.x/update_commons_io_commons_io.xml index 75a8f17..b74fec5 100644 --- a/src/changelog/.1.x.x/update_commons_io_commons_io.xml +++ b/src/changelog/.1.x.x/update_commons_io_commons_io.xml @@ -3,6 +3,6 @@ xmlns="http://logging.apache.org/log4j/changelog; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; type="changed"> - https://github.com/apache/logging-log4j-audit/pull/77"/> - Update `commons-io:commons-io` to version `2.15.0` + https://github.com/apache/logging-log4j-audit/pull/95"/> + Update `commons-io:commons-io` to version `2.15.1`
(logging-log4j-audit) branch dependabot/maven/master/commons-logging-commons-logging-1.3.0 created (now d9207f4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/commons-logging-commons-logging-1.3.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git at d9207f4 Bump commons-logging:commons-logging from 1.2 to 1.3.0 No new revisions were added by this update.
(logging-log4j-audit) branch dependabot/maven/master/commons-io-commons-io-2.15.1 created (now 778b9f1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/commons-io-commons-io-2.15.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git at 778b9f1 Bump commons-io:commons-io from 2.15.0 to 2.15.1 No new revisions were added by this update.
(logging-log4j2) 03/04: Upgrade `org.mockito:*`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 7569495fc3a8e05a3a7da8fc5e2bdace9a65e03d Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:56:09 2023 +0100 Upgrade `org.mockito:*` --- .github/dependabot.yaml | 3 --- log4j-api-test/pom.xml | 5 - log4j-parent/pom.xml| 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index e97f41eace..ab7f8819b6 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -43,9 +43,6 @@ updates: # Keep Logback version 1.2.x - dependency-name: "ch.qos.logback:*" update-types: ["version-update:semver-major", "version-update:semver-minor"] -# Mockito 5.x requires Java 11 -- dependency-name: "org.mockito:*" - update-types: ["version-update:semver-major"] # Apache Cassandra: keep version 3.x - dependency-name: "org.apache.cassandra:*" versions: ["[4.0.0,)"] diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index c243fad232..172f79777e 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -140,11 +140,6 @@ mockito-core test - - org.mockito - mockito-inline - test - org.osgi diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index bcf7849076..e190ae5e2d 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -128,7 +128,7 @@ 1.5.0 1.3.13 3.9.0 -4.11.0 +5.7.0 4.11.1 15.4 4.1.101.Final
(logging-log4j2) 04/04: Upgrade `system-stubs`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit c03eb85bb3a453c71a625fd5d772ae1a7997dea0 Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:58:38 2023 +0100 Upgrade `system-stubs` --- .github/dependabot.yaml | 3 --- log4j-parent/pom.xml| 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index ab7f8819b6..280a861401 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -65,9 +65,6 @@ updates: # LMAX Disruptor requires Java 11 - dependency-name: "com.lmax:disruptor" versions: ["[4.0.0,)"] -# WebCompere System Stubs requires Java 11 -- dependency-name: "uk.org.webcompere:*" - versions: ["2.1.0,)"] # Slf4j Extensions contain a breaking change in 1.7.26 - dependency-name: "org.slf4j:slf4j-ext" versions: ["1.7.26,)"] diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index e190ae5e2d..0489530813 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -144,7 +144,7 @@ 1.7.25 2.7.18 5.3.31 -2.0.3 +2.1.5 10.0.27 1.7 2.35.1
(logging-log4j2) 02/04: Upgrade `junit-pioneer`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit d5a20c182bccd82ec7b0114d5bed412bff51009f Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:51:51 2023 +0100 Upgrade `junit-pioneer` --- .github/dependabot.yaml | 3 --- log4j-parent/pom.xml| 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index e781df7f11..e97f41eace 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -46,9 +46,6 @@ updates: # Mockito 5.x requires Java 11 - dependency-name: "org.mockito:*" update-types: ["version-update:semver-major"] -# JUnit Pioneer 2.x requires Java 11 -- dependency-name: "org.junit-pioneer:*" - update-types: ["version-update:semver-major"] # Apache Cassandra: keep version 3.x - dependency-name: "org.apache.cassandra:*" versions: ["[4.0.0,)"] diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index f0579c8a0c..bcf7849076 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -119,7 +119,7 @@ 3.2.2 4.13.2 5.10.1 -1.9.1 +2.2.0 3.4.0 5.12.4 0.2.0
(logging-log4j2) 01/04: Upgrade `json-unit`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit dce93ef63b43c840333eddac219b0c8ba4aa85e0 Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:39:22 2023 +0100 Upgrade `json-unit` --- .github/dependabot.yaml | 6 -- log4j-parent/pom.xml| 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 8ec12a2f11..e781df7f11 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -55,9 +55,6 @@ updates: # Kubernetes: keep version 5.x - dependency-name: "io.fabric8:*" versions: ["[6.0.0,)"] -# Spotless 2.32.0 requires Java 11 -- dependency-name: "com.diffplug.spotless:*" - versions: ["[2.32.0,)"] # `com.conversantmedia:disruptor` 1.2.16 requires Java 9 - dependency-name: "com.conversantmedia:disruptor" versions: ["[1.2.16,)"] @@ -71,9 +68,6 @@ updates: update-types: ["version-update:semver-minor", "version-update:semver-patch"] - dependency-name: "org.openrewrite.recipe:*" update-types: ["version-update:semver-minor", "version-update:semver-patch"] -# Json Unit 3.x requires Java 17 -- dependency-name: "net.javacrumbs.json-unit:*" - versions: ["[3.0.0,)"] # LMAX Disruptor requires Java 11 - dependency-name: "com.lmax:disruptor" versions: ["[4.0.0,)"] diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index 737245871e..f0579c8a0c 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -116,7 +116,7 @@ 9.4.53.v20231009 3.5.8 1.37 -2.38.0 +3.2.2 4.13.2 5.10.1 1.9.1
(logging-log4j2) branch 2.x-java-17 updated (b805c94561 -> c03eb85bb3)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from b805c94561 Merge remote-tracking branch 'origin/2.x-java-17' into 2.x-java-17 new dce93ef63b Upgrade `json-unit` new d5a20c182b Upgrade `junit-pioneer` new 7569495fc3 Upgrade `org.mockito:*` new c03eb85bb3 Upgrade `system-stubs` The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/dependabot.yaml | 15 --- log4j-api-test/pom.xml | 5 - log4j-parent/pom.xml| 8 3 files changed, 4 insertions(+), 24 deletions(-)
(logging-log4j2) 02/02: Merge remote-tracking branch 'origin/2.x-java-17' into 2.x-java-17
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit b805c94561d14197624cc17489f00d6199101dc9 Merge: 2e0411f593 d7db79d487 Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:32:34 2023 +0100 Merge remote-tracking branch 'origin/2.x-java-17' into 2.x-java-17
(logging-log4j2) 01/02: Reflective access fixes for `log4j-osgi-test`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2e0411f593e65689b4ab1f206de2500210e6123f
Merge: dfa8558864 8c09c3fbd0
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 16:14:58 2023 +0100
Reflective access fixes for `log4j-osgi-test`
log4j-osgi-test/pom.xml| 2 ++
log4j-parent/pom.xml | 2 +-
src/changelog/.2.x.x/update_ch_qos_logback_logback_classic.xml | 4 ++--
src/site/_release-notes/_2.x.x.adoc| 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --cc log4j-osgi-test/pom.xml
index a9c4317790,a9c4317790..068fb492ff
--- a/log4j-osgi-test/pom.xml
+++ b/log4j-osgi-test/pom.xml
@@@ -201,6 -201,6 +201,8 @@@
${project.build.directory}
++
++ --add-opens java.base/java.net=ALL-UNNAMED
(logging-log4j2) branch 2.x-java-17 updated (d7db79d487 -> b805c94561)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from d7db79d487 Merge remote-tracking branch 'origin/2.x' into 2.x-java-17 new 2e0411f593 Reflective access fixes for `log4j-osgi-test` new b805c94561 Merge remote-tracking branch 'origin/2.x-java-17' into 2.x-java-17 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: log4j-osgi-test/pom.xml | 2 ++ 1 file changed, 2 insertions(+)
(logging-log4j2) 03/12: Fix Java 17 failures in `NoopThreadContextTest`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 0ddcdb8bdb882275d704567d7f0c2ed308c10456
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 10:59:22 2023 +0100
Fix Java 17 failures in `NoopThreadContextTest`
---
.../test/java/org/apache/logging/log4j/NoopThreadContextTest.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java
index 61add403b5..d4ce703b56 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java
@@ -18,17 +18,15 @@ package org.apache.logging.log4j;
import static org.junit.jupiter.api.Assertions.assertNull;
-import org.apache.logging.log4j.test.junit.InitializesThreadContext;
+import org.apache.logging.log4j.test.junit.SetTestProperty;
import org.apache.logging.log4j.test.junit.UsingThreadContextMap;
import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.SetSystemProperty;
/**
* Tests {@link ThreadContext}.
*/
-@SetSystemProperty(key = "log4j2.disableThreadContext", value = "true")
-@SetSystemProperty(key = "log4j2.disableThreadContextMap", value = "true")
-@InitializesThreadContext
+@SetTestProperty(key = "log4j2.disableThreadContext", value = "true")
+@SetTestProperty(key = "log4j2.disableThreadContextMap", value = "true")
@UsingThreadContextMap
public class NoopThreadContextTest {
(logging-log4j2) 11/12: Reflective access fixes
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit dfa8558864cc83b30535638f2f3798d407b38296 Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:07:38 2023 +0100 Reflective access fixes --- log4j-1.2-api/pom.xml | 18 +- log4j-core-test/pom.xml | 8 +++- log4j-jpa/pom.xml | 18 +- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index ba8091687c..e47c17ac0c 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -140,15 +140,21 @@ + + + +org.apache.maven.plugins +maven-surefire-plugin + + --add-opens java.base/java.io=ALL-UNNAMED + + + + org.apache.maven.plugins maven-compiler-plugin - org.apache.logging.log4j @@ -158,6 +164,8 @@ + + diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index b7008d0ef1..e3329cb034 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -361,16 +361,14 @@ - + org.apache.maven.plugins maven-surefire-plugin - ---add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED ---add-opens java.base/java.util=ALL-UNNAMED - +--add-opens java.base/java.util=ALL-UNNAMED diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml index 95f52cd080..38ec7de69a 100644 --- a/log4j-jpa/pom.xml +++ b/log4j-jpa/pom.xml @@ -100,15 +100,21 @@ + + + +org.apache.maven.plugins +maven-surefire-plugin + + --add-opens java.base/java.lang=ALL-UNNAMED + + + + org.apache.maven.plugins maven-compiler-plugin - org.apache.logging.log4j @@ -118,6 +124,8 @@ + +
(logging-log4j2) 10/12: Formatting fixes
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f64394d5f445bd50e2260067af5692d2c9703864
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 16:07:22 2023 +0100
Formatting fixes
---
.../core/pattern/DatePatternConverterTestBase.java | 23 ++
.../logging/log4j/core/async/AsyncLogger.java | 2 ++
.../logging/log4j/core/impl/Log4jLogEvent.java | 2 ++
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
index 881d0968bd..6bcf5242f9 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
@@ -16,6 +16,13 @@
*/
package org.apache.logging.log4j.core.pattern;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
import org.apache.logging.log4j.core.AbstractLogEvent;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.time.Instant;
@@ -26,14 +33,6 @@ import
org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedTimeZone
import org.apache.logging.log4j.util.Strings;
import org.junit.jupiter.api.Test;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
abstract class DatePatternConverterTestBase {
private static final class MyLogEvent extends AbstractLogEvent {
@@ -78,7 +77,7 @@ abstract class DatePatternConverterTestBase {
FixedDateFormat.FixedFormat.ISO8601_OFFSET_DATE_TIME_HHCMM.name();
private static final String[] ISO8601_FORMAT_OPTIONS = {ISO8601};
-
+
private final boolean threadLocalsEnabled;
DatePatternConverterTestBase(final boolean threadLocalsEnabled) {
@@ -437,10 +436,8 @@ abstract class DatePatternConverterTestBase {
milliBuilder.length() -
timeZoneFormat.getLength(), milliBuilder.length())
: Strings.EMPTY;
milliBuilder.setLength(milliBuilder.length() -
truncateLen); // truncate millis
-final String expected = milliBuilder
-.append("987123456", 0, i)
-.append(tz)
-.toString();
+final String expected =
+milliBuilder.append("987123456", 0,
i).append(tz).toString();
assertEquals(
expected,
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
index d60d4ecb13..0378d010cc 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
@@ -69,8 +69,10 @@ public class AsyncLogger extends Logger implements
EventTranslatorVararg
(logging-log4j2) 07/12: Remove `final` from `CLOCK` of `AsyncLogger` and `Log4jLogEvent`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4c2c17e89e96401590b9ace8dbce9dc354413e1b
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 14:07:24 2023 +0100
Remove `final` from `CLOCK` of `AsyncLogger` and `Log4jLogEvent`
This is necessary for Java 12+ compatibility.
---
.../java/org/apache/logging/log4j/core/util/ClockFactoryTest.java| 5 -
.../main/java/org/apache/logging/log4j/core/async/AsyncLogger.java | 3 ++-
.../main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java | 3 ++-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
index 0cd0ae257b..aa3771c140 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
@@ -24,11 +24,7 @@ import org.apache.logging.log4j.core.async.AsyncLogger;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledOnJre;
-import org.junit.jupiter.api.condition.JRE;
-// as of Java 12, final fields can no longer be overwritten via reflection
-@EnabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10, JRE.JAVA_11})
public class ClockFactoryTest {
public static void resetClocks() throws IllegalAccessException {
@@ -39,7 +35,6 @@ public class ClockFactoryTest {
public static void resetClock(final Class clazz) throws
IllegalAccessException {
System.clearProperty(ClockFactory.PROPERTY_NAME);
final Field field = FieldUtils.getField(clazz, "CLOCK", true);
-FieldUtils.removeFinalModifier(field);
FieldUtils.writeStaticField(field, ClockFactory.getClock(), false);
}
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
index 1151a0a1dc..d60d4ecb13 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
@@ -69,7 +69,8 @@ public class AsyncLogger extends Logger implements
EventTranslatorVararg
(logging-log4j2) 12/12: Merge remote-tracking branch 'origin/2.x' into 2.x-java-17
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit d7db79d487b247be1e64ba38cbec5b6a735cd812 Merge: dfa8558864 8c09c3fbd0 Author: Volkan Yazıcı AuthorDate: Thu Nov 30 16:14:58 2023 +0100 Merge remote-tracking branch 'origin/2.x' into 2.x-java-17 log4j-parent/pom.xml | 2 +- src/changelog/.2.x.x/update_ch_qos_logback_logback_classic.xml | 4 ++-- src/site/_release-notes/_2.x.x.adoc| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
(logging-log4j2) 09/12: Refactor `DatePatternConverterTest` for Java 17 compatibility
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1d26d96a64a4a1340c7edb289153b8e2b237cf88
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 15:50:51 2023 +0100
Refactor `DatePatternConverterTest` for Java 17 compatibility
---
...Test.java => DatePatternConverterTestBase.java} | 123 +
.../DatePatternConverterWithThreadLocalsTest.java | 30 +
...atePatternConverterWithoutThreadLocalsTest.java | 29 +
3 files changed, 114 insertions(+), 68 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
similarity index 83%
rename from
log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
rename to
log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
index 278305d252..881d0968bd 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTestBase.java
@@ -16,16 +16,6 @@
*/
package org.apache.logging.log4j.core.pattern;
-import static org.junit.Assert.*;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.TimeZone;
import org.apache.logging.log4j.core.AbstractLogEvent;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.time.Instant;
@@ -34,14 +24,19 @@ import org.apache.logging.log4j.core.util.Constants;
import org.apache.logging.log4j.core.util.datetime.FixedDateFormat;
import
org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedTimeZoneFormat;
import org.apache.logging.log4j.util.Strings;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
-@RunWith(Parameterized.class)
-public class DatePatternConverterTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-private class MyLogEvent extends AbstractLogEvent {
+abstract class DatePatternConverterTestBase {
+
+private static final class MyLogEvent extends AbstractLogEvent {
private static final long serialVersionUID = 0;
@Override
@@ -83,24 +78,11 @@ public class DatePatternConverterTest {
FixedDateFormat.FixedFormat.ISO8601_OFFSET_DATE_TIME_HHCMM.name();
private static final String[] ISO8601_FORMAT_OPTIONS = {ISO8601};
+
+private final boolean threadLocalsEnabled;
-@Parameterized.Parameters(name = "threadLocalEnabled={0}")
-public static Collection data() {
-return Arrays.asList(new Object[][] {{Boolean.TRUE}, {Boolean.FALSE}});
-}
-
-public DatePatternConverterTest(final Boolean threadLocalEnabled) throws
Exception {
-// Setting the system property does not work: the Constant field has
already been initialized...
-// System.setProperty("log4j2.enable.threadlocals",
threadLocalEnabled.toString());
-
-final Field field =
Constants.class.getDeclaredField("ENABLE_THREADLOCALS");
-field.setAccessible(true); // make non-private
-
-final Field modifiersField = Field.class.getDeclaredField("modifiers");
-modifiersField.setAccessible(true);
-modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
// make non-final
-
-field.setBoolean(null, threadLocalEnabled.booleanValue());
+DatePatternConverterTestBase(final boolean threadLocalsEnabled) {
+this.threadLocalsEnabled = threadLocalsEnabled;
}
private static Date date(final int year, final int month, final int date) {
@@ -119,12 +101,17 @@ public class DatePatternConverterTest {
}
@Test
-public void testFormatDateStringBuilderDefaultPattern() {
+void testThreadLocalsConstant() {
+assertEquals(threadLocalsEnabled, Constants.ENABLE_THREADLOCALS);
+}
+
+@Test
+void testFormatDateStringBuilderDefaultPattern() {
assertDatePattern(null, date(2001, 1, 1), "2001-02-01 14:15:16,123");
}
@Test
-public void testFormatDateStringBuilderIso8601() {
+void testFormatDateStringBuilderIso8601() {
final DatePatternConverter converter =
DatePatternConverter.newInstance(ISO8601_FORMAT_OPTIONS);
final StringBuilder sb = new StringBuilder();
converter.format(date(2001, 1, 1), sb);
@@
(logging-log4j2) 04/12: Fix Java 17 failures in `DefaultThreadContextMapTest`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 367a2b646c038f40dddaaa31b612dd34708349bf
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 11:00:01 2023 +0100
Fix Java 17 failures in `DefaultThreadContextMapTest`
---
.../org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
index 368fc3ca6f..a0ca976d73 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextMapTest.java
@@ -25,10 +25,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.test.junit.InitializesThreadContext;
+import org.apache.logging.log4j.test.junit.SetTestProperty;
import org.apache.logging.log4j.test.junit.UsingThreadContextMap;
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.ClearSystemProperty;
-import org.junitpioneer.jupiter.SetSystemProperty;
/**
* Tests the {@code DefaultThreadContextMap} class.
@@ -228,7 +228,7 @@ public class DefaultThreadContextMapTest {
}
@Test
-@SetSystemProperty(key = DefaultThreadContextMap.INHERITABLE_MAP, value =
"true")
+@SetTestProperty(key = DefaultThreadContextMap.INHERITABLE_MAP, value =
"true")
@InitializesThreadContext
public void testThreadLocalInheritableIfConfigured() {
ThreadContextMapFactory.init();
(logging-log4j2) 08/12: Relax reflective access for Java 17 compatibility
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 3f550923261a9679c2ef72b6eed5dd43af79d7a7 Author: Volkan Yazıcı AuthorDate: Thu Nov 30 14:35:54 2023 +0100 Relax reflective access for Java 17 compatibility --- log4j-core-test/pom.xml | 22 +- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index 0397af4b84..b7008d0ef1 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -360,15 +360,25 @@ + + + +org.apache.maven.plugins +maven-surefire-plugin + + +--add-opens java.base/java.lang=ALL-UNNAMED +--add-opens java.base/java.net=ALL-UNNAMED +--add-opens java.base/java.util=ALL-UNNAMED + + + + + org.apache.maven.plugins maven-compiler-plugin - org.apache.logging.log4j @@ -378,6 +388,8 @@ + +
(logging-log4j2) 05/12: Fix Java 17 failures in `ThreadContextInheritanceTest`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1e1a1f478d53331e2ac77b1aeea71b4b59a375a0
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 11:00:10 2023 +0100
Fix Java 17 failures in `ThreadContextInheritanceTest`
---
.../org/apache/logging/log4j/ThreadContextInheritanceTest.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
index 26fb296a6d..96783ae600 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
@@ -24,6 +24,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.logging.log4j.spi.DefaultThreadContextMap;
import org.apache.logging.log4j.test.ThreadContextUtilityClass;
import org.apache.logging.log4j.test.junit.InitializesThreadContext;
+import org.apache.logging.log4j.test.junit.SetTestProperty;
+import org.apache.logging.log4j.test.junit.UsingThreadContextMap;
+import org.apache.logging.log4j.test.junit.UsingThreadContextStack;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
@@ -33,8 +36,10 @@ import org.junitpioneer.jupiter.SetSystemProperty;
/**
* Tests {@link ThreadContext}.
*/
-@SetSystemProperty(key = DefaultThreadContextMap.INHERITABLE_MAP, value =
"true")
+@SetTestProperty(key = DefaultThreadContextMap.INHERITABLE_MAP, value = "true")
@InitializesThreadContext
+@UsingThreadContextMap
+@UsingThreadContextStack
public class ThreadContextInheritanceTest {
@BeforeAll
(logging-log4j2) 02/12: Temporarily change the version to ease local testing
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 70e570f98a3e77277a2a48ff6d2defadd505489c Author: Volkan Yazıcı AuthorDate: Wed Nov 29 16:50:18 2023 +0100 Temporarily change the version to ease local testing --- pom.xml | 2 +- src/site/_constants.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a255d489c0..b1e24c9b37 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ -2.23.0-SNAPSHOT +2.23.0-j17-SNAPSHOT
(logging-log4j2) 06/12: Add Nashorn JavaScript engine for tests
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 7f0a6ae70f0a20804097cc6c102a240a3972516c
Author: Volkan Yazıcı
AuthorDate: Thu Nov 30 13:46:07 2023 +0100
Add Nashorn JavaScript engine for tests
JEP-335 has deprecated Nashorn in Java 11, and JEP-372
removed it in Java 15.
---
log4j-core-test/pom.xml | 5 +
log4j-parent/pom.xml| 7 +++
2 files changed, 12 insertions(+)
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 98d39a04d3..0397af4b84 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -297,6 +297,11 @@
mockito-junit-jupiter
test
+
+ org.openjdk.nashorn
+ nashorn-core
+ test
+
org.apache.felix
org.apache.felix.framework
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 2d086c33c6..27af8254d0 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -130,6 +130,7 @@
3.9.0
4.11.0
4.11.1
+15.4
4.1.101.Final
3.13.0.v20180226-1711
2.7.13
@@ -867,6 +868,12 @@
${mongodb.version}
+
+org.openjdk.nashorn
+nashorn-core
+${nashorn.version}
+
+
org.apache.felix
org.apache.felix.framework
(logging-log4j2) 01/12: Bump the compiler to Java 17
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-java-17
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 19e4b351a3657ab480d9ccef9939e5da369a9c71
Author: Volkan Yazıcı
AuthorDate: Wed Nov 29 15:32:37 2023 +0100
Bump the compiler to Java 17
---
.github/workflows/build.yaml| 6 +++---
.github/workflows/codeql-analysis.yaml | 2 +-
.github/workflows/merge-dependabot.yaml | 4 ++--
.java-version | 2 +-
BUILDING.adoc | 2 +-
pom.xml | 2 +-
src/site/_constants.adoc| 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b2031dd9d9..0daa1cfe8d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
with:
java-version: |
8
-11
+17
site-enabled: true
deploy-snapshot:
@@ -56,7 +56,7 @@ jobs:
with:
java-version: |
8
-11
+17
deploy-release:
needs: build
@@ -75,6 +75,6 @@ jobs:
with:
java-version: |
8
-11
+17
project-id: log4j
site-enabled: true
diff --git a/.github/workflows/codeql-analysis.yaml
b/.github/workflows/codeql-analysis.yaml
index 012bb99c18..de440779f4 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -34,7 +34,7 @@ jobs:
with:
java-version: |
8
-11
+17
# Permissions required to publish Security Alerts
permissions:
actions: read
diff --git a/.github/workflows/merge-dependabot.yaml
b/.github/workflows/merge-dependabot.yaml
index a8963ebf6e..83a59f12fe 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -34,13 +34,13 @@ jobs:
with:
java-version: |
8
-11
+17
merge-dependabot:
needs: build
uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
with:
- java-version: 11
+ java-version: 17
permissions:
contents: write # to push
changelog commits
pull-requests: write# to close
the PR
diff --git a/.java-version b/.java-version
index b4de394767..98d9bcb75a 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11
+17
diff --git a/BUILDING.adoc b/BUILDING.adoc
index 8f878df5e2..38b43d9d3e 100644
--- a/BUILDING.adoc
+++ b/BUILDING.adoc
@@ -18,7 +18,7 @@
[#requirements]
== Requirements
-* JDK 11+
+* JDK 17+
* A modern Linux, OSX, or Windows host
[#building]
diff --git a/pom.xml b/pom.xml
index 9fe502d261..a255d489c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,7 +312,7 @@
8
${maven.compiler.release}
-[11,12)
+[17,18)
(logging-log4j2) branch 2.x-java-17 created (now d7db79d487)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at d7db79d487 Merge remote-tracking branch 'origin/2.x' into 2.x-java-17 This branch includes the following new commits: new 19e4b351a3 Bump the compiler to Java 17 new 70e570f98a Temporarily change the version to ease local testing new 0ddcdb8bdb Fix Java 17 failures in `NoopThreadContextTest` new 367a2b646c Fix Java 17 failures in `DefaultThreadContextMapTest` new 1e1a1f478d Fix Java 17 failures in `ThreadContextInheritanceTest` new 7f0a6ae70f Add Nashorn JavaScript engine for tests new 4c2c17e89e Remove `final` from `CLOCK` of `AsyncLogger` and `Log4jLogEvent` new 3f55092326 Relax reflective access for Java 17 compatibility new 1d26d96a64 Refactor `DatePatternConverterTest` for Java 17 compatibility new f64394d5f4 Formatting fixes new dfa8558864 Reflective access fixes new d7db79d487 Merge remote-tracking branch 'origin/2.x' into 2.x-java-17 The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(logging-site) branch jekyll updated: Improve JCL 1.3.0 instructions
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new cd82fad4 Improve JCL 1.3.0 instructions cd82fad4 is described below commit cd82fad4c8fa21184afee2794101798272a6f832 Author: Piotr P. Karwasz AuthorDate: Thu Nov 30 15:23:38 2023 +0100 Improve JCL 1.3.0 instructions --- _posts/2023-12-01-apache-common-logging-1.3.0.md | 47 +++- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/_posts/2023-12-01-apache-common-logging-1.3.0.md b/_posts/2023-12-01-apache-common-logging-1.3.0.md index 2c80b407..5b1480df 100644 --- a/_posts/2023-12-01-apache-common-logging-1.3.0.md +++ b/_posts/2023-12-01-apache-common-logging-1.3.0.md @@ -41,7 +41,7 @@ while the second place is taken by SLF4J with [almost 40 thousand artifacts](htt ## Version 1.3.0 After more than 9 years since its previous release (version 1.2 released in July 2014), Apache Commons Logging released -a new 1.3.0 version today (cf. [announcement]()). +a new 1.3.0 version today (cf. [announcement](https://lists.apache.org/thread/XXX)). Among the most prominent changes, the new version: * forwards logging to the Log4j API out-of-the-box (if present), @@ -50,7 +50,9 @@ Among the most prominent changes, the new version: ## Upgrade instructions -For Maven Apache Commons Logging the upgrade should be as simple as adding the new version to you dependency management: +For most users the upgrade to Apache Commons Logging 1.3.0 should be flawless. +This category includes users that user Log4j Core or Logback as logging backends. +Maven users just need to upgrade `commons-logging` in their dependency management: ```xml @@ -75,3 +77,44 @@ many `LogFactory` implementations and complete Apache Commons Logging replacemen These artifacts can be **safely** removed from your dependency stack. For JPMS users this operation is **required**. +To do so Maven users can use exclusions: + +```xml + +org.springframework +spring-jcl + + +org.springframework +spring-jcl + + + +``` + +and to prevent regressions, add those dependencies to a [`bannedDependencies` Maven Enforcer rule](https://maven.apache.org/enforcer/enforcer-rules/bannedDependencies.html). + +## Upgrade instructions (Log4j 1.x users) + +For users that use Log4j 1.x as logging backend the upgrade is more complicated: version 1.3.0 disabled the Log4j 1.x backend by default. + +Log4j 1.x users are: + + * encouraged to migrate to Log4j 2.x Core (cf. [migration guide](https://logging.apache.org/log4j/2.x/manual/migration.html)), + * if that is not possible (or if a transitional period is required) they need to add a `commons-logging.properties` file to their applications containing: + +``` +org.apache.commons.logging.Log = org.apache.commons.logging.impl.Log4JLogger +``` + +## JPMS users + +The `org.apache.commons.logging` JPMS module has an **optional** dependency on the Log4j API. +In order for the JVM to automatically add the `org.apache.logging.log4j` module to your application's runtime, you need to add: + +``` +requires org.apache.logging.log4j; +``` + +to your application's module descriptor. +
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 34ffc7dd Automatic Site Publish by Buildbot 34ffc7dd is described below commit 34ffc7dd4fa15bc8b0f8009eece7b596a1bce254 Author: buildbot AuthorDate: Thu Nov 30 14:23:58 2023 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/feed.xml b/content/feed.xml index ec8c8416..2e59c61e 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2023-11-30T12:32:56+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] +http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2023-11-30T14:23:57+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] We are thrilled to take this moment to celebrate and acknowledge Stephen Webb, who joined the Apache Logging Services community back in 2020.
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new ce79a3aa Automatic Site Publish by Buildbot ce79a3aa is described below commit ce79a3aac6791988230ab1575a05ea60e251f13c Author: buildbot AuthorDate: Thu Nov 30 12:32:57 2023 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/feed.xml b/content/feed.xml index eca9ee3e..ec8c8416 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2023-11-28T19:14:30+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] +http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2023-11-30T12:32:56+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] We are thrilled to take this moment to celebrate and acknowledge Stephen Webb, who joined the Apache Logging Services community back in 2020.
(logging-site) branch jekyll updated: Commons Logging Release 1.3.0
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new ab06832e Commons Logging Release 1.3.0 ab06832e is described below commit ab06832edf813d5feb45fe40e33c450948b34ae7 Author: Piotr P. Karwasz AuthorDate: Thu Nov 30 13:32:32 2023 +0100 Commons Logging Release 1.3.0 --- _posts/2023-12-01-apache-common-logging-1.3.0.md | 77 1 file changed, 77 insertions(+) diff --git a/_posts/2023-12-01-apache-common-logging-1.3.0.md b/_posts/2023-12-01-apache-common-logging-1.3.0.md new file mode 100644 index ..2c80b407 --- /dev/null +++ b/_posts/2023-12-01-apache-common-logging-1.3.0.md @@ -0,0 +1,77 @@ +--- +# 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. + +layout: post +title: "Upgrade to Apache Commons Logging 1.3.0" +description: "Instructions to upgrade application to Apache Commons Logging 1.3.0." +tags: + - Logging Services + - Apache + - Community + - Open Source +type: post +--- + +# Apache Commons Logging + +[Apache Commons Logging](https://commons.apache.org/proper/commons-logging/) (JCL) is one of the oldest Java logging APIs +available. +Released for the first time in 2002, it immediately saw a widespread adoption in the Java community. + +While newer APIs, like SLF4J and our Log4j API, appeared over time, even in 2023 it is hard to find an application stack +that does not depend on JCL. +According to Sonatype, Apache Commons Logging is used in [over 1 million artifacts](https://central.sonatype.com/artifact/commons-logging/commons-logging), +while the second place is taken by SLF4J with [almost 40 thousand artifacts](https://central.sonatype.com/artifact/org.slf4j/slf4j-api). + +## Version 1.3.0 + +After more than 9 years since its previous release (version 1.2 released in July 2014), Apache Commons Logging released +a new 1.3.0 version today (cf. [announcement]()). +Among the most prominent changes, the new version: + + * forwards logging to the Log4j API out-of-the-box (if present), + * also supports forwarding to SLF4J, + * adds support for the Java Platform Module System (JPMS) with the module name `org.apache.commons.logging`. + +## Upgrade instructions + +For Maven Apache Commons Logging the upgrade should be as simple as adding the new version to you dependency management: + +```xml + + + +commons-logging +commons-logging +1.3.0 + + + +``` + +Since version 1.2 only supported old generation logging backends out-of-the-box ([Log4j 1.x](https//logging.apache.org/log4j/1.2/), +[Avalon](https//avalon.apache.org) and [Lumberjack](https://javalogging.sourceforge.net)), the Java community developed +many `LogFactory` implementations and complete Apache Commons Logging replacements: + + * [`org.slf4j:jcl-over-slf4j`](https://mvnrepository.com/artifact/org.slf4j/jcl-over-slf4j) (replacement), + * [`org.springframework:spring-jcl`](https://mvnrepository.com/artifact/org.springframework/spring-jcl) (replacement), + * our own [`org.apache.logging.log4j:log4j-jcl`](https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-jcl) + (`LogFactory` implementation). + +These artifacts can be **safely** removed from your dependency stack. +For JPMS users this operation is **required**.
(logging-site) branch cyclonedx updated (457e9e3d -> 14149003)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch cyclonedx
in repository https://gitbox.apache.org/repos/asf/logging-site.git
from 457e9e3d Add `cpe` and `purl` to `log4j-core` component
(apache/logging-log4j2#1707)
add 14149003 Remove sbomlink reference, add maintenance links
No new revisions were added by this update.
Summary of changes:
.../{1.xml => 2.xml} | 18 +++---
urn:uuid:dfa35519-9734-4259-bba1-3e825cf4be06 | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
copy urn:cdx:dfa35519-9734-4259-bba1-3e825cf4be06/{1.xml => 2.xml} (97%)
(logging-parent) branch dependabot/maven/com.github.spotbugs-spotbugs-annotations-4.8.2 deleted (was 97b745c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.github.spotbugs-spotbugs-annotations-4.8.2 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was 97b745c Bump com.github.spotbugs:spotbugs-annotations from 4.8.1 to 4.8.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch main updated: Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` (#68)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main by this push: new 2e862f8 Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` (#68) 2e862f8 is described below commit 2e862f8f884b22964924b6f4a32ab53bfd42c180 Author: ASF Logging Services RM AuthorDate: Thu Nov 30 10:55:56 2023 + Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` (#68) --- pom.xml | 2 +- .../.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml | 8 src/site/_release-notes/_10.x.x.adoc | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4f618c..5a26224 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,7 @@ 2.0.0 1.1.2 2.38.0 -4.8.1 +4.8.2 2.2.4 diff --git a/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml new file mode 100644 index 000..c1a877f --- /dev/null +++ b/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml @@ -0,0 +1,8 @@ + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="changed"> + https://github.com/apache/logging-parent/pull/68"/> + Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` + diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index 4ae40ef..6aa047a 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -45,5 +45,6 @@ This minor release contains several small improvements. * Update `actions/setup-java` to version `4.0.0` (https://github.com/apache/logging-parent/pull/67[67]) * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.0` (https://github.com/apache/logging-parent/pull/66[66]) +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` (https://github.com/apache/logging-parent/pull/68[68]) * Update `github/codeql-action` to version `2.22.8` (https://github.com/apache/logging-parent/pull/64[64]) * Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0` (https://github.com/apache/logging-parent/pull/65[65])
(logging-parent) branch dependabot/maven/com.github.spotbugs-spotbugs-annotations-4.8.2 created (now 97b745c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.github.spotbugs-spotbugs-annotations-4.8.2 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at 97b745c Bump com.github.spotbugs:spotbugs-annotations from 4.8.1 to 4.8.2 No new revisions were added by this update.
(logging-parent) branch dependabot/github_actions/actions/setup-java-4.0.0 deleted (was d3c24f6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/setup-java-4.0.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was d3c24f6 Bump actions/setup-java from 3.13.0 to 4.0.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch main updated: Update `actions/setup-java` to version `4.0.0` (#67)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new dfd3892 Update `actions/setup-java` to version `4.0.0` (#67)
dfd3892 is described below
commit dfd38922a4c75619c039480260a16d6bea432396
Author: ASF Logging Services RM
AuthorDate: Thu Nov 30 10:43:42 2023 +
Update `actions/setup-java` to version `4.0.0` (#67)
---
.github/workflows/build-reusable.yaml | 2 +-
.github/workflows/codeql-analysis-reusable.yaml | 2 +-
.github/workflows/deploy-release-reusable.yaml | 2 +-
.github/workflows/deploy-snapshot-reusable.yaml | 2 +-
.github/workflows/merge-dependabot-reusable.yaml| 2 +-
src/changelog/.10.x.x/update_actions_setup_java.xml | 8
src/site/_release-notes/_10.x.x.adoc| 1 +
7 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build-reusable.yaml
b/.github/workflows/build-reusable.yaml
index db106cb..41c4d97 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -49,7 +49,7 @@ jobs:
ref: ${{ github.event_name == 'pull_request_target' &&
github.head_ref || github.ref }}
- name: Set up Java
-uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
3.7.0
+uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #
3.7.0
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/codeql-analysis-reusable.yaml
b/.github/workflows/codeql-analysis-reusable.yaml
index 42b269c..2d8be81 100644
--- a/.github/workflows/codeql-analysis-reusable.yaml
+++ b/.github/workflows/codeql-analysis-reusable.yaml
@@ -48,7 +48,7 @@ jobs:
languages: ${{ inputs.language }}
- name: Setup JDK
-uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
3.13.0
+uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #
4.0.0
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/deploy-release-reusable.yaml
b/.github/workflows/deploy-release-reusable.yaml
index 1e6d6ac..833ffc7 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -66,7 +66,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #
4.1.1
- name: Set up Java & GPG
-uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
3.7.0
+uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #
3.7.0
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/deploy-snapshot-reusable.yaml
b/.github/workflows/deploy-snapshot-reusable.yaml
index e4f9918..7e76c08 100644
--- a/.github/workflows/deploy-snapshot-reusable.yaml
+++ b/.github/workflows/deploy-snapshot-reusable.yaml
@@ -41,7 +41,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #
4.1.1
- name: Set up Java
-uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
3.7.0
+uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #
3.7.0
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
diff --git a/.github/workflows/merge-dependabot-reusable.yaml
b/.github/workflows/merge-dependabot-reusable.yaml
index 8abb2f0..a1963f0 100644
--- a/.github/workflows/merge-dependabot-reusable.yaml
+++ b/.github/workflows/merge-dependabot-reusable.yaml
@@ -71,7 +71,7 @@ jobs:
run: git apply /tmp/patch
- name: Set up Java & GPG
-uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
3.13.0
+uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #
4.0.0
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
diff --git a/src/changelog/.10.x.x/update_actions_setup_java.xml
b/src/changelog/.10.x.x/update_actions_setup_java.xml
new file mode 100644
index 000..bf3287a
--- /dev/null
+++ b/src/changelog/.10.x.x/update_actions_setup_java.xml
@@ -0,0 +1,8 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+ xmlns="http://logging.apache.org/log4j/changelog;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ type="changed">
+ https://github.com/apache/logging-parent/pull/67"/>
+ Update `actions/setup-java` to version
`4.0.0`
+
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index 5cf7e17..4ae40ef 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++
(logging-parent) branch dependabot/github_actions/actions/setup-java-4.0.0 created (now d3c24f6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/setup-java-4.0.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at d3c24f6 Bump actions/setup-java from 3.13.0 to 4.0.0 No new revisions were added by this update.
(logging-log4j2) branch dependabot/maven/main/logback.version-1.4.13 created (now c2896b47f4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/logback.version-1.4.13 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at c2896b47f4 Bump logback.version from 1.4.11 to 1.4.13 No new revisions were added by this update.
