(logging-log4cxx) branch declutter_examples_more deleted (was 3b575cc1)

2023-12-12 Thread swebb2066 
This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a change to branch declutter_examples_more
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


 was 3b575cc1 Simplify console example

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: Simplify console example (#314)

2023-12-12 Thread swebb2066 
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 81afa8e9 Simplify console example (#314)
81afa8e9 is described below

commit 81afa8e944eab76df359626748ce952125c1021c
Author: Stephen Webb 
AuthorDate: Wed Dec 13 13:48:09 2023 +1100

Simplify console example (#314)
---
 src/examples/cpp/console.cpp | 15 +++
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
index 99e5ab76..d0688a42 100644
--- a/src/examples/cpp/console.cpp
+++ b/src/examples/cpp/console.cpp
@@ -15,20 +15,14 @@
  * limitations under the License.
  */
 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
+#include 
 #include 
-#ifndef WIN32
-#include 
-#endif
+#include 
+#include 
 
 /**
  *   Configures console appender.
@@ -43,9 +37,6 @@ static void configure(bool err)
 ( std::make_shared()
 , err ? ConsoleAppender::getSystemErr() : 
ConsoleAppender::getSystemOut()
 );
-appender->setName(LOG4CXX_STR("console"));
-helpers::Pool pool;
-appender->activateOptions(pool);
 r->getRootLogger()->addAppender(appender);
 });
 }

(logging-log4cxx) branch declutter_examples_more created (now 3b575cc1)

2023-12-12 Thread swebb2066 
This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a change to branch declutter_examples_more
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


  at 3b575cc1 Simplify console example

This branch includes the following new commits:

 new 3b575cc1 Simplify console example

The 1 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-log4cxx) 01/01: Simplify console example

2023-12-12 Thread swebb2066 
This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a commit to branch declutter_examples_more
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit 3b575cc1beb391ade91f76e839dc460157726039
Author: Stephen Webb 
AuthorDate: Wed Dec 13 13:23:01 2023 +1100

Simplify console example
---
 src/examples/cpp/console.cpp | 15 +++
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
index 99e5ab76..d0688a42 100644
--- a/src/examples/cpp/console.cpp
+++ b/src/examples/cpp/console.cpp
@@ -15,20 +15,14 @@
  * limitations under the License.
  */
 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
+#include 
 #include 
-#ifndef WIN32
-#include 
-#endif
+#include 
+#include 
 
 /**
  *   Configures console appender.
@@ -43,9 +37,6 @@ static void configure(bool err)
 ( std::make_shared()
 , err ? ConsoleAppender::getSystemErr() : 
ConsoleAppender::getSystemOut()
 );
-appender->setName(LOG4CXX_STR("console"));
-helpers::Pool pool;
-appender->activateOptions(pool);
 r->getRootLogger()->addAppender(appender);
 });
 }

(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot

2023-12-12 Thread git-site-role 
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 0287b02e Automatic Site Publish by Buildbot
0287b02e is described below

commit 0287b02e3411f1b309f4f286590e69e186c7ad06
Author: buildbot 
AuthorDate: Tue Dec 12 23:30:29 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 6f2e7625..e77bc412 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-12-05T20:00:19+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-12-12T23:30:28+00:00/feed.xmlApache Software Foundation - Logging 
ServicesWrite an awesome description for your new site here. 
You can edit this line in _ [...]
 
 https://commons.apache.org/proper/commons-logging/;>Apache Commons 
Logging (JCL) is one of the oldest Java logging API
 available.

(logging-site) branch jekyll updated: rescheduled to monday

2023-12-12 Thread grobmeier 
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 77315f93 rescheduled to monday
77315f93 is described below

commit 77315f93e3dcd20fb8d9639099c060a652d3ac87
Author: Christian Grobmeier 
AuthorDate: Wed Dec 13 00:30:10 2023 +0100

rescheduled to monday
---
 ...7-20-years-of-innovation.md => 2023-12-18-20-years-of-innovation.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_posts/2023-12-17-20-years-of-innovation.md 
b/_posts/2023-12-18-20-years-of-innovation.md
similarity index 97%
rename from _posts/2023-12-17-20-years-of-innovation.md
rename to _posts/2023-12-18-20-years-of-innovation.md
index 5ccd074d..c78ab296 100644
--- a/_posts/2023-12-17-20-years-of-innovation.md
+++ b/_posts/2023-12-18-20-years-of-innovation.md
@@ -28,7 +28,7 @@ type: post
 
 # Two Decades of Apache Log4j: A Journey of Resilience and Innovation
 
-Today, December 17 2023 marks a significant milestone for the Apache Logging 
Services project, 
+Today, December 17, 2023 marks a significant milestone for the Apache Logging 
Services project, 
 as we celebrate 20 years since the inception of Log4j 1. This journey, 
spanning two
 decades, has been one of constant evolution, growth, and community spirit.

(logging-log4j-tools) branch doc-reference updated (01554b2 -> 5945f32)

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a change to branch doc-reference
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git


from 01554b2  Simplify POMs
 add 5945f32  Remove explicit version

No new revisions were added by this update.

Summary of changes:
 log4j-docgen/pom.xml | 1 -
 1 file changed, 1 deletion(-)

svn commit: r66012 - /dev/logging/log4j-kotlin/

2023-12-12 Thread svc_dist_logging 
Author: svc_dist_logging
Date: Tue Dec 12 19:59:57 2023
New Revision: 66012

Log:
Added `apache-log4j-kotlin` artifacts for release `1.4.0`

Added:
dev/logging/log4j-kotlin/
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip   (with props)
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.asc
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.sha512
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-announce.txt
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-vote.txt
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-site.zip   (with props)
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-src.zip   (with props)
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-src.zip.asc
dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-src.zip.sha512

Added: dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip
==
Binary file - no diff available.

Propchange: dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip
--
svn:mime-type = application/octet-stream

Added: dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.asc
==
--- dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.asc (added)
+++ dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.asc Tue Dec 12 
19:59:57 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmV4u7oACgkQVuc7qaC1
+ktBS8w//ZBYOF3LlkQi6r1z1EgcvLJSUZk1LxoyZJ46LmPtEE9OL+YMzu7Tu4pPI
+Y3tJsgGQHLM3xR1J9hTa/biqvHYK1kqtOlXM3UVqKVUe/bZWA1xw5+13haoglYDk
+K9vU0jo3phdnWC/5zm2GBPpORRzC/C1tq5cSxplF6Auf/46dWMyHdcEJhruzwo7F
+KqOOhJDP4THO1+1Ia5ppXyrdhHCUrPVhBAOqiwpEn/sDpT99qGDplE9HD4n8PO0f
+K5evMKp0hYGdh+BKq3nb2sVunEBpSr8foO103g1wC8iEkY62Rq4TQ3GeYPmHZdUt
+WifFDGY4sjgr4u+9oWmix0+G+15+MIKrRPLxh4qzDXCI3kDtd3dUEKuigjFoPZI4
++jWZyViAAb6lX5axEQfoCZNrtGmV1f5bsmNmE2x+4A6/MmdpmvHUh4TN6z6wXnkn
+aTWiEsAQowRh+K1IPBYvzSKa47bFTseCv56TikRCBMOBisSqyqS+txlpL1zNBgfR
+dLqqmZ/pkUmKkbOKGw2rjjZri/sR3j7WfEKxO7Hpg9kvbjGXeNDBgrWmrCJ51iM4
+KY+82WB22nX4buwfKmNKFDbfXYJ6UAeRFYQnaTex0bCs9F6lBtK6ysVgOVcVUSP0
+H0RbUo6SblpeHQOvT84+wJEbsphkKB1OZFCnhi7VIiLbKF65mfQ=
+=K1Sv
+-END PGP SIGNATURE-

Added: dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.sha512
==
--- dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.sha512 (added)
+++ dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-bin.zip.sha512 Tue Dec 
12 19:59:57 2023
@@ -0,0 +1 @@
+13dd249cca687081c427877c18aa08821f7706628a9af657f7fe72c67c4378e3e491f3867509f6fe78c29647ab0675a3db41b92984fd38496634f85fd41db5e0
  apache-log4j-kotlin-1.4.0-bin.zip

Added: dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-announce.txt
==
--- dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-announce.txt 
(added)
+++ dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-announce.txt Tue 
Dec 12 19:59:57 2023
@@ -0,0 +1,28 @@
+To: log4j-u...@logging.apache.org, d...@logging.apache.org
+Title: [ANNOUNCE] Apache Log4j Kotlin API 1.4.0 released
+
+Apache Log4j Kotlin API team is pleased to announce the 1.4.0
+release. This project contains a Kotlin-friendly interface to log
+against the Log4j API. For further information (support, download,
+etc.) see the project website[1].
+
+[1] https://logging.apache.org/log4j/kotlin
+
+=== Release Notes
+
+This minor release fixes incorrect coroutine context map and stack.
+
+
+ Added
+
+* Started generating CycloneDX SBOM with the recent update of `logging-parent` 
to version `10.2.0`
+
+ Changed
+
+* Coroutine context is not cleared properly, only appended to (#54)
+* Update `org.apache.logging:logging-parent` to version `10.2.0`
+* Update `org.apache.logging.log4j:log4j-bom` to version `2.22.0` (#52)
+* Update `org.apache.logging:logging-parent` to version `10.4.0` (#53)
+* Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0` (#51)
+* Update `org.codehaus.mojo:exec-maven-plugin` to version `3.1.1` (#50)
+* Update `org.junit:junit-bom` to version `5.10.1` (#49)

Added: dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-vote.txt
==
--- dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-vote.txt (added)
+++ dev/logging/log4j-kotlin/apache-log4j-kotlin-1.4.0-email-vote.txt Tue Dec 
12 19:59:57 2023
@@ -0,0 +1,64 @@
+To: d...@logging.apache.org
+Title: [VOTE] Release Apache Log4j Kotlin API 1.4.0
+
+This is a vote to release the Apache Log4j Kotlin API 1.4.0.
+
+Website: https://logging.staged.apache.org/log4j/kotlin
+GitHub: https://github.com/apache/logging-log4j-kotlin
+Commit:

(logging-log4j-kotlin) 01/01: Update the `project.build.outputTimestamp` property

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git

commit bc5b26948bd62b035b941b54fc2b24167f986d48
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 12 19:57:58 2023 +

Update the `project.build.outputTimestamp` property
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82d886c..162ff26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
  2. This value is employed in various places while creating the 
distribution
  To mitigate these, we define a *dummy* value here and let the CI 
replace it during a release.
  Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-
2023-12-12T12:22:51Z
+
2023-12-12T19:06:18Z
 
 
 true

(logging-log4j-kotlin) branch release/1.4.0 updated (a766e4c -> bc5b269)

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


 discard a766e4c  Update the `project.build.outputTimestamp` property
 new bc5b269  Update the `project.build.outputTimestamp` property

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a766e4c)
\
 N -- N -- N   refs/heads/release/1.4.0 (bc5b269)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:

(logging-log4j-kotlin) branch release/1.4.0 updated: Update the `project.build.outputTimestamp` property

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


The following commit(s) were added to refs/heads/release/1.4.0 by this push:
 new a766e4c  Update the `project.build.outputTimestamp` property
a766e4c is described below

commit a766e4cdef8400c49b044a67a1c969d2ff413d83
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 12 19:12:07 2023 +

Update the `project.build.outputTimestamp` property
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82d886c..162ff26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
  2. This value is employed in various places while creating the 
distribution
  To mitigate these, we define a *dummy* value here and let the CI 
replace it during a release.
  Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-
2023-12-12T12:22:51Z
+
2023-12-12T19:06:18Z
 
 
 true

(logging-log4j-kotlin) branch release/1.4.0 updated: Remove redundant CI args

2023-12-12 Thread vy 
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


The following commit(s) were added to refs/heads/release/1.4.0 by this push:
 new 22769f6  Remove redundant CI args
22769f6 is described below

commit 22769f6be6e8ef289e4b3fa6725f53c23b6b49a8
Author: Volkan Yazıcı 
AuthorDate: Tue Dec 12 20:06:18 2023 +0100

Remove redundant CI args
---
 .github/workflows/build.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6828967..12d7b1f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -67,7 +67,4 @@ jobs:
   contents: write
 with:
   project-id: log4j-kotlin
-  distribution-attachment-filepath-pattern: |-
-'^.*/target/log4j-api-kotlin-'${PROJECT_VERSION}'\\.jar$'
-  distribution-attachment-count: 1
   site-enabled: true

(logging-chainsaw) 02/02: fixed variable name and typos in javadoc

2023-12-12 Thread grobmeier 
This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git

commit f6a504d0051faa7b67f4e9f894d4e8da062efd88
Author: Christian Grobmeier 
AuthorDate: Tue Dec 12 16:14:37 2023 +0100

fixed variable name and typos in javadoc
---
 src/main/java/org/apache/log4j/chainsaw/LogUI.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 8bcba66..65dad18 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -152,13 +152,13 @@ public class LogUI extends JFrame {
 
 
 /**
- * Registers a ShutdownListener with this calss so that it can be notified
+ * Registers a ShutdownListener with this class so that it can be notified
  * when the user has requested that Chainsaw exit.
  *
- * @param l
+ * @param listener the listener to add
  */
-public void addShutdownListener(ShutdownListener l) {
-shutdownListenerList.add(ShutdownListener.class, l);
+public void addShutdownListener(ShutdownListener listener) {
+shutdownListenerList.add(ShutdownListener.class, listener);
 }
 
 /**

(logging-chainsaw) 01/02: reordered members

2023-12-12 Thread grobmeier 
This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git

commit 3a33ac04188cd8f3b23299b018ef3048174ab3e1
Author: Christian Grobmeier 
AuthorDate: Tue Dec 12 16:14:27 2023 +0100

reordered members
---
 src/main/java/org/apache/log4j/chainsaw/LogUI.java | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index eb0a44a..8bcba66 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -89,34 +89,38 @@ public class LogUI extends JFrame {
 private static final String MAIN_WINDOW_X = "main.window.x";
 
 private static final double DEFAULT_MAIN_RECEIVER_SPLIT_LOCATION = 0.85d;
+
+/* Panels / Views */
 private final JFrame preferencesFrame = new JFrame();
 private ReceiversPanel receiversPanel;
+private WelcomePanel welcomePanel;
 private ChainsawTabbedPane tabbedPane;
+private ChainsawAbout aboutBox;
+public TutorialFrame tutorialFrame;
+private JSplitPane mainReceiverSplitPane;
+private final List identifierPanels = new ArrayList<>();
+
+
 private JToolBar toolbar;
+private ChainsawToolBarAndMenus chainsawToolBarAndMenus;
 private ChainsawStatusBar statusBar;
 private ApplicationPreferenceModelPanel applicationPreferenceModelPanel;
 private final List filterableColumns = new ArrayList<>();
 private final Map panelMap = new HashMap<>();
 public ChainsawAppender chainsawAppender;
-private ChainsawToolBarAndMenus chainsawToolBarAndMenus;
-private ChainsawAbout aboutBox;
 private SettingsManager settingsManager;
-public TutorialFrame tutorialFrame;
-private JSplitPane mainReceiverSplitPane;
 private double lastMainReceiverSplitLocation = 
DEFAULT_MAIN_RECEIVER_SPLIT_LOCATION;
-private final List identifierPanels = new ArrayList<>();
 private int dividerSize;
 public int cyclicBufferSize;
 private List receivers = new ArrayList<>();
 private List receiverListeners = new ArrayList<>();
 private ZeroConfPlugin zeroConf = new ZeroConfPlugin(settingsManager);
-
+
 /**
  * Clients can register a ShutdownListener to be notified when the user has
  * requested Chainsaw to exit.
  */
 private EventListenerList shutdownListenerList = new EventListenerList();
-private WelcomePanel welcomePanel;
 
 //map of tab names to rulecolorizers
 private Map allColorizers = new HashMap<>();

(logging-chainsaw) branch master updated (1bdce45 -> f6a504d)

2023-12-12 Thread grobmeier 
This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git


from 1bdce45  removed unused initializationLock
 new 3a33ac0  reordered members
 new f6a504d  fixed variable name and typos in javadoc

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:
 src/main/java/org/apache/log4j/chainsaw/LogUI.java | 26 +-
 1 file changed, 15 insertions(+), 11 deletions(-)

(logging-chainsaw) branch master updated: removed unused initializationLock

2023-12-12 Thread grobmeier 
This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git


The following commit(s) were added to refs/heads/master by this push:
 new 1bdce45  removed unused initializationLock
1bdce45 is described below

commit 1bdce4580fa1f0bf3814bd66c3b8bb69ebeaf159
Author: Christian Grobmeier 
AuthorDate: Tue Dec 12 16:10:40 2023 +0100

removed unused initializationLock
---
 src/main/java/org/apache/log4j/chainsaw/LogUI.java | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 336c22b..eb0a44a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -110,9 +110,7 @@ public class LogUI extends JFrame {
 private List receivers = new ArrayList<>();
 private List receiverListeners = new ArrayList<>();
 private ZeroConfPlugin zeroConf = new ZeroConfPlugin(settingsManager);
-
-private final Object initializationLock = new Object();
-
+
 /**
  * Clients can register a ShutdownListener to be notified when the user has
  * requested Chainsaw to exit.
@@ -547,10 +545,6 @@ public class LogUI extends JFrame {
 hideReceiverPanel();
 }
 
-synchronized (initializationLock) {
-initializationLock.notifyAll();
-}
-
 /*
  * loads the saved tab settings and if there are hidden tabs,
  * hide those tabs out of currently loaded tabs..

(logging-chainsaw) branch master updated: removed unnecessary setter for tabbed pane

2023-12-12 Thread grobmeier 
This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git


The following commit(s) were added to refs/heads/master by this push:
 new 2433395  removed unnecessary setter for tabbed pane
2433395 is described below

commit 2433395662db85903d6ae2953c712c1d7a8d54e4
Author: Christian Grobmeier 
AuthorDate: Tue Dec 12 16:05:17 2023 +0100

removed unnecessary setter for tabbed pane
---
 src/main/java/org/apache/log4j/chainsaw/LogUI.java | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 900e19f..336c22b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -173,7 +173,7 @@ public class LogUI extends JFrame {
 toolbar = getToolBarAndMenus().getToolbar();
 setJMenuBar(getToolBarAndMenus().getMenubar());
 
-setTabbedPane(new ChainsawTabbedPane());
+tabbedPane = new ChainsawTabbedPane();
 
 /**
  * This adds Drag & Drop capability to Chainsaw
@@ -824,15 +824,6 @@ public class LogUI extends JFrame {
 return chainsawToolBarAndMenus;
 }
 
-/**
- * DOCUMENT ME!
- *
- * @param tabbedPane DOCUMENT ME!
- */
-public void setTabbedPane(ChainsawTabbedPane tabbedPane) {
-this.tabbedPane = tabbedPane;
-}
-
 /**
  * DOCUMENT ME!
  *

(logging-chainsaw) branch master updated: removed unused events list

2023-12-12 Thread grobmeier 
This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git


The following commit(s) were added to refs/heads/master by this push:
 new 8a73bca  removed unused events list
8a73bca is described below

commit 8a73bcafa67f4782ad0461b98343a570ebc2223c
Author: Christian Grobmeier 
AuthorDate: Tue Dec 12 16:03:24 2023 +0100

removed unused events list
---
 src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java |  3 ++-
 src/main/java/org/apache/log4j/chainsaw/LogUI.java   | 11 ---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
index ec9d8a0..5f31e45 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
@@ -1,15 +1,16 @@
 package org.apache.log4j.chainsaw;
 
 import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.log4j.chainsaw.components.splash.SplashViewer;
 import org.apache.log4j.chainsaw.osx.OSXIntegration;
 import org.apache.log4j.chainsaw.prefs.SettingsManager;
+import org.apache.log4j.chainsaw.components.splash.SplashViewer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
 import java.security.AllPermission;
 import java.security.CodeSource;
 import java.security.PermissionCollection;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 0b4fd34..900e19f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -301,8 +301,7 @@ public class LogUI extends JFrame {
 }
 
 public void buildChainsawLogPanel() {
-List events = new ArrayList<>();
-buildLogPanel(false, "Chainsaw", events, 
chainsawAppender.getReceiver());
+buildLogPanel(false, "Chainsaw", chainsawAppender.getReceiver());
 }
 
 /**
@@ -844,8 +843,7 @@ public class LogUI extends JFrame {
 }
 
 
-private void buildLogPanel(
-boolean customExpression, final String ident, final 
List events, final ChainsawReceiver rx)
+private void buildLogPanel(boolean customExpression, final String ident, 
final ChainsawReceiver rx)
 throws IllegalArgumentException {
 final LogPanel thisPanel = new LogPanel(settingsManager, 
getStatusBar(), ident, cyclicBufferSize, allColorizers, globalRuleColorizer);
 
@@ -931,7 +929,7 @@ public class LogUI extends JFrame {
 }
 }
 
-buildLogPanel(true, ident, list, null);
+buildLogPanel(true, ident, null);
 } catch (IllegalArgumentException iae) {
 statusBar.setMessage(
 "Unable to add tab using expression: " + ident + ", reason: "
@@ -1004,8 +1002,7 @@ public class LogUI extends JFrame {
 
 public void addReceiver(ChainsawReceiver rx) {
 receivers.add(rx);
-List list = new ArrayList<>();
-buildLogPanel(false, rx.getName(), list, rx);
+buildLogPanel(false, rx.getName(), rx);
 
 for (ReceiverEventListener listen : receiverListeners) {
 listen.receiverAdded(rx);

(logging-log4j-kotlin) branch release/1.4.0 updated: Release changelog for version `1.4.0`

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


The following commit(s) were added to refs/heads/release/1.4.0 by this push:
 new 362ba58  Release changelog for version `1.4.0`
362ba58 is described below

commit 362ba58e7b2b03619adf3e516e636a1123ac1785
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 12 12:26:45 2023 +

Release changelog for version `1.4.0`
---
 src/changelog/1.4.0/.release.xml|  2 +-
 src/changelog/{.1.x.x => 1.4.0}/add-sbom.xml|  0
 src/changelog/{.1.x.x => 1.4.0}/update-parent.xml   |  0
 .../update_org_apache_logging_log4j_log4j_bom.xml   |  0
 .../update_org_apache_logging_logging_parent.xml|  0
 .../update_org_codehaus_mojo_build_helper_maven_plugin.xml  |  0
 .../update_org_codehaus_mojo_exec_maven_plugin.xml  |  0
 .../{.1.x.x => 1.4.0}/update_org_junit_junit_bom.xml|  0
 src/site/_release-notes.adoc|  1 -
 src/site/_release-notes/_1.4.0.adoc | 12 +++-
 src/site/_release-notes/_1.x.x.adoc | 13 -
 11 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/changelog/1.4.0/.release.xml b/src/changelog/1.4.0/.release.xml
index 8cd9890..be63ef4 100644
--- a/src/changelog/1.4.0/.release.xml
+++ b/src/changelog/1.4.0/.release.xml
@@ -18,4 +18,4 @@
 http://logging.apache.org/log4j/changelog;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
- date="2023-12-11" version="1.4.0"/>
+ date="2023-12-12" version="1.4.0"/>
diff --git a/src/changelog/.1.x.x/add-sbom.xml 
b/src/changelog/1.4.0/add-sbom.xml
similarity index 100%
rename from src/changelog/.1.x.x/add-sbom.xml
rename to src/changelog/1.4.0/add-sbom.xml
diff --git a/src/changelog/.1.x.x/update-parent.xml 
b/src/changelog/1.4.0/update-parent.xml
similarity index 100%
rename from src/changelog/.1.x.x/update-parent.xml
rename to src/changelog/1.4.0/update-parent.xml
diff --git a/src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml 
b/src/changelog/1.4.0/update_org_apache_logging_log4j_log4j_bom.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml
rename to src/changelog/1.4.0/update_org_apache_logging_log4j_log4j_bom.xml
diff --git a/src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml 
b/src/changelog/1.4.0/update_org_apache_logging_logging_parent.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml
rename to src/changelog/1.4.0/update_org_apache_logging_logging_parent.xml
diff --git 
a/src/changelog/.1.x.x/update_org_codehaus_mojo_build_helper_maven_plugin.xml 
b/src/changelog/1.4.0/update_org_codehaus_mojo_build_helper_maven_plugin.xml
similarity index 100%
rename from 
src/changelog/.1.x.x/update_org_codehaus_mojo_build_helper_maven_plugin.xml
rename to 
src/changelog/1.4.0/update_org_codehaus_mojo_build_helper_maven_plugin.xml
diff --git 
a/src/changelog/.1.x.x/update_org_codehaus_mojo_exec_maven_plugin.xml 
b/src/changelog/1.4.0/update_org_codehaus_mojo_exec_maven_plugin.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_codehaus_mojo_exec_maven_plugin.xml
rename to src/changelog/1.4.0/update_org_codehaus_mojo_exec_maven_plugin.xml
diff --git a/src/changelog/.1.x.x/update_org_junit_junit_bom.xml 
b/src/changelog/1.4.0/update_org_junit_junit_bom.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_junit_junit_bom.xml
rename to src/changelog/1.4.0/update_org_junit_junit_bom.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 455b48a..020fcc5 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,6 @@
 [#release-notes]
 == Release Notes
 
-include::_release-notes/_1.x.x.adoc[]
 include::_release-notes/_1.4.0.adoc[]
 include::_release-notes/_1.3.0.adoc[]
 include::_release-notes/_1.2.0.adoc[]
diff --git a/src/site/_release-notes/_1.4.0.adoc 
b/src/site/_release-notes/_1.4.0.adoc
index 3d48343..94cf1dc 100644
--- a/src/site/_release-notes/_1.4.0.adoc
+++ b/src/site/_release-notes/_1.4.0.adoc
@@ -36,11 +36,21 @@
 [#release-notes-1-4-0]
 === 1.4.0
 
-Release date:: 2023-12-11
+Release date:: 2023-12-12
 
 This minor release fixes incorrect coroutine context map and stack.
 
 
+ Added
+
+* Started generating CycloneDX SBOM with the recent update of `logging-parent` 
to version `10.2.0`
+
  Changed
 
 * Coroutine context is not cleared properly, only appended to 
(https://github.com/apache/logging-log4j-kotlin/issues/54[54])
+* Update `org.apache.logging:logging-parent` to version `10.2.0`
+*

(logging-log4j-kotlin) branch release/1.4.0 updated (927aa7f -> 1d49f2b)

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


 discard 927aa7f  Release changelog for version `1.4.0`
 discard 797eabb  Update the `project.build.outputTimestamp` property
 discard 76c02ab  Changelog for `1.4.0`
 add 7ab77bd  Changelog for `1.4.0`
 new 1d49f2b  Update the `project.build.outputTimestamp` property

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (927aa7f)
\
 N -- N -- N   refs/heads/release/1.4.0 (1d49f2b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:
 pom.xml |  2 +-
 src/changelog/{1.4.0 => .1.x.x}/add-sbom.xml|  0
 src/changelog/{1.4.0 => .1.x.x}/update-parent.xml   |  0
 .../update_org_apache_logging_log4j_log4j_bom.xml   |  0
 .../update_org_apache_logging_logging_parent.xml|  0
 .../update_org_codehaus_mojo_build_helper_maven_plugin.xml  |  0
 .../update_org_codehaus_mojo_exec_maven_plugin.xml  |  0
 .../{1.4.0 => .1.x.x}/update_org_junit_junit_bom.xml|  0
 src/changelog/1.4.0/.release.xml|  2 +-
 src/changelog/1.4.0/54-thread-context.xml   |  1 -
 src/site/_release-notes.adoc|  1 +
 src/site/_release-notes/_1.4.0.adoc | 12 +---
 src/site/_release-notes/_1.x.x.adoc | 13 +
 13 files changed, 17 insertions(+), 14 deletions(-)
 rename src/changelog/{1.4.0 => .1.x.x}/add-sbom.xml (100%)
 rename src/changelog/{1.4.0 => .1.x.x}/update-parent.xml (100%)
 rename src/changelog/{1.4.0 => 
.1.x.x}/update_org_apache_logging_log4j_log4j_bom.xml (100%)
 rename src/changelog/{1.4.0 => 
.1.x.x}/update_org_apache_logging_logging_parent.xml (100%)
 rename src/changelog/{1.4.0 => 
.1.x.x}/update_org_codehaus_mojo_build_helper_maven_plugin.xml (100%)
 rename src/changelog/{1.4.0 => 
.1.x.x}/update_org_codehaus_mojo_exec_maven_plugin.xml (100%)
 rename src/changelog/{1.4.0 => .1.x.x}/update_org_junit_junit_bom.xml (100%)

(logging-log4j-kotlin) 01/01: Update the `project.build.outputTimestamp` property

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git

commit 1d49f2b37319211971f0c89946f2a10d8657d96a
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 12 12:26:37 2023 +

Update the `project.build.outputTimestamp` property
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a6d3f46..82d886c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
  2. This value is employed in various places while creating the 
distribution
  To mitigate these, we define a *dummy* value here and let the CI 
replace it during a release.
  Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-
2023-11-17T08:52:06Z
+
2023-12-12T12:22:51Z
 
 
 true

(logging-log4j-kotlin) 01/02: Changelog for `1.4.0`

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git

commit 76c02ab7f8150c643d02c5c272b4fd5b19e50a82
Author: Raman Gupta 
AuthorDate: Wed Dec 6 19:15:37 2023 -0500

Changelog for `1.4.0`
---
 .../1.4.0/.release-notes.adoc.ftl} | 24 +--
 src/changelog/1.4.0/.release.xml   | 21 +
 src/changelog/1.4.0/54-thread-context.xml  |  8 +++
 src/site/_constants.adoc   |  2 +-
 src/site/_release-notes.adoc   |  1 +
 .../_1.4.0.adoc}   | 27 --
 6 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/src/site/_release-notes.adoc 
b/src/changelog/1.4.0/.release-notes.adoc.ftl
similarity index 70%
copy from src/site/_release-notes.adoc
copy to src/changelog/1.4.0/.release-notes.adoc.ftl
index 2a90e46..ee1bac3 100644
--- a/src/site/_release-notes.adoc
+++ b/src/changelog/1.4.0/.release-notes.adoc.ftl
@@ -6,7 +6,7 @@
 (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
+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,
@@ -22,22 +22,22 @@
 ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ████
  ███ ███  ██   ██ ██   ██ ██    ██ ██     ██  ██
 
-IF THIS FILE IS CALLED `index.adoc`, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT 
EDIT IT!
 
-Release notes `index.adoc` is generated from 
`src/changelog/.index.adoc.ftl`.
+Version-specific release notes (`7.8.0.adoc`, etc.) are generated from 
`src/changelog/*/.release-notes.adoc.ftl`.
 Auto-generation happens during `generate-sources` phase of Maven.
 Hence, you must always
 
-1. Edit `.index.adoc.ftl`
+1. Find and edit the associated `.release-notes.adoc.ftl`
 2. Run `./mvnw generate-sources`
-3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
+3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
 
 
-[#release-notes]
-== Release Notes
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
 
-include::_release-notes/_1.x.x.adoc[]
-include::_release-notes/_1.3.0.adoc[]
-include::_release-notes/_1.2.0.adoc[]
-include::_release-notes/_1.1.0.adoc[]
-include::_release-notes/_1.0.0.adoc[]
+<#if release.date?has_content>Release date:: ${release.date}
+
+This minor release fixes incorrect coroutine context map and stack.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/1.4.0/.release.xml b/src/changelog/1.4.0/.release.xml
new file mode 100644
index 000..8cd9890
--- /dev/null
+++ b/src/changelog/1.4.0/.release.xml
@@ -0,0 +1,21 @@
+
+
+http://logging.apache.org/log4j/changelog;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ date="2023-12-11" version="1.4.0"/>
diff --git a/src/changelog/1.4.0/54-thread-context.xml 
b/src/changelog/1.4.0/54-thread-context.xml
new file mode 100644
index 000..7bed0bd
--- /dev/null
+++ b/src/changelog/1.4.0/54-thread-context.xml
@@ -0,0 +1,8 @@
+http://logging.apache.org/log4j/changelog;
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+   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-kotlin/issues/54"/>
+  
+  Coroutine context is not cleared properly, 
only appended to
+
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index 306ee4b..1a67916 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
 
 
 :project-github-url: https://github.com/apache/logging-log4j-kotlin
-:project-version: 1.4.0-SNAPSHOT
+:project-version: 1.4.0
 :project-name: Log4j Kotlin API
 :project-id: log4j-kotlin
 :java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 2a90e46..455b48a 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -37,6 +37,7 @@
 == Release Notes
 
 include::_release-notes/_1.x.x.adoc[]
+include::_release-notes/_1.4.0.adoc[]
 include::_release-notes/_1.3.0.adoc[]
 include::_release-notes/_1.2.0.adoc[]
 include::_release-notes/_1.1.0.adoc[]
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes/_1.4.0.adoc
similarity index 70%
copy from src/site/_release-notes.adoc
copy to

(logging-log4j-kotlin) branch release/1.4.0 updated: Release changelog for version `1.4.0`

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


The following commit(s) were added to refs/heads/release/1.4.0 by this push:
 new 927aa7f  Release changelog for version `1.4.0`
927aa7f is described below

commit 927aa7fab9cc5673a464b924278d6f1a140ebae8
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 12 12:24:56 2023 +

Release changelog for version `1.4.0`
---
 src/changelog/1.4.0/.release.xml|  2 +-
 src/changelog/{.1.x.x => 1.4.0}/add-sbom.xml|  0
 src/changelog/{.1.x.x => 1.4.0}/update-parent.xml   |  0
 .../update_org_apache_logging_log4j_log4j_bom.xml   |  0
 .../update_org_apache_logging_logging_parent.xml|  0
 .../update_org_codehaus_mojo_build_helper_maven_plugin.xml  |  0
 .../update_org_codehaus_mojo_exec_maven_plugin.xml  |  0
 .../{.1.x.x => 1.4.0}/update_org_junit_junit_bom.xml|  0
 src/site/_release-notes.adoc|  1 -
 src/site/_release-notes/_1.4.0.adoc | 12 +++-
 src/site/_release-notes/_1.x.x.adoc | 13 -
 11 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/changelog/1.4.0/.release.xml b/src/changelog/1.4.0/.release.xml
index 8cd9890..be63ef4 100644
--- a/src/changelog/1.4.0/.release.xml
+++ b/src/changelog/1.4.0/.release.xml
@@ -18,4 +18,4 @@
 http://logging.apache.org/log4j/changelog;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
- date="2023-12-11" version="1.4.0"/>
+ date="2023-12-12" version="1.4.0"/>
diff --git a/src/changelog/.1.x.x/add-sbom.xml 
b/src/changelog/1.4.0/add-sbom.xml
similarity index 100%
rename from src/changelog/.1.x.x/add-sbom.xml
rename to src/changelog/1.4.0/add-sbom.xml
diff --git a/src/changelog/.1.x.x/update-parent.xml 
b/src/changelog/1.4.0/update-parent.xml
similarity index 100%
rename from src/changelog/.1.x.x/update-parent.xml
rename to src/changelog/1.4.0/update-parent.xml
diff --git a/src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml 
b/src/changelog/1.4.0/update_org_apache_logging_log4j_log4j_bom.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml
rename to src/changelog/1.4.0/update_org_apache_logging_log4j_log4j_bom.xml
diff --git a/src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml 
b/src/changelog/1.4.0/update_org_apache_logging_logging_parent.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml
rename to src/changelog/1.4.0/update_org_apache_logging_logging_parent.xml
diff --git 
a/src/changelog/.1.x.x/update_org_codehaus_mojo_build_helper_maven_plugin.xml 
b/src/changelog/1.4.0/update_org_codehaus_mojo_build_helper_maven_plugin.xml
similarity index 100%
rename from 
src/changelog/.1.x.x/update_org_codehaus_mojo_build_helper_maven_plugin.xml
rename to 
src/changelog/1.4.0/update_org_codehaus_mojo_build_helper_maven_plugin.xml
diff --git 
a/src/changelog/.1.x.x/update_org_codehaus_mojo_exec_maven_plugin.xml 
b/src/changelog/1.4.0/update_org_codehaus_mojo_exec_maven_plugin.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_codehaus_mojo_exec_maven_plugin.xml
rename to src/changelog/1.4.0/update_org_codehaus_mojo_exec_maven_plugin.xml
diff --git a/src/changelog/.1.x.x/update_org_junit_junit_bom.xml 
b/src/changelog/1.4.0/update_org_junit_junit_bom.xml
similarity index 100%
rename from src/changelog/.1.x.x/update_org_junit_junit_bom.xml
rename to src/changelog/1.4.0/update_org_junit_junit_bom.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 455b48a..020fcc5 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,6 @@
 [#release-notes]
 == Release Notes
 
-include::_release-notes/_1.x.x.adoc[]
 include::_release-notes/_1.4.0.adoc[]
 include::_release-notes/_1.3.0.adoc[]
 include::_release-notes/_1.2.0.adoc[]
diff --git a/src/site/_release-notes/_1.4.0.adoc 
b/src/site/_release-notes/_1.4.0.adoc
index 3d48343..94cf1dc 100644
--- a/src/site/_release-notes/_1.4.0.adoc
+++ b/src/site/_release-notes/_1.4.0.adoc
@@ -36,11 +36,21 @@
 [#release-notes-1-4-0]
 === 1.4.0
 
-Release date:: 2023-12-11
+Release date:: 2023-12-12
 
 This minor release fixes incorrect coroutine context map and stack.
 
 
+ Added
+
+* Started generating CycloneDX SBOM with the recent update of `logging-parent` 
to version `10.2.0`
+
  Changed
 
 * Coroutine context is not cleared properly, only appended to 
(https://github.com/apache/logging-log4j-kotlin/issues/54[54])
+* Update `org.apache.logging:logging-parent` to version `10.2.0`
+*

(logging-log4j-kotlin) branch release/1.4.0 updated (7ab77bd -> 797eabb)

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


omit 7ab77bd  Changelog for `1.4.0`
 new 76c02ab  Changelog for `1.4.0`
 new 797eabb  Update the `project.build.outputTimestamp` property

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7ab77bd)
\
 N -- N -- N   refs/heads/release/1.4.0 (797eabb)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 pom.xml   | 2 +-
 src/changelog/1.4.0/54-thread-context.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(logging-log4j-kotlin) 02/02: Update the `project.build.outputTimestamp` property

2023-12-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git

commit 797eabb47cea10447707e141d1ca708e499ae69b
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 12 12:24:49 2023 +

Update the `project.build.outputTimestamp` property
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a6d3f46..64cd0d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
  2. This value is employed in various places while creating the 
distribution
  To mitigate these, we define a *dummy* value here and let the CI 
replace it during a release.
  Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-
2023-11-17T08:52:06Z
+
2023-12-11T23:05:41Z
 
 
 true

(logging-log4j-kotlin) branch release/1.4.0 updated (76c02ab -> 7ab77bd)

2023-12-12 Thread rgupta 
This is an automated email from the ASF dual-hosted git repository.

rgupta pushed a change to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


 discard 76c02ab  Changelog for `1.4.0`
 add 7ab77bd  Changelog for `1.4.0`

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (76c02ab)
\
 N -- N -- N   refs/heads/release/1.4.0 (7ab77bd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/changelog/1.4.0/54-thread-context.xml | 1 -
 1 file changed, 1 deletion(-)

(logging-log4j-kotlin) branch release/1.4.0 created (now 76c02ab)

2023-12-12 Thread rgupta 
This is an automated email from the ASF dual-hosted git repository.

rgupta pushed a change to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


  at 76c02ab  Changelog for `1.4.0`

No new revisions were added by this update.

(logging-log4j-samples) branch main updated: Fix remaining formatting errors

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git


The following commit(s) were added to refs/heads/main by this push:
 new 299abc0  Fix remaining formatting errors
299abc0 is described below

commit 299abc03a89764db92418b34ca5f735996d701e1
Author: Spotless 
AuthorDate: Tue Dec 12 11:26:25 2023 +0100

Fix remaining formatting errors
---
 .../logging/log4j/samples/configuration/CustomConfiguration.java | 1 +
 .../log4j/samples/configuration/CustomConfigurationFactory.java  | 3 ++-
 .../org/apache/logging/log4j/samples/app/LogEventFactory.java| 1 +
 .../java/org/apache/logging/log4j/samples/app/LoggingApp.java| 3 ++-
 .../org/apache/logging/log4j/samples/app/LoggingController.java  | 4 +++-
 .../org/apache/logging/log4j/samples/app/MockEventsSupplier.java | 3 ++-
 .../java/org/apache/logging/log4j/samples/dto/Constraint.java| 1 +
 .../main/java/org/apache/logging/log4j/lookup/CustomLookup.java  | 1 +
 .../java/org/apache/logging/log4j/lookup/CustomMapMessage.java   | 1 +
 .../java/org/apache/logging/log4j/lookup/MapMessageLookup.java   | 1 +
 .../test/java/org/apache/logging/log4j/CustomPropertiesTest.java | 1 +
 .../test/java/org/apache/logging/log4j/MapMessageLookupTest.java | 5 +++--
 .../org/apache/logging/log4j/server/AbstractLogEventBridge.java  | 1 +
 .../org/apache/logging/log4j/server/AbstractSocketServer.java| 1 +
 .../apache/logging/log4j/server/InputStreamLogEventBridge.java   | 1 +
 .../src/main/java/org/apache/logging/log4j/server/JmsServer.java | 2 ++
 .../logging/log4j/server/JsonInputStreamLogEventBridge.java  | 1 +
 .../java/org/apache/logging/log4j/server/LogEventBridge.java | 1 +
 .../logging/log4j/server/ObjectInputStreamLogEventBridge.java| 1 +
 .../org/apache/logging/log4j/server/SecureTcpSocketServer.java   | 1 +
 .../java/org/apache/logging/log4j/server/TcpSocketServer.java| 1 +
 .../java/org/apache/logging/log4j/server/UdpSocketServer.java| 1 +
 .../logging/log4j/server/XmlInputStreamLogEventBridge.java   | 1 +
 .../apache/logging/log4j/server/mom/jms/AbstractJmsReceiver.java | 1 +
 .../apache/logging/log4j/server/AbstractSocketServerTest.java| 9 +
 .../org/apache/logging/log4j/server/SslXmlSocketServerTest.java  | 1 +
 .../org/apache/logging/log4j/server/TcpJsonSocketServerTest.java | 1 +
 .../org/apache/logging/log4j/server/TcpXmlSocketServerTest.java  | 1 +
 .../org/apache/logging/log4j/server/UdpJsonSocketServerTest.java | 1 +
 .../org/apache/logging/log4j/server/UdpXmlSocketServerTest.java  | 1 +
 .../log4j/server/mom/activemq/ActiveMqBrokerServiceHelper.java   | 1 +
 .../spring/cloud/config/sample/controller/K8SController.java | 3 ++-
 .../spring/cloud/config/sample/controller/SampleController.java  | 3 ++-
 .../config/sample/utils/spring/SampleResponseErrorHandler.java   | 1 +
 34 files changed, 48 insertions(+), 12 deletions(-)

diff --git 
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
 
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
index 880cf7d..4eb644a 100644
--- 
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
+++ 
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfiguration.java
@@ -17,6 +17,7 @@
 package org.apache.logging.log4j.samples.configuration;
 
 import java.io.Serializable;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.Layout;
diff --git 
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
 
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
index af5ee4a..1846e7e 100644
--- 
a/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
+++ 
b/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/samples/configuration/CustomConfigurationFactory.java
@@ -16,8 +16,9 @@
  */
 package org.apache.logging.log4j.samples.configuration;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.net.URI;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
diff --git 
a/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
 
b/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
index 5e3a808..3201180 100755
---

(logging-log4j-transform) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git


The following commit(s) were added to refs/heads/main by this push:
 new 2c87e88  Pin reusable workflows to version 10.4.0
2c87e88 is described below

commit 2c87e88349c4c49306dabde167b254f488029d36
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 11:23:31 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml| 6 +++---
 .github/workflows/merge-dependabot.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5d00c7c..0aad30c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,14 +38,14 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   site-enabled: true
 
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j-transform' && 
github.ref_name == 'main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -54,7 +54,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j-transform' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index c96278b..e17e841 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-transform' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   contents: write # to push 
changelog commits
   pull-requests: write# to close 
the PR

(logging-log4j-tools) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git


The following commit(s) were added to refs/heads/main by this push:
 new a40d2f2  Pin reusable workflows to version 10.4.0
a40d2f2 is described below

commit a40d2f20538aff8df2eca794307b45609772c9f5
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 11:22:47 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml| 6 +++---
 .github/workflows/merge-dependabot.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6f09693..75abf11 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,14 +38,14 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   site-enabled: true
 
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j-tools' && github.ref_name 
== 'main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -54,7 +54,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j-tools' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index 27b63fc..cd59986 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-tools' && github.event_name 
== 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   contents: write # to push changelog 
commits
   pull-requests: write# to close the PR

(logging-log4j-scala) branch main updated (fe4a184 -> 6790d9e)

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git


from fe4a184  Add Maven Central explictly to Dependabot config
 add 6790d9e  Pin reusable workflows to version 10.4.0

No new revisions were added by this update.

Summary of changes:
 .github/workflows/build.yaml| 6 +++---
 .github/workflows/merge-dependabot.yaml | 4 ++--
 pom.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(logging-log4j-samples) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git


The following commit(s) were added to refs/heads/main by this push:
 new c3e9137  Pin reusable workflows to version 10.4.0
c3e9137 is described below

commit c3e91378890d6c3583c4f34588add8ec5372a0e9
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 11:19:02 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml| 2 +-
 .github/workflows/merge-dependabot.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4f5e7c..3d1aa32 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,6 +37,6 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 21
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index 16521d9..dc4391e 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,13 +30,13 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-samples' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 21
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   contents: write # to push 
changelog commits
   pull-requests: write# to close the PR

(logging-log4j-kotlin) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git


The following commit(s) were added to refs/heads/main by this push:
 new 9fd765e  Pin reusable workflows to version 10.4.0
9fd765e is described below

commit 9fd765e160fea13b3ad1e519c250bd17ec4d80b4
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 11:18:20 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml| 6 +++---
 .github/workflows/merge-dependabot.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6828967..35ed5f4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,14 +38,14 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   site-enabled: true
 
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j-kotlin' && github.ref_name 
== 'main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -54,7 +54,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j-kotlin' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index 1450173..5905f7a 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-kotlin' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   contents: write # to push 
changelog commits
   pull-requests: write# to close 
the PR

(logging-log4j-jmx-gui) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git


The following commit(s) were added to refs/heads/main by this push:
 new 198dee8  Pin reusable workflows to version 10.4.0
198dee8 is described below

commit 198dee80cc74d0c5e681b3135cb81691288b
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 11:17:12 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml  | 6 +++---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/merge-dependabot.yaml   | 4 ++--
 .github/workflows/scorecards-analysis.yml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index eadc9c0..92159b9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -44,12 +44,12 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j-jmx-gui' && github.ref == 
'refs/heads/main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -58,7 +58,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j-jmx-gui' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index a0f0e4a..2e56743 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,7 +31,7 @@ permissions: read-all
 jobs:
 
   analyze:
-uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Permissions required to publish Security Alerts
 permissions:
   actions: read
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index fea5894..854b792 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-jmx-gui' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   contents: write # to push 
changelog commits
   pull-requests: write# to close 
the PR
diff --git a/.github/workflows/scorecards-analysis.yml 
b/.github/workflows/scorecards-analysis.yml
index e1287cd..de940f5 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -29,7 +29,7 @@ permissions: read-all
 jobs:
 
   analysis:
-uses: 
apache/logging-parent/.github/workflows/scorecards-analysis-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/scorecards-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   # Needed to upload the results to the code-scanning dashboard.
   security-events: write

(logging-log4j-jakarta) branch main updated: Fix whitespace problem

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git


The following commit(s) were added to refs/heads/main by this push:
 new e3d9147  Fix whitespace problem
e3d9147 is described below

commit e3d9147b05be371974fb7ee513bae24e54cec098
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 11:14:24 2023 +0100

Fix whitespace problem
---
 .github/workflows/build.yaml  | 6 +++---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/merge-dependabot.yaml   | 4 ++--
 .github/workflows/scorecards-analysis.yml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b4a3aaf..b7ab586 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,14 +38,14 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   site-enabled: true
 
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j-jakarta' && github.ref_name 
== 'main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -54,7 +54,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j-jakarta' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index 8e55dbd..2e56743 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,7 +31,7 @@ permissions: read-all
 jobs:
 
   analyze:
-uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Permissions required to publish Security Alerts
 permissions:
   actions: read
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index efc135c..8f7d520 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-jakarta' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   contents: write   # to push 
changelog commits
   pull-requests: write  # to close the PR
diff --git a/.github/workflows/scorecards-analysis.yml 
b/.github/workflows/scorecards-analysis.yml
index 011e2b1..de940f5 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -29,7 +29,7 @@ permissions: read-all
 jobs:
 
   analysis:
-uses: 
apache/logging-parent/.github/workflows/scorecards-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
+uses: 
apache/logging-parent/.github/workflows/scorecards-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 permissions:
   # Needed to upload the results to the code-scanning dashboard.
   security-events: write

(logging-log4j-jakarta) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git


The following commit(s) were added to refs/heads/main by this push:
 new 3428fd1  Pin reusable workflows to version 10.4.0
3428fd1 is described below

commit 3428fd1b1130d5ee530e6429045f8859b95a3d36
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 10:41:42 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml  | 6 +++---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/merge-dependabot.yaml   | 4 ++--
 .github/workflows/scorecards-analysis.yml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 28639ad..b4a3aaf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,14 +38,14 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 with:
   site-enabled: true
 
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j-jakarta' && github.ref_name 
== 'main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -54,7 +54,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j-jakarta' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index a0f0e4a..8e55dbd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,7 +31,7 @@ permissions: read-all
 jobs:
 
   analyze:
-uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 # Permissions required to publish Security Alerts
 permissions:
   actions: read
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index b63b4a7..efc135c 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,11 +30,11 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j-jakarta' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 permissions:
   contents: write   # to push 
changelog commits
   pull-requests: write  # to close the PR
diff --git a/.github/workflows/scorecards-analysis.yml 
b/.github/workflows/scorecards-analysis.yml
index e1287cd..011e2b1 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -29,7 +29,7 @@ permissions: read-all
 jobs:
 
   analysis:
-uses: 
apache/logging-parent/.github/workflows/scorecards-analysis-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/scorecards-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e·#·rel/10.4.0
 permissions:
   # Needed to upload the results to the code-scanning dashboard.
   security-events: write

(logging-log4j2) branch main updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
 new 9b784b1938 Pin reusable workflows to version 10.4.0
9b784b1938 is described below

commit 9b784b193843cfe0eba091aaed530c714f6aef54
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 10:17:59 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml| 6 +++---
 .github/workflows/codeql-analysis.yaml  | 2 +-
 .github/workflows/merge-dependabot.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2492da4a55..cb2ba73ad6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 17
   site-enabled: true
@@ -46,7 +46,7 @@ jobs:
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j2' && github.ref_name == 
'main'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -57,7 +57,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j2' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yaml 
b/.github/workflows/codeql-analysis.yaml
index c2168de737..b1c69b92a8 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -30,7 +30,7 @@ permissions: read-all
 jobs:
 
   analyze:
-uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 17
 # Permissions required to publish Security Alerts
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index de41ba87ea..df13f169ae 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,13 +30,13 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j2' && github.event_name == 
'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 17
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 17
 permissions:

(logging-log4j2) 01/03: Remove unused `QueueFactories` members (#2016)

2023-12-12 Thread vy 
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit d029b335b024ca79d2b039ddd51af88c56350594
Author: Volkan Yazıcı 
AuthorDate: Mon Dec 11 15:37:34 2023 +0100

Remove unused `QueueFactories` members (#2016)
---
 .../apache/logging/log4j/util/QueueFactories.java  | 26 --
 1 file changed, 26 deletions(-)

diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/util/QueueFactories.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/util/QueueFactories.java
index 2ee147e5fd..e64b71d85f 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/QueueFactories.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/QueueFactories.java
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import org.jctools.queues.MpmcArrayQueue;
-import org.jctools.queues.MpscArrayQueue;
-import org.jctools.queues.SpmcArrayQueue;
 import org.jctools.queues.SpscArrayQueue;
 
 /**
@@ -42,16 +40,6 @@ public enum QueueFactories {
  */
 SPSC(Lazy.lazy(JCToolsQueueFactory.SPSC::load)),
 
-/**
- * Provides a bounded queue for multi-producer/single-consumer usage.
- */
-MPSC(Lazy.lazy(JCToolsQueueFactory.MPSC::load)),
-
-/**
- * Provides a bounded queue for single-producer/multi-consumer usage.
- */
-SPMC(Lazy.lazy(JCToolsQueueFactory.SPMC::load)),
-
 /**
  * Provides a bounded queue for multi-producer/multi-consumer usage.
  */
@@ -154,20 +142,6 @@ public enum QueueFactories {
 }
 },
 
-MPSC {
-@Override
-public  Queue create(final int capacity) {
-return new MpscArrayQueue<>(capacity);
-}
-},
-
-SPMC {
-@Override
-public  Queue create(final int capacity) {
-return new SpmcArrayQueue<>(capacity);
-}
-},
-
 MPMC {
 @Override
 public  Queue create(final int capacity) {

(logging-log4j2) 02/03: Rework `RecyclerFactories` (#2016)

2023-12-12 Thread vy 
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 47ff3fd4db475a0aec3ba761e3ebd72254f46b36
Author: Volkan Yazıcı 
AuthorDate: Mon Dec 11 22:29:14 2023 +0100

Rework `RecyclerFactories` (#2016)
---
 .../logging/log4j/spi/RecyclerFactoriesTest.java   |   2 +-
 .../apache/logging/log4j/spi/LoggingSystem.java|   2 +-
 .../logging/log4j/spi/QueueingRecyclerFactory.java |  17 ++-
 .../logging/log4j/spi/RecyclerFactories.java   |  90 
 .../apache/logging/log4j/util/QueueFactories.java  | 117 +++--
 .../apache/logging/log4j/util/QueueFactory.java|   2 +-
 6 files changed, 126 insertions(+), 104 deletions(-)

diff --git 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
index 279fc22439..41a0559577 100644
--- 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
+++ 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
@@ -36,7 +36,7 @@ public class RecyclerFactoriesTest {
 Assertions.assertThat(actualThreadLocalRecyclerFactory)
 
.asInstanceOf(InstanceOfAssertFactories.type(ThreadLocalRecyclerFactory.class))
 .extracting(ThreadLocalRecyclerFactory::getCapacity)
-.isEqualTo(RecyclerFactories.DEFAULT_QUEUE_CAPACITY);
+.isEqualTo(RecyclerFactories.CAPACITY);
 }
 
 @Test
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
index e9de03ae4a..f3bb6aa923 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
@@ -104,7 +104,7 @@ public class LoggingSystem {
 environmentLazy.map(environment -> () -> 
getProvider().createContextMap(environment));
 private final Lazy> 
threadContextStackFactoryLazy =
 environmentLazy.map(environment -> () -> 
getProvider().createContextStack(environment));
-private final Lazy recyclerFactoryLazy = 
Lazy.relaxed(RecyclerFactories::getDefault);
+private final Lazy recyclerFactoryLazy = Lazy.lazy(() -> 
RecyclerFactories.INSTANCE);
 
 public LoggingSystem() {}
 
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/QueueingRecyclerFactory.java
 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/QueueingRecyclerFactory.java
index 981130c74a..468c4c5a48 100644
--- 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/QueueingRecyclerFactory.java
+++ 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/QueueingRecyclerFactory.java
@@ -30,15 +30,28 @@ public class QueueingRecyclerFactory implements 
RecyclerFactory {
 
 private final QueueFactory queueFactory;
 
-public QueueingRecyclerFactory(final QueueFactory queueFactory) {
+private final int capacity;
+
+public QueueingRecyclerFactory(final QueueFactory queueFactory, final int 
capacity) {
+if (capacity < 1) {
+throw new IllegalArgumentException("was expecting `capacity > 0`, 
found: " + capacity);
+}
 this.queueFactory = requireNonNull(queueFactory, "queueFactory");
+this.capacity = capacity;
+}
+
+/**
+ * @return the maximum number of objects retained per thread in recyclers 
created
+ */
+public int getCapacity() {
+return capacity;
 }
 
 @Override
 public  Recycler create(final Supplier supplier, final 
Consumer cleaner) {
 requireNonNull(supplier, "supplier");
 requireNonNull(cleaner, "cleaner");
-final Queue queue = queueFactory.create();
+final Queue queue = queueFactory.create(capacity);
 return new QueueingRecycler<>(supplier, cleaner, queue);
 }
 
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/RecyclerFactories.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/RecyclerFactories.java
index 3733f38e75..8b28502e6b 100644
--- 
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/RecyclerFactories.java
+++ 
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/RecyclerFactories.java
@@ -16,36 +16,83 @@
  */
 package org.apache.logging.log4j.spi;
 
+import static java.util.Objects.requireNonNull;
 import static org.apache.logging.log4j.util.Constants.isThreadLocalsEnabled;
 
 import java.util.Map;
 import java.util.Set;
+import org.apache.logging.log4j.util.InternalApi;
 import org.apache.logging.log4j.util.QueueFactories;
 import org.apache.logging.log4j.util.QueueFactory;
 import org.apache.logging.log4j.util.StringParameterParser;
 
+/**
+ * Stores the default {@link RecyclerFactory} instance.
+ */
+@InternalApi
 public final class

(logging-log4j2) 03/03: Internalize the recycler API utilities (#2016)

2023-12-12 Thread vy 
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 716eca0128303cbbc1aac26a75d69590efc8bf02
Author: Volkan Yazıcı 
AuthorDate: Tue Dec 12 10:08:59 2023 +0100

Internalize the recycler API utilities (#2016)
---
 .../{spi => internal}/RecyclerFactoriesTest.java   | 29 --
 .../StringParameterParserTest.java | 16 +---
 .../ThreadLocalRecyclerFactoryTest.java|  3 ++-
 .../log4j/message/ReusableMessageFactoryTest.java  |  3 +--
 .../log4j/{util => internal}/QueueFactories.java   |  6 -
 .../{spi => internal}/QueueingRecyclerFactory.java | 13 ++
 .../log4j/{spi => internal}/RecyclerFactories.java |  8 +++---
 .../{util => internal}/StringParameterParser.java  |  4 ++-
 .../ThreadLocalRecyclerFactory.java| 12 +
 .../apache/logging/log4j/spi/LoggingSystem.java|  1 +
 .../logging/log4j/{util => spi}/QueueFactory.java  |  3 ++-
 .../apache/logging/log4j/status/StatusLogger.java  |  2 +-
 .../json/ThreadLocalRecyclerNestedLoggingTest.java |  3 +--
 .../plugins/convert/TypeConverterFactory.java  |  2 +-
 14 files changed, 69 insertions(+), 36 deletions(-)

diff --git 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/RecyclerFactoriesTest.java
similarity index 79%
rename from 
log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
rename to 
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/RecyclerFactoriesTest.java
index 41a0559577..9673abe14f 100644
--- 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/spi/RecyclerFactoriesTest.java
+++ 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/RecyclerFactoriesTest.java
@@ -14,10 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.logging.log4j.spi;
+package org.apache.logging.log4j.internal;
 
 import java.util.ArrayDeque;
 import java.util.concurrent.ArrayBlockingQueue;
+import org.apache.logging.log4j.spi.DummyRecyclerFactory;
+import org.apache.logging.log4j.spi.Recycler;
+import org.apache.logging.log4j.spi.RecyclerFactory;
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
@@ -41,17 +44,22 @@ public class RecyclerFactoriesTest {
 
 @Test
 void ThreadLocalRecyclerFactory_should_work_with_capacity() {
-final RecyclerFactory actualThreadLocalRecyclerFactory = 
RecyclerFactories.ofSpec("threadLocal:capacity=13");
+final int capacity = 13;
+final RecyclerFactory actualThreadLocalRecyclerFactory =
+RecyclerFactories.ofSpec("threadLocal:capacity=" + capacity);
 Assertions.assertThat(actualThreadLocalRecyclerFactory)
 
.asInstanceOf(InstanceOfAssertFactories.type(ThreadLocalRecyclerFactory.class))
 .extracting(ThreadLocalRecyclerFactory::getCapacity)
-.isEqualTo(13);
+.isEqualTo(capacity);
 }
 
 @Test
 void QueueingRecyclerFactory_should_work() {
 final RecyclerFactory actualQueueingRecyclerFactory = 
RecyclerFactories.ofSpec("queue");
-
Assertions.assertThat(actualQueueingRecyclerFactory).isInstanceOf(QueueingRecyclerFactory.class);
+Assertions.assertThat(actualQueueingRecyclerFactory)
+
.asInstanceOf(InstanceOfAssertFactories.type(QueueingRecyclerFactory.class))
+.extracting(QueueingRecyclerFactory::getCapacity)
+.isEqualTo(RecyclerFactories.CAPACITY);
 }
 
 @Test
@@ -68,14 +76,19 @@ public class RecyclerFactoriesTest {
 
 @Test
 void QueueingRecyclerFactory_should_work_with_capacity() {
-final RecyclerFactory actualQueueingRecyclerFactory = 
RecyclerFactories.ofSpec("queue:capacity=100");
-
Assertions.assertThat(actualQueueingRecyclerFactory).isInstanceOf(QueueingRecyclerFactory.class);
+final int capacity = 100;
+final RecyclerFactory actualQueueingRecyclerFactory = 
RecyclerFactories.ofSpec("queue:capacity=" + capacity);
+Assertions.assertThat(actualQueueingRecyclerFactory)
+
.asInstanceOf(InstanceOfAssertFactories.type(QueueingRecyclerFactory.class))
+.extracting(QueueingRecyclerFactory::getCapacity)
+.isEqualTo(capacity);
 }
 
 @Test
 void QueueingRecyclerFactory_should_work_with_supplier_and_capacity() {
+final int capacity = 100;
 final RecyclerFactory recyclerFactory = RecyclerFactories.ofSpec(
-"queue:" + 
"supplier=java.util.concurrent.ArrayBlockingQueue.new," + "capacity=100");
+

(logging-log4j2) branch main updated (20f29295f7 -> 716eca0128)

2023-12-12 Thread vy 
This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


from 20f29295f7 Update `net.java.dev.jna:jna` to version `5.14.0` (#2082)
 new d029b335b0 Remove unused `QueueFactories` members (#2016)
 new 47ff3fd4db Rework `RecyclerFactories` (#2016)
 new 716eca0128 Internalize the recycler API utilities (#2016)

The 3 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:
 .../{spi => internal}/RecyclerFactoriesTest.java   |  31 +++--
 .../StringParameterParserTest.java |  16 ++-
 .../ThreadLocalRecyclerFactoryTest.java|   3 +-
 .../log4j/message/ReusableMessageFactoryTest.java  |   3 +-
 .../log4j/{util => internal}/QueueFactories.java   | 149 ++---
 .../{spi => internal}/QueueingRecyclerFactory.java |  26 +++-
 .../log4j/{spi => internal}/RecyclerFactories.java |  98 ++
 .../{util => internal}/StringParameterParser.java  |   4 +-
 .../ThreadLocalRecyclerFactory.java|  12 +-
 .../apache/logging/log4j/spi/LoggingSystem.java|   3 +-
 .../logging/log4j/{util => spi}/QueueFactory.java  |   5 +-
 .../apache/logging/log4j/status/StatusLogger.java  |   2 +-
 .../json/ThreadLocalRecyclerNestedLoggingTest.java |   3 +-
 .../plugins/convert/TypeConverterFactory.java  |   2 +-
 14 files changed, 193 insertions(+), 164 deletions(-)
 rename log4j-api-test/src/test/java/org/apache/logging/log4j/{spi => 
internal}/RecyclerFactoriesTest.java (78%)
 rename log4j-api-test/src/test/java/org/apache/logging/log4j/{util => 
internal}/StringParameterParserTest.java (95%)
 rename log4j-api-test/src/test/java/org/apache/logging/log4j/{spi => 
internal}/ThreadLocalRecyclerFactoryTest.java (97%)
 rename log4j-api/src/main/java/org/apache/logging/log4j/{util => 
internal}/QueueFactories.java (60%)
 rename log4j-api/src/main/java/org/apache/logging/log4j/{spi => 
internal}/QueueingRecyclerFactory.java (73%)
 rename log4j-api/src/main/java/org/apache/logging/log4j/{spi => 
internal}/RecyclerFactories.java (53%)
 rename log4j-api/src/main/java/org/apache/logging/log4j/{util => 
internal}/StringParameterParser.java (98%)
 rename log4j-api/src/main/java/org/apache/logging/log4j/{spi => 
internal}/ThreadLocalRecyclerFactory.java (90%)
 rename log4j-api/src/main/java/org/apache/logging/log4j/{util => 
spi}/QueueFactory.java (87%)

(logging-log4j2) branch 2.x updated: Pin reusable workflows to version 10.4.0

2023-12-12 Thread pkarwasz 
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x by this push:
 new fc7dd2aad2 Pin reusable workflows to version 10.4.0
fc7dd2aad2 is described below

commit fc7dd2aad2ef2b498c51012c5365b702f5a53d5b
Author: Piotr P. Karwasz 
AuthorDate: Tue Dec 12 10:17:59 2023 +0100

Pin reusable workflows to version 10.4.0
---
 .github/workflows/build.yaml| 6 +++---
 .github/workflows/codeql-analysis.yaml  | 2 +-
 .github/workflows/merge-dependabot.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0daa1cfe8d..517085a7a5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
 
   build:
 if: github.actor != 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: |
 8
@@ -48,7 +48,7 @@ jobs:
   deploy-snapshot:
 needs: build
 if: github.repository == 'apache/logging-log4j2' && github.ref_name == 
'2.x'
-uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
@@ -61,7 +61,7 @@ jobs:
   deploy-release:
 needs: build
 if: github.repository == 'apache/logging-log4j2' && 
startsWith(github.ref_name, 'release/')
-uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 # Secrets for deployments
 secrets:
   GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yaml 
b/.github/workflows/codeql-analysis.yaml
index de440779f4..a00818082d 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -30,7 +30,7 @@ permissions: read-all
 jobs:
 
   analyze:
-uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: |
 8
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index 83a59f12fe..52ee1e16e3 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,7 +30,7 @@ jobs:
 
   build:
 if: github.repository == 'apache/logging-log4j2' && github.event_name == 
'pull_request_target' && github.actor == 'dependabot[bot]'
-uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: |
 8
@@ -38,7 +38,7 @@ jobs:
 
   merge-dependabot:
 needs: build
-uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
 # rel/10.4.0
 with:
   java-version: 17
 permissions: