[logging-log4cxx-site] branch master updated: Move to a directory under 'content'

2023-10-17 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-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 524cd803 Move to a directory under 'content'
524cd803 is described below

commit 524cd803dc0d60663d7ec053ddf71d367723a905
Author: Stephen Webb 
AuthorDate: Wed Oct 18 16:17:36 2023 +1100

Move to a directory under 'content'
---
 .asf.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7ab0cd37..ad6d66e8 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,9 +7,9 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: log4cxx
+  subdir: content/log4cxx
 
 publish:
   profile: ~
   whoami: asf-site
-  subdir: log4cxx
+  subdir: content/log4cxx



[logging-log4cxx] branch improve_multithreadtest created (now e058bddc)

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

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


  at e058bddc Write a file in multithreadtest to check process termination 
behavior

This branch includes the following new commits:

 new e058bddc Write a file in multithreadtest to check process termination 
behavior

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: Write a file in multithreadtest to check process termination behavior

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

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

commit e058bddc358b0424089489b497c48e391e97366b
Author: Stephen Webb 
AuthorDate: Wed Oct 18 15:34:18 2023 +1100

Write a file in multithreadtest to check process termination behavior
---
 src/test/cpp/multithreadtest.cpp | 35 +++
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/test/cpp/multithreadtest.cpp b/src/test/cpp/multithreadtest.cpp
index b4861639..be52a8f2 100644
--- a/src/test/cpp/multithreadtest.cpp
+++ b/src/test/cpp/multithreadtest.cpp
@@ -19,8 +19,9 @@
 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -28,20 +29,22 @@
 
 using namespace log4cxx;
 
-class NullWriter : public helpers::Writer
+class MyAppender : public FileAppender
 {
 public:
-   void close(helpers::Pool& p) override {}
-   void flush(helpers::Pool& p) override {}
-   void write(const LogString& str, helpers::Pool& p) override {}
-};
-
-class NullWriterAppender : public WriterAppender
-{
-public:
-   NullWriterAppender() : WriterAppender( 
std::make_shared()) 
+   MyAppender()
{
-   setWriter(std::make_shared());
+   auto tempDir = 
helpers::OptionConverter::getSystemProperty("TEMP", "/tmp");
+   setFile(tempDir + LOG4CXX_STR("/") + 
LOG4CXX_STR("multithread_test.log"));
+   setLayout(std::make_shared(LOG4CXX_STR("%d [%t] 
%-5p %.16c - %m%n")));
+   setAppend(false);
+#if LOG4CXX_EVENTS_AT_EXIT
+   setBufferedIO(false);
+#else
+   setBufferedIO(true);
+#endif
+   helpers::Pool p;
+   activateOptions(p);
}
 };
 
@@ -66,10 +69,11 @@ static void multithread_logger( int times )
 
for ( int x = 0; x < times; x++ )
{
-   LOG4CXX_INFO( logger, "This is a test message that has some 
data" );
+   LOG4CXX_INFO( logger, "This is test message " << x );
 
if ( distribution(gen) == x )
{
+   LOG4CXX_INFO( logger, "Exiting");
std::call_once(exiting, std::exit, 0);
}
}
@@ -85,8 +89,7 @@ public:
void setUp()
{
Logger::getRootLogger()->removeAllAppenders();
-   std::shared_ptr nullWriter( new 
NullWriterAppender() );
-   Logger::getRootLogger()->addAppender( nullWriter );
+   Logger::getRootLogger()->addAppender( 
std::make_shared() );
}
 
void tearDown()



[logging-log4cxx] branch master updated: Fix MSVC-2017 build for hexdump.cpp (#274)

2023-10-17 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 24b3fef7 Fix MSVC-2017 build for hexdump.cpp (#274)
24b3fef7 is described below

commit 24b3fef790ecc65766f5e6b2ae3dfa6409157b59
Author: vopl 
AuthorDate: Wed Oct 18 06:23:32 2023 +0300

Fix MSVC-2017 build for hexdump.cpp (#274)
---
 src/main/cpp/hexdump.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/cpp/hexdump.cpp b/src/main/cpp/hexdump.cpp
index 163cda79..68b043a9 100644
--- a/src/main/cpp/hexdump.cpp
+++ b/src/main/cpp/hexdump.cpp
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace log4cxx;
 



[logging-log4cxx] branch master updated: Support logging at process termination (#271)

2023-10-17 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 9f4c2301 Support logging at process termination (#271)
9f4c2301 is described below

commit 9f4c230153cd0def95d451f1d881f0c7763ba0e7
Author: vopl 
AuthorDate: Wed Oct 18 06:22:10 2023 +0300

Support logging at process termination (#271)
---
 .gitignore |  2 +
 src/main/cpp/aprinitializer.cpp|  4 +-
 src/main/cpp/basicconfigurator.cpp |  3 +-
 src/main/cpp/charsetdecoder.cpp|  8 +--
 src/main/cpp/charsetencoder.cpp|  4 +-
 src/main/cpp/class.cpp |  2 +-
 src/main/cpp/classnamepatternconverter.cpp |  2 +-
 src/main/cpp/colorendpatternconverter.cpp  |  2 +-
 src/main/cpp/colorstartpatternconverter.cpp|  2 +-
 src/main/cpp/consoleappender.cpp   |  4 +-
 src/main/cpp/defaultconfigurator.cpp   |  6 +-
 src/main/cpp/domconfigurator.cpp   | 10 +--
 src/main/cpp/filelocationpatternconverter.cpp  |  2 +-
 src/main/cpp/formattinginfo.cpp|  2 +-
 src/main/cpp/fulllocationpatternconverter.cpp  |  2 +-
 src/main/cpp/hierarchy.cpp |  2 +-
 src/main/cpp/integerpatternconverter.cpp   |  2 +-
 src/main/cpp/level.cpp | 16 ++---
 src/main/cpp/levelpatternconverter.cpp |  2 +-
 src/main/cpp/linelocationpatternconverter.cpp  |  2 +-
 src/main/cpp/lineseparatorpatternconverter.cpp |  2 +-
 src/main/cpp/literalpatternconverter.cpp   |  2 +-
 src/main/cpp/locationinfo.cpp  |  3 +-
 src/main/cpp/loggerpatternconverter.cpp|  2 +-
 src/main/cpp/loggingevent.cpp  |  6 +-
 src/main/cpp/loglog.cpp|  2 +-
 src/main/cpp/mapfilter.cpp |  4 +-
 src/main/cpp/mdcpatternconverter.cpp   |  2 +-
 src/main/cpp/messagebuffer.cpp |  2 +-
 src/main/cpp/messagepatternconverter.cpp   |  2 +-
 src/main/cpp/methodlocationpatternconverter.cpp|  2 +-
 src/main/cpp/nameabbreviator.cpp   |  2 +-
 src/main/cpp/ndcpatternconverter.cpp   |  2 +-
 src/main/cpp/propertiespatternconverter.cpp|  2 +-
 src/main/cpp/propertyconfigurator.cpp  | 38 +--
 src/main/cpp/relativetimepatternconverter.cpp  |  2 +-
 src/main/cpp/shortfilelocationpatternconverter.cpp |  2 +-
 src/main/cpp/threadpatternconverter.cpp|  2 +-
 src/main/cpp/threadspecificdata.cpp|  2 +-
 src/main/cpp/threadusernamepatternconverter.cpp|  2 +-
 src/main/cpp/threadutility.cpp |  4 +-
 .../cpp/throwableinformationpatternconverter.cpp   |  4 +-
 src/main/cpp/timezone.cpp  |  4 +-
 src/main/cpp/transform.cpp |  5 +-
 src/main/include/CMakeLists.txt|  8 +++
 src/main/include/log4cxx/helpers/aprinitializer.h  |  2 +
 src/main/include/log4cxx/helpers/loglog.h  |  2 +
 src/main/include/log4cxx/helpers/object.h  |  9 +--
 src/main/include/log4cxx/helpers/threadutility.h   |  2 +
 src/main/include/log4cxx/helpers/widelife.h| 77 ++
 src/main/include/log4cxx/log4cxx.h.in  |  2 +
 src/main/mock-apple/CFString.cpp   |  6 +-
 src/site/markdown/development/build-cmake.md   |  1 +
 src/site/markdown/faq.md   |  8 +++
 src/test/cpp/CMakeLists.txt|  3 +
 .../cpp/eventsatexittest.cpp}  | 41 +---
 src/test/cpp/multithreadtest.cpp   | 35 +-
 57 files changed, 238 insertions(+), 137 deletions(-)

diff --git a/.gitignore b/.gitignore
index e05c5f7b..fa67582c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ src/test/cpp/Testing/
 src/test/resources/org/
 src/test/resources/output/
 target/
+
+*.user
diff --git a/src/main/cpp/aprinitializer.cpp b/src/main/cpp/aprinitializer.cpp
index 2707aa6c..b2272901 100644
--- a/src/main/cpp/aprinitializer.cpp
+++ b/src/main/cpp/aprinitializer.cpp
@@ -118,8 +118,8 @@ void APRInitializer::unregisterAll()
 
 APRInitializer& APRInitializer::getInstance()
 {
-   static apr_environment env;
-   static APRInitializer init;
+   static WideLife env;
+   static WideLife init;
return init;
 }
 
diff --git a/src/main/cpp/basicconfigurator.cpp 
b/src/main/cpp/basicconfigurator.cpp
index abe71fa4..0335d412 100644
--- a/src/main/cpp/basicconfigurator.cpp
+++ b/src/main/cpp/basicconfigurator.cpp
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace log4cxx;
 
@@ 

[logging-log4j-jmx-gui] branch release/2.21.0.1 updated: Bump timestamp

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

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


The following commit(s) were added to refs/heads/release/2.21.0.1 by this push:
 new e946a7d  Bump timestamp
e946a7d is described below

commit e946a7d4f93f2e81494f27a08a3e410320619e2a
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 18:30:53 2023 +0200

Bump timestamp
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7e2f6ef..eca3b3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,9 @@
 
   
 
+
+
2023-10-20T18:29:45+02:00
+
 
 2.22.0-SNAPSHOT
 



[logging-log4j-jmx-gui] branch release/2.21.0.1 created (now 11e594d)

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

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


  at 11e594d  Add `bnd-baseline-maven-plugin` check

No new revisions were added by this update.



[logging-log4j-jmx-gui] branch main updated: Add `bnd-baseline-maven-plugin` check

2023-10-17 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 11e594d  Add `bnd-baseline-maven-plugin` check
11e594d is described below

commit 11e594d23ae7f89dcb56625f029aeb7d849e8396
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 18:24:17 2023 +0200

Add `bnd-baseline-maven-plugin` check
---
 pom.xml   | 19 +++
 .../apache/logging/log4j/jmx/gui/package-info.java|  2 ++
 2 files changed, 21 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3c049e4..7e2f6ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,12 @@
   provided
 
 
+
+  org.osgi
+  osgi.annotation
+  provided
+
+
 
   org.osgi
   org.osgi.annotation.bundle
@@ -200,6 +206,19 @@
 
   
 
+  
+biz.aQute.bnd
+bnd-baseline-maven-plugin
+${bnd-maven-plugin.version}
+
+  
+baseline
+
+  baseline
+
+  
+
+  
 
   
 
diff --git a/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java 
b/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
index f757353..f5f40e0 100644
--- a/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
+++ b/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
@@ -19,6 +19,8 @@
  * Log4j 2.0 JMX GUI.
  */
 @Export
+@Version("2.20.1")
 package org.apache.logging.log4j.jmx.gui;
 
 import org.osgi.annotation.bundle.Export;
+import org.osgi.annotation.versioning.Version;



[logging-log4j-jmx-gui] branch main updated: Fix groupId

2023-10-17 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 4ce7e10  Fix groupId
4ce7e10 is described below

commit 4ce7e108973357d14068f7e513fdc006374defa1
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 18:16:21 2023 +0200

Fix groupId
---
 pom.xml   | 1 +
 src/changelog/.2.x.x/fix-group-id.xml | 9 +
 2 files changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7130b04..3c049e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
 10.1.1
   
 
+  org.apache.logging.log4j
   log4j-jmx-gui
   ${revision}
   jar
diff --git a/src/changelog/.2.x.x/fix-group-id.xml 
b/src/changelog/.2.x.x/fix-group-id.xml
new file mode 100644
index 000..5a2bf15
--- /dev/null
+++ b/src/changelog/.2.x.x/fix-group-id.xml
@@ -0,0 +1,9 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+   xmlns="http://logging.apache.org/log4j/changelog;
+   xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+   type="fixed">
+  
+Restore the original groupId: `org.apache.logging.log4j`
+  
+



[logging-log4j-jmx-gui] branch main updated (e892fe9 -> 04dd441)

2023-10-17 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-jmx-gui.git


from e892fe9  Bump com.github.spotbugs:spotbugs-annotations from 4.7.3 to 
4.8.0 (#1)
 new 149a140  Upgrade `logging-parent` to version 10.1.1
 new a12370d  Upgrade `log4j-core` and `log4j-changelog`
 new 04dd441  Adapt to `bnd-maven-plugin`

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:
 pom.xml| 56 ++
 src/changelog/.2.x.x/add-osgi-jpms.xml |  9 
 src/changelog/.2.x.x/bump-logging-parent.xml   |  9 
 .../apache/logging/log4j/jmx/gui/ClientGui.java|  2 +
 .../apache/logging/log4j/jmx/gui/package-info.java |  3 ++
 5 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 src/changelog/.2.x.x/add-osgi-jpms.xml
 create mode 100644 src/changelog/.2.x.x/bump-logging-parent.xml



[logging-log4j-jmx-gui] 02/03: Upgrade `log4j-core` and `log4j-changelog`

2023-10-17 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

commit a12370d4e25da12b94d54b5550ba6490b4deed65
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 17:10:25 2023 +0200

Upgrade `log4j-core` and `log4j-changelog`
---
 pom.xml  | 3 ++-
 src/changelog/.2.x.x/bump-logging-parent.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34d5666..0b745e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,8 @@
 2.22.0-SNAPSHOT
 
 
-2.20.0
+2.21.0
+
0.5.0
 4.8.0
 
   
diff --git a/src/changelog/.2.x.x/bump-logging-parent.xml 
b/src/changelog/.2.x.x/bump-logging-parent.xml
index f671d4a..cc6b7e9 100644
--- a/src/changelog/.2.x.x/bump-logging-parent.xml
+++ b/src/changelog/.2.x.x/bump-logging-parent.xml
@@ -4,6 +4,6 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
type="changed">
   
-Upgrade `logging-parent` to version 10.1.1
+Upgrade `logging-parent` to version 10.1.1, `log4j-core` to version 2.21.0 
and `log4j-changelog` to version 0.5.0
   
 



[logging-log4j-jmx-gui] 01/03: Upgrade `logging-parent` to version 10.1.1

2023-10-17 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

commit 149a1402989b08e682b49e86ddcefa280bcd8c87
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 17:06:41 2023 +0200

Upgrade `logging-parent` to version 10.1.1
---
 pom.xml  | 2 +-
 src/changelog/.2.x.x/bump-logging-parent.xml | 9 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 462440f..34d5666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.logging
 logging-parent
-10.0.0
+10.1.1
   
 
   log4j-jmx-gui
diff --git a/src/changelog/.2.x.x/bump-logging-parent.xml 
b/src/changelog/.2.x.x/bump-logging-parent.xml
new file mode 100644
index 000..f671d4a
--- /dev/null
+++ b/src/changelog/.2.x.x/bump-logging-parent.xml
@@ -0,0 +1,9 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+   xmlns="http://logging.apache.org/log4j/changelog;
+   xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+   type="changed">
+  
+Upgrade `logging-parent` to version 10.1.1
+  
+



[logging-log4j-jmx-gui] 03/03: Adapt to `bnd-maven-plugin`

2023-10-17 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

commit 04dd44162ef9d2a9139323b36f28298483caa066
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 18:14:23 2023 +0200

Adapt to `bnd-maven-plugin`
---
 pom.xml| 51 ++
 src/changelog/.2.x.x/add-osgi-jpms.xml |  9 
 .../apache/logging/log4j/jmx/gui/ClientGui.java|  2 +
 .../apache/logging/log4j/jmx/gui/package-info.java |  3 ++
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b745e8..7130b04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,21 +138,34 @@
 
0.5.0
 4.8.0
 
+
+log4j-api-2.21.0.jar log4j-core-2.21.0.jar
   
 
   
 
 
-  org.apache.logging.log4j
-  log4j-core
-  ${log4j.version}
+  biz.aQute.bnd
+  biz.aQute.bnd.annotation
+  provided
 
 
 
   com.github.spotbugs
   spotbugs-annotations
-  ${spotbugs-annotations.version}
-  true
+  provided
+
+
+
+  org.osgi
+  org.osgi.annotation.bundle
+  provided
+
+
+
+  org.apache.logging.log4j
+  log4j-core
+  ${log4j.version}
 
 
   
@@ -162,21 +175,25 @@
 
   
 org.apache.maven.plugins
-maven-jar-plugin
+maven-clean-plugin
 
   
-default-jar
+
+remove-stubs
+
+  clean
+
+process-classes
 
-  
-
-  true
-  
org.apache.logging.log4j.jmx.gui.ClientGui
-
-  
-  
-  
-com/sun/tools/jconsole/*
-  
+  true
+  
+
+  ${project.build.outputDirectory}
+  
+com/sun/tools/jconsole/**
+  
+
+  
 
   
 
diff --git a/src/changelog/.2.x.x/add-osgi-jpms.xml 
b/src/changelog/.2.x.x/add-osgi-jpms.xml
new file mode 100644
index 000..6f57c22
--- /dev/null
+++ b/src/changelog/.2.x.x/add-osgi-jpms.xml
@@ -0,0 +1,9 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+   xmlns="http://logging.apache.org/log4j/changelog;
+   xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+   type="changed">
+  
+Add OSGi and JPMS descriptor
+  
+
diff --git a/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java 
b/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index a745908..56d40f7 100644
--- a/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++ b/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -56,6 +56,7 @@ import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.WindowConstants;
 
+import aQute.bnd.annotation.jpms.MainClass;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
 import org.apache.logging.log4j.core.jmx.Server;
@@ -70,6 +71,7 @@ import 
org.apache.logging.log4j.core.jmx.StatusLoggerAdminMBean;
  *  >http://docs.oracle.com/javase/6/docs/technotes/guides/management/
  *  jconsole.html
  */
+@MainClass
 @SuppressFBWarnings("INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE")
 public class ClientGui extends JPanel implements NotificationListener {
 private static final long serialVersionUID = -253621277232291174L;
diff --git a/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java 
b/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
index 3bec4a0..f757353 100644
--- a/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
+++ b/src/main/java/org/apache/logging/log4j/jmx/gui/package-info.java
@@ -18,4 +18,7 @@
 /**
  * Log4j 2.0 JMX GUI.
  */
+@Export
 package org.apache.logging.log4j.jmx.gui;
+
+import org.osgi.annotation.bundle.Export;



[logging-site] branch jekyll updated (add2daa3 -> f9ab1e0f)

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

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


from add2daa3 testing
 new de265cd5 trying test new target
 new f9ab1e0f Mterge branch 'jekyll' of github.com:apache/logging-site into 
jekyll

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:
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[logging-site] 01/02: trying test new target

2023-10-17 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

commit de265cd532dc2430db9e8ff9039f5b23c0cb7347
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:56:35 2023 +0200

trying test new target
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 335346fa..db35611c 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,4 +7,4 @@ notifications:
 jekyll:
   whoami: jekyll
   outputdir: content
-  target: asf-staging
+  target: asf-stagingtest



[logging-site] 02/02: Mterge branch 'jekyll' of github.com:apache/logging-site into jekyll

2023-10-17 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

commit f9ab1e0fd0970d82b25d1367720f575843da044d
Merge: de265cd5 add2daa3
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:56:40 2023 +0200

Mterge branch 'jekyll' of github.com:apache/logging-site into jekyll

 .asf.yaml  | 1 +
 index.html | 1 +
 2 files changed, 2 insertions(+)

diff --cc .asf.yaml
index db35611c,6fc48a25..092ca9ce
--- a/.asf.yaml
+++ b/.asf.yaml
@@@ -5,6 -5,7 +5,7 @@@ notifications
jira_options: link label comment 
  
  jekyll:
+   profile: ~
whoami: jekyll
outputdir: content
 -  target: asf-staging
 +  target: asf-stagingtest



[logging-log4cxx-site] branch asf-staging updated: Revert to 'content'

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
 new ed137d04 Revert to 'content'
ed137d04 is described below

commit ed137d048aac8cfbc3b156a6167b85e98c24fa2d
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:51:54 2023 +0200

Revert to 'content'
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 21ab111d..ad6d66e8 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,7 +7,7 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: output/log4cxx
+  subdir: content/log4cxx
 
 publish:
   profile: ~



[logging-log4net-site] branch asf-staging updated: Revert to 'content'

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 6ff4492  Revert to 'content'
6ff4492 is described below

commit 6ff449224a02c5269e86572ad713b4bf518f4319
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:52:00 2023 +0200

Revert to 'content'
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index cd9daf2..6d448a9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,7 +7,7 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: output/log4net
+  subdir: content/log4net
 
 publish:
   profile: ~



[logging-log4j-audit-site] branch asf-staging updated: Revert to 'content'

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
 new bfa6bd3  Revert to 'content'
bfa6bd3 is described below

commit bfa6bd3d921b4c640dedae73f8cb3fd201a47f7b
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:51:51 2023 +0200

Revert to 'content'
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index f4ddd28..af30d68 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,7 +7,7 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: output/log4j-audit
+  subdir: content/log4j-audit
 
 publish:
   profile: ~



[logging-log4php-site] branch asf-staging updated: Revert to 'content'

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 7bee8f6  Revert to 'content'
7bee8f6 is described below

commit 7bee8f6af5a451488a1208febde7bef4938bd0b7
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:51:59 2023 +0200

Revert to 'content'
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 17df2c3..a9c4769 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,7 +7,7 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: output/log4php
+  subdir: content/log4php
 
 publish:
   profile: ~



[logging-parent] branch asf-staging updated: Revert to 'content'

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 77ae088  Revert to 'content'
77ae088 is described below

commit 77ae08866e254f10a889818847fee121eb0d8b98
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:52:02 2023 +0200

Revert to 'content'
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index a8a7bac..fd6a2fd 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,4 +20,4 @@
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: output/logging-parent
+  subdir: content/logging-parent



[logging-log4j-site] branch asf-staging updated (25aa871c3 -> 3a1638fa0)

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

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


from 25aa871c3 Revert staging prefix from `logging-log4j` to `logging`
 add 3a1638fa0 Revert to 'content'

No new revisions were added by this update.

Summary of changes:
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[logging-site] branch asf-staging updated: reverted back to tilde

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

grobmeier 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 305e1318 reverted back to tilde
305e1318 is described below

commit 305e13183024663e0283f2dd7d29aefec6900bbd
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:45:18 2023 +0200

reverted back to tilde
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index af262676..bf2f3896 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -5,5 +5,5 @@ notifications:
   jira_options: link label comment 
 
 staging:
-  profile: main
+  profile: ~
   whoami: asf-staging



[logging-site] branch asf-staging updated: Try staging in `logging-main.staged.apache.org`

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

pkarwasz 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 a4236098 Try staging in `logging-main.staged.apache.org`
a4236098 is described below

commit a423609829a7efaf9130cca412940f200c1fe7ea
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:34:09 2023 +0200

Try staging in `logging-main.staged.apache.org`
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index bf2f3896..af262676 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -5,5 +5,5 @@ notifications:
   jira_options: link label comment 
 
 staging:
-  profile: ~
+  profile: main
   whoami: asf-staging



[logging-parent] branch asf-staging updated: Add 'output' again

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 11bc7c8  Add 'output' again
11bc7c8 is described below

commit 11bc7c88264a7bff54dded4b9d4480e262c85868
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 12:30:36 2023 +0200

Add 'output' again
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index bee7063..a8a7bac 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,4 +20,4 @@
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: logging-parent
+  subdir: output/logging-parent



[logging-site] branch asf-staging updated: testing

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

grobmeier 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 591c6833 testing
591c6833 is described below

commit 591c6833728203673c1b1bc76e5b388988278869
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:25:48 2023 +0200

testing
---
 .asf.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 428cc31c..bf2f3896 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,4 +7,3 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: ~



[logging-site] branch asf-staging updated: testing content output folder

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

grobmeier 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 429397a0 testing content output folder
429397a0 is described below

commit 429397a06eac526c77c981f943a040cad03d5c8d
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:25:05 2023 +0200

testing content output folder
---
 {output => content}/README.md|   0
 {output => content}/blog/2023/10/11/release.html |   0
 {output => content}/blog/index.html  |   0
 {output => content}/charter.html |   0
 {output => content}/css/asciidoctor-default.css  |   0
 {output => content}/css/bootstrap.css|   0
 {output => content}/css/bootstrap.min.css|   0
 {output => content}/css/site.css |   0
 {output => content}/css/site.css.map |   0
 {output => content}/doaps/doap_Log4j.rdf |   0
 {output => content}/dormant.html |   0
 {output => content}/feed.xml |   0
 {output => content}/guidelines.html  |   0
 {output => content}/img/feather.gif  | Bin
 {output => content}/index.html   |   0
 {output => content}/js/bootstrap.js  |   0
 {output => content}/js/bootstrap.min.js  |   0
 {output => content}/js/jquery.js |   0
 {output => content}/js/jquery.min.js |   0
 {output => content}/js/site.js   |   0
 {output => content}/mailing-lists.html   |   0
 {output => content}/security.html|   0
 {output => content}/team-list.html   |   0
 {output => content}/what-is-logging.html |   0
 24 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/output/README.md b/content/README.md
similarity index 100%
rename from output/README.md
rename to content/README.md
diff --git a/output/blog/2023/10/11/release.html 
b/content/blog/2023/10/11/release.html
similarity index 100%
rename from output/blog/2023/10/11/release.html
rename to content/blog/2023/10/11/release.html
diff --git a/output/blog/index.html b/content/blog/index.html
similarity index 100%
rename from output/blog/index.html
rename to content/blog/index.html
diff --git a/output/charter.html b/content/charter.html
similarity index 100%
rename from output/charter.html
rename to content/charter.html
diff --git a/output/css/asciidoctor-default.css 
b/content/css/asciidoctor-default.css
similarity index 100%
rename from output/css/asciidoctor-default.css
rename to content/css/asciidoctor-default.css
diff --git a/output/css/bootstrap.css b/content/css/bootstrap.css
similarity index 100%
rename from output/css/bootstrap.css
rename to content/css/bootstrap.css
diff --git a/output/css/bootstrap.min.css b/content/css/bootstrap.min.css
similarity index 100%
rename from output/css/bootstrap.min.css
rename to content/css/bootstrap.min.css
diff --git a/output/css/site.css b/content/css/site.css
similarity index 100%
rename from output/css/site.css
rename to content/css/site.css
diff --git a/output/css/site.css.map b/content/css/site.css.map
similarity index 100%
rename from output/css/site.css.map
rename to content/css/site.css.map
diff --git a/output/doaps/doap_Log4j.rdf b/content/doaps/doap_Log4j.rdf
similarity index 100%
rename from output/doaps/doap_Log4j.rdf
rename to content/doaps/doap_Log4j.rdf
diff --git a/output/dormant.html b/content/dormant.html
similarity index 100%
rename from output/dormant.html
rename to content/dormant.html
diff --git a/output/feed.xml b/content/feed.xml
similarity index 100%
rename from output/feed.xml
rename to content/feed.xml
diff --git a/output/guidelines.html b/content/guidelines.html
similarity index 100%
rename from output/guidelines.html
rename to content/guidelines.html
diff --git a/output/img/feather.gif b/content/img/feather.gif
similarity index 100%
rename from output/img/feather.gif
rename to content/img/feather.gif
diff --git a/output/index.html b/content/index.html
similarity index 100%
rename from output/index.html
rename to content/index.html
diff --git a/output/js/bootstrap.js b/content/js/bootstrap.js
similarity index 100%
rename from output/js/bootstrap.js
rename to content/js/bootstrap.js
diff --git a/output/js/bootstrap.min.js b/content/js/bootstrap.min.js
similarity index 100%
rename from output/js/bootstrap.min.js
rename to content/js/bootstrap.min.js
diff --git a/output/js/jquery.js b/content/js/jquery.js
similarity index 100%
rename from output/js/jquery.js
rename to content/js/jquery.js
diff --git a/output/js/jquery.min.js b/content/js/jquery.min.js
similarity index 100%
rename from output/js/jquery.min.js
rename to content/js/jquery.min.js
diff --git a/output/js/site.js b/content/js/site.js
similarity index 100%
rename from output/js/site.js
rename to content/js/site.js
diff 

[logging-site] branch asf-staging updated: testing

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

grobmeier 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 19ef1385 testing
19ef1385 is described below

commit 19ef1385f7147916ed7a4941123aab38a7d67169
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:17:39 2023 +0200

testing
---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index cfe28fe5..428cc31c 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,4 +7,4 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
-  subdir: output
+  subdir: ~



[logging-site] branch asf-staging updated: Automatic Site Publish by Buildbot

2023-10-17 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 84049df1 Automatic Site Publish by Buildbot
84049df1 is described below

commit 84049df18f7f8873ced91acb96df8b5d80b4e0a4
Author: buildbot 
AuthorDate: Tue Oct 17 10:16:09 2023 +

Automatic Site Publish by Buildbot
---
 output/feed.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/output/feed.xml b/output/feed.xml
index 51545c98..f68b 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/; 
version="4.2.2">Jekyll2023-10-17T07:11:05+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-10-17T10:16:08+00:00/feed.xmlApache Software Foundation - Logging 
ServicesWrite an awesome description for your new site here. 
You can edit this line in _ [...]
 Release
 
 



[logging-site] branch jekyll updated: testing

2023-10-17 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 add2daa3 testing
add2daa3 is described below

commit add2daa346a76407f1fd704baf886adead9e2789
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:15:54 2023 +0200

testing
---
 .asf.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.asf.yaml b/.asf.yaml
index 335346fa..6fc48a25 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -5,6 +5,7 @@ notifications:
   jira_options: link label comment 
 
 jekyll:
+  profile: ~
   whoami: jekyll
   outputdir: content
   target: asf-staging



[logging-site] branch asf-staging updated: testing

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

grobmeier 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 f3a1bdb9 testing
f3a1bdb9 is described below

commit f3a1bdb9d427311c5015e19bfd51daffcc4deffa
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 12:13:31 2023 +0200

testing
---
 .asf.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.asf.yaml b/.asf.yaml
index bf2f3896..cfe28fe5 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,3 +7,4 @@ notifications:
 staging:
   profile: ~
   whoami: asf-staging
+  subdir: output



[logging-log4j-site] branch asf-site updated: Add RewriteBase

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new e8c0ac2cc Add RewriteBase
e8c0ac2cc is described below

commit e8c0ac2cc1ac468edb2998e5e8a715de0e87ae81
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 09:56:32 2023 +0200

Add RewriteBase
---
 2.x/log4j-api/.htaccess  | 3 ++-
 2.x/log4j-core/.htaccess | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/2.x/log4j-api/.htaccess b/2.x/log4j-api/.htaccess
index 218116559..1acf3be72 100644
--- a/2.x/log4j-api/.htaccess
+++ b/2.x/log4j-api/.htaccess
@@ -1,2 +1,3 @@
 RewriteEngine On
-RewriteRule "^apidocs(.*)$" "../javadoc/log4j-api$1" [R=permanent]
+RewriteBase "/log4j/2.x/"
+RewriteRule "^apidocs(.*)$" "javadoc/log4j-api$1" [R=permanent]
diff --git a/2.x/log4j-core/.htaccess b/2.x/log4j-core/.htaccess
index 218116559..1acf3be72 100644
--- a/2.x/log4j-core/.htaccess
+++ b/2.x/log4j-core/.htaccess
@@ -1,2 +1,3 @@
 RewriteEngine On
-RewriteRule "^apidocs(.*)$" "../javadoc/log4j-api$1" [R=permanent]
+RewriteBase "/log4j/2.x/"
+RewriteRule "^apidocs(.*)$" "javadoc/log4j-api$1" [R=permanent]



[logging-log4j-site] branch asf-site updated: Fix Javadoc redirects

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 1a32b4eb7 Fix Javadoc redirects
1a32b4eb7 is described below

commit 1a32b4eb70f42716d409c7894afb052399aa62ae
Author: Piotr P. Karwasz 
AuthorDate: Tue Oct 17 09:51:57 2023 +0200

Fix Javadoc redirects
---
 2.x/.htaccess| 6 --
 2.x/log4j-api/.htaccess  | 2 ++
 2.x/log4j-core/.htaccess | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/2.x/.htaccess b/2.x/.htaccess
deleted file mode 100644
index db6bd043e..0
--- a/2.x/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-RewriteEngine On
-RewriteBase "/log4j/2.x/"
-RewriteRule "^log4j-api/apidocs(.*)$" "javadoc/log4j-api$1" [R=permanent]
-RewriteRule "^log4j-core/apidocs(.*)$" "javadoc/log4j-core$1" [R=permanent]
-
-RewriteRule "^log4j-lala(.*)$" "javadoc/log4j-api$1" [R=permanent]
diff --git a/2.x/log4j-api/.htaccess b/2.x/log4j-api/.htaccess
new file mode 100644
index 0..218116559
--- /dev/null
+++ b/2.x/log4j-api/.htaccess
@@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule "^apidocs(.*)$" "../javadoc/log4j-api$1" [R=permanent]
diff --git a/2.x/log4j-core/.htaccess b/2.x/log4j-core/.htaccess
new file mode 100644
index 0..218116559
--- /dev/null
+++ b/2.x/log4j-core/.htaccess
@@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule "^apidocs(.*)$" "../javadoc/log4j-api$1" [R=permanent]



[logging-log4j-site] branch asf-staging updated (fc2aaf757 -> 25aa871c3)

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

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


from fc2aaf757 added release site to its own version
 add 25aa871c3 Revert staging prefix from `logging-log4j` to `logging`

No new revisions were added by this update.

Summary of changes:
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[logging-site] branch asf-staging updated: Automatic Site Publish by Buildbot

2023-10-17 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 9a682436 Automatic Site Publish by Buildbot
9a682436 is described below

commit 9a682436ec30b3be1a8f57aa0b184b76bdd175ec
Author: buildbot 
AuthorDate: Tue Oct 17 07:11:06 2023 +

Automatic Site Publish by Buildbot
---
 output/feed.xml   | 2 +-
 output/index.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/output/feed.xml b/output/feed.xml
index b73cad06..51545c98 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/; 
version="4.2.2">Jekyll2023-10-16T18:47:02+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-10-17T07:11:05+00:00/feed.xmlApache Software Foundation - Logging 
ServicesWrite an awesome description for your new site here. 
You can edit this line in _ [...]
 Release
 
 
diff --git a/output/index.html b/output/index.html
index 0fffa31f..2a383933 100644
--- a/output/index.html
+++ b/output/index.html
@@ -212,6 +212,7 @@
 
 
 
+
 
 
 



[logging-site] branch jekyll updated: retrigger build by adding line break

2023-10-17 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 fd41b198 retrigger build by adding line break
fd41b198 is described below

commit fd41b198066dfbddaa9b2c5d8767bcb4c63ed8c6
Author: Christian Grobmeier 
AuthorDate: Tue Oct 17 09:10:50 2023 +0200

retrigger build by adding line break
---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index 6bdf1da2..79af32ab 100644
--- a/index.html
+++ b/index.html
@@ -41,3 +41,4 @@ layout: default
   See dormant projects 

 
 
+