(logging-log4cxx) branch apr_cleanup updated (b02a1e4a -> d7dbf688)

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

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


from b02a1e4a Simplify charsetencodertest
 add d7dbf688 Improve charsetencodertest

No new revisions were added by this update.

Summary of changes:
 src/test/cpp/helpers/charsetencodertestcase.cpp | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)



(logging-log4cxx) branch apr_cleanup updated (95e0cffd -> b02a1e4a)

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

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


from 95e0cffd Remove unused references to APR
 add b02a1e4a Simplify charsetencodertest

No new revisions were added by this update.

Summary of changes:
 src/test/cpp/helpers/charsetencodertestcase.cpp | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)



(logging-log4cxx) 01/01: Remove unused references to APR

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

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

commit 95e0cffd0be53a571636c6b7ff3ead2e06ef17f9
Author: Stephen Webb 
AuthorDate: Wed Dec 6 16:51:13 2023 +1100

Remove unused references to APR
---
 src/main/cpp/aprinitializer.cpp   |  3 ---
 src/main/cpp/asyncappender.cpp|  4 
 src/main/cpp/cacheddateformat.cpp |  5 +
 src/main/cpp/datagramsocket.cpp   |  3 ---
 src/main/cpp/filewatchdog.cpp |  4 +---
 src/main/cpp/htmllayout.cpp   |  3 ---
 src/main/cpp/multiprocessrollingfileappender.cpp  |  1 -
 src/main/cpp/optionconverter.cpp  |  1 -
 src/main/cpp/relativetimedateformat.cpp   |  5 +
 src/main/cpp/telnetappender.cpp   |  3 ---
 src/main/include/log4cxx/helpers/aprinitializer.h |  1 -
 src/test/cpp/helpers/charsetencodertestcase.cpp   | 14 +-
 12 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/src/main/cpp/aprinitializer.cpp b/src/main/cpp/aprinitializer.cpp
index 58c44fad..4a72371f 100644
--- a/src/main/cpp/aprinitializer.cpp
+++ b/src/main/cpp/aprinitializer.cpp
@@ -20,10 +20,8 @@
 #endif
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -87,7 +85,6 @@ APRInitializer::APRInitializer() :
m_priv(std::make_unique())
 {
apr_pool_create(_priv->p, NULL);
-   apr_atomic_init(m_priv->p);
m_priv->startTime = Date::currentTime();
 #if APR_HAS_THREADS
apr_status_t stat = apr_threadkey_private_create(_priv->tlsKey, 
tlsDestructImpl, m_priv->p);
diff --git a/src/main/cpp/asyncappender.cpp b/src/main/cpp/asyncappender.cpp
index 228e1b8c..fde3fd6e 100644
--- a/src/main/cpp/asyncappender.cpp
+++ b/src/main/cpp/asyncappender.cpp
@@ -21,11 +21,7 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/src/main/cpp/cacheddateformat.cpp 
b/src/main/cpp/cacheddateformat.cpp
index 0447064d..197f94cf 100644
--- a/src/main/cpp/cacheddateformat.cpp
+++ b/src/main/cpp/cacheddateformat.cpp
@@ -18,9 +18,6 @@
 #define NOMINMAX /* tell wnidows not to define min/max macros */
 #include 
 #include 
-
-
-#include 
 #include 
 #include 
 #include 
@@ -158,7 +155,7 @@ int CachedDateFormat::findMillisecondStart(
Pool& pool)
 {
 
-   apr_time_t slotBegin = (time / 100) * 100;
+   log4cxx_time_t slotBegin = (time / 100) * 100;
 
if (slotBegin > time)
{
diff --git a/src/main/cpp/datagramsocket.cpp b/src/main/cpp/datagramsocket.cpp
index 24172c41..7df81ae4 100644
--- a/src/main/cpp/datagramsocket.cpp
+++ b/src/main/cpp/datagramsocket.cpp
@@ -22,9 +22,6 @@
 #include 
 #include 
 
-#include "apr_network_io.h"
-#include "apr_lib.h"
-
 using namespace LOG4CXX_NS::helpers;
 
 IMPLEMENT_LOG4CXX_OBJECT(DatagramSocket)
diff --git a/src/main/cpp/filewatchdog.cpp b/src/main/cpp/filewatchdog.cpp
index 45ea3941..c31363b0 100644
--- a/src/main/cpp/filewatchdog.cpp
+++ b/src/main/cpp/filewatchdog.cpp
@@ -18,8 +18,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -109,7 +107,7 @@ void FileWatchdog::checkAndConfigure()
}
else
{
-   apr_time_t thisMod = m_priv->file.lastModified(pool1);
+   auto thisMod = m_priv->file.lastModified(pool1);
 
if (thisMod > m_priv->lastModif)
{
diff --git a/src/main/cpp/htmllayout.cpp b/src/main/cpp/htmllayout.cpp
index 7b1f46ad..c2411ece 100644
--- a/src/main/cpp/htmllayout.cpp
+++ b/src/main/cpp/htmllayout.cpp
@@ -26,9 +26,6 @@
 #include 
 #include 
 
-#include 
-#include 
-
 using namespace LOG4CXX_NS;
 using namespace LOG4CXX_NS::helpers;
 using namespace LOG4CXX_NS::spi;
diff --git a/src/main/cpp/multiprocessrollingfileappender.cpp 
b/src/main/cpp/multiprocessrollingfileappender.cpp
index a78d10f1..a29b0c6d 100644
--- a/src/main/cpp/multiprocessrollingfileappender.cpp
+++ b/src/main/cpp/multiprocessrollingfileappender.cpp
@@ -17,7 +17,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #ifndef MAX_FILE_LEN
#define MAX_FILE_LEN 2048
diff --git a/src/main/cpp/optionconverter.cpp b/src/main/cpp/optionconverter.cpp
index 54290730..cfd1af57 100644
--- a/src/main/cpp/optionconverter.cpp
+++ b/src/main/cpp/optionconverter.cpp
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 #if !defined(LOG4CXX)
#define LOG4CXX 1
 #endif
diff --git a/src/main/cpp/relativetimedateformat.cpp 
b/src/main/cpp/relativetimedateformat.cpp
index 49d09059..612460b6 100644
--- a/src/main/cpp/relativetimedateformat.cpp
+++ b/src/main/cpp/relativetimedateformat.cpp
@@ -18,9 +18,6 @@
 #include 
 #include 
 #include 
-
-#include 
-#include 
 #include 
 
 
@@ -34,6 +31,6 @@ void 

(logging-log4cxx) branch apr_cleanup created (now 95e0cffd)

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

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


  at 95e0cffd Remove unused references to APR

This branch includes the following new commits:

 new 95e0cffd Remove unused references to APR

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-site) branch asf-staging updated: Automatic Site Publish by Buildbot

2023-12-05 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 957a9c09 Automatic Site Publish by Buildbot
957a9c09 is described below

commit 957a9c0920cd932018fa3857899b2be6f2b5e02b
Author: buildbot 
AuthorDate: Tue Dec 5 20:00:20 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 2955ca0c..6f2e7625 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-02T13:00:01+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-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 _ [...]
 
 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: pushed back date a little

2023-12-05 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 578fc7a4 pushed back date a little
 new fce51aef Merge branch 'jekyll' of github.com:apache/logging-site into 
jekyll
578fc7a4 is described below

commit 578fc7a455c79cecaa715c7e3143bdf289c01c7a
Author: Christian Grobmeier 
AuthorDate: Tue Dec 5 20:59:50 2023 +0100

pushed back date a little
---
 ...0-20-years-of-innovation.md => 2023-12-17-20-years-of-innovation.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_posts/2023-12-10-20-years-of-innovation.md 
b/_posts/2023-12-17-20-years-of-innovation.md
similarity index 97%
rename from _posts/2023-12-10-20-years-of-innovation.md
rename to _posts/2023-12-17-20-years-of-innovation.md
index 0c068965..5ccd074d 100644
--- a/_posts/2023-12-10-20-years-of-innovation.md
+++ b/_posts/2023-12-17-20-years-of-innovation.md
@@ -28,7 +28,7 @@ type: post
 
 # Two Decades of Apache Log4j: A Journey of Resilience and Innovation
 
-December 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-audit) branch dependabot/maven/master/org.checkerframework-checker-qual-3.41.0 deleted (was 6540d66)

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

github-bot pushed a change to branch 
dependabot/maven/master/org.checkerframework-checker-qual-3.41.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git


 was 6540d66  Bump org.checkerframework:checker-qual from 3.40.0 to 3.41.0

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(logging-log4j-audit) branch master updated: Update `org.checkerframework:checker-qual` to version `3.41.0` (#102)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new cab01c1  Update `org.checkerframework:checker-qual` to version 
`3.41.0` (#102)
cab01c1 is described below

commit cab01c1baaa3b50f152f53cee6cab920e34fb5a7
Author: ASF Logging Services RM 
AuthorDate: Tue Dec 5 16:47:33 2023 +

Update `org.checkerframework:checker-qual` to version `3.41.0` (#102)
---
 pom.xml   | 2 +-
 src/changelog/.1.x.x/update_org_checkerframework_checker_qual.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index dfaf1b7..d01a333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
  the independence of transitive dependencies from the order
  of dependencies (requireUpperBoundDeps rule).
  = -->
-3.40.0
+3.41.0
 32.1.3-jre
   
   
diff --git a/src/changelog/.1.x.x/update_org_checkerframework_checker_qual.xml 
b/src/changelog/.1.x.x/update_org_checkerframework_checker_qual.xml
index 5e009db..63270c1 100644
--- a/src/changelog/.1.x.x/update_org_checkerframework_checker_qual.xml
+++ b/src/changelog/.1.x.x/update_org_checkerframework_checker_qual.xml
@@ -3,6 +3,6 @@
xmlns="http://logging.apache.org/log4j/changelog;
xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
type="changed">
-  https://github.com/apache/logging-log4j-audit/pull/85"/>
-  Update `org.checkerframework:checker-qual` to 
version `3.40.0`
+  https://github.com/apache/logging-log4j-audit/pull/102"/>
+  Update `org.checkerframework:checker-qual` to 
version `3.41.0`
 



(logging-log4j-audit) branch dependabot/maven/master/org.checkerframework-checker-qual-3.41.0 created (now 6540d66)

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

github-bot pushed a change to branch 
dependabot/maven/master/org.checkerframework-checker-qual-3.41.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git


  at 6540d66  Bump org.checkerframework:checker-qual from 3.40.0 to 3.41.0

No new revisions were added by this update.



(logging-log4j2) branch main updated: Upgrade both JDK and JRE requirements to Java 17

2023-12-05 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


The following commit(s) were added to refs/heads/main by this push:
 new 77245ddae8 Upgrade both JDK and JRE requirements to Java 17
77245ddae8 is described below

commit 77245ddae8e9ffc2b355def5d87ce4d8b61ac819
Author: Volkan Yazıcı 
AuthorDate: Tue Dec 5 11:43:01 2023 +0100

Upgrade both JDK and JRE requirements to Java 17
---
 .github/workflows/build.yaml   |  6 +--
 .github/workflows/codeql-analysis.yaml |  2 +-
 .github/workflows/merge-dependabot.yaml|  4 +-
 .java-version  |  2 +-
 BUILDING.adoc  |  2 +-
 log4j-1.2-api/pom.xml  | 14 +++
 log4j-core-test/pom.xml| 21 ++
 .../log4j/core/net/UrlConnectionFactoryTest.java   |  6 ++-
 ...Test.java => DatePatternConverterTestBase.java} | 45 ++
 .../DatePatternConverterWithThreadLocalsTest.java  | 31 +++
 ...atePatternConverterWithoutThreadLocalsTest.java | 28 ++
 log4j-layout-jackson-xml/pom.xml   | 14 +++
 .../template/json/JsonTemplateLayoutTest.java  |  8 +++-
 log4j-osgi-test/pom.xml|  4 ++
 log4j-parent/pom.xml   |  6 ---
 pom.xml|  9 +++--
 src/changelog/.3.x.x/java_17_compiler.xml  | 23 +++
 src/changelog/.3.x.x/java_17_runtime.xml   | 23 +++
 18 files changed, 196 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a5cb0b9724..2492da4a55 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
 if: github.actor != 'dependabot[bot]'
 uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
 with:
-  java-version: 11
+  java-version: 17
   site-enabled: true
 
   deploy-snapshot:
@@ -52,7 +52,7 @@ jobs:
   NEXUS_USER: ${{ secrets.NEXUS_USER }}
   NEXUS_PW: ${{ secrets.NEXUS_PW }}
 with:
-  java-version: 11
+  java-version: 17
 
   deploy-release:
 needs: build
@@ -69,6 +69,6 @@ jobs:
 permissions:
   contents: write
 with:
-  java-version: 11
+  java-version: 17
   project-id: log4j
   site-enabled: true
diff --git a/.github/workflows/codeql-analysis.yaml 
b/.github/workflows/codeql-analysis.yaml
index 6792f262c5..c2168de737 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -32,7 +32,7 @@ jobs:
   analyze:
 uses: 
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@main
 with:
-  java-version: 11
+  java-version: 17
 # Permissions required to publish Security Alerts
 permissions:
   actions: read
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
index b4d0adc9ff..de41ba87ea 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -32,13 +32,13 @@ jobs:
 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
 with:
-  java-version: 11
+  java-version: 17
 
   merge-dependabot:
 needs: build
 uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
 with:
-  java-version: 11
+  java-version: 17
 permissions:
   contents: write # to push 
changelog commits
   pull-requests: write# to close 
the PR
diff --git a/.java-version b/.java-version
index b4de394767..98d9bcb75a 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11
+17
diff --git a/BUILDING.adoc b/BUILDING.adoc
index cc2576545e..dd83c8c21d 100644
--- a/BUILDING.adoc
+++ b/BUILDING.adoc
@@ -18,7 +18,7 @@
 [#requirements]
 == Requirements
 
-* JDK 11+
+* JDK 17+
 * A modern Linux, OSX, or Windows host
 
 [#building]
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 95ff919fd6..08f3077259 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -132,6 +132,8 @@
 
   
 
+
+  
   
 org.apache.maven.plugins
 maven-compiler-plugin
@@ -145,6 +147,18 @@
   
 
   
+
+  
+  
+org.apache.maven.plugins
+maven-surefire-plugin
+
+  --add-opens java.base/java.io=ALL-UNNAMED
+
+  
+
 
   
+
 
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index d111d8dfbe..ec7e071ee0 100644
--- a/log4j-core-test/pom.xml
+++ 

(logging-log4j2) branch main-j17 deleted (was 85cc9a3928)

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

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


 was 85cc9a3928 [WIP] Improve `DatePatternConverter*Test`

This change permanently discards the following revisions:

 discard 85cc9a3928 [WIP] Improve `DatePatternConverter*Test`
 discard c0363f0026 Remove duplicate ``
 discard d864cea6c9 Set version to `3.0.0-j17-SNAPSHOT` to ease testing
 discard a3180fab17 Initial cherry-pick for upgrading the compiler baseline to 
Java 17



(logging-log4j2) branch dependabot/maven/main/org.eclipse.platform-org.eclipse.osgi-3.18.600 created (now d526a6689c)

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

github-bot pushed a change to branch 
dependabot/maven/main/org.eclipse.platform-org.eclipse.osgi-3.18.600
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


  at d526a6689c Bump org.eclipse.platform:org.eclipse.osgi from 3.18.400 to 
3.18.600

No new revisions were added by this update.



(logging-log4j2) 01/03: Set version to `3.0.0-j17-SNAPSHOT` to ease testing

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

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

commit d864cea6c96686991695f079e9f1fc5259410a64
Author: Volkan Yazıcı 
AuthorDate: Tue Dec 5 09:42:43 2023 +0100

Set version to `3.0.0-j17-SNAPSHOT` to ease testing
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6aee31fe84..27c4e660b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,7 +302,7 @@
   
 
 
-3.0.0-SNAPSHOT
+3.0.0-j17-SNAPSHOT
 
 

(logging-log4j2) 03/03: [WIP] Improve `DatePatternConverter*Test`

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

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

commit 85cc9a39284bb607241819d73d60de1ace9eb0c0
Author: Volkan Yazıcı 
AuthorDate: Tue Dec 5 09:43:29 2023 +0100

[WIP] Improve `DatePatternConverter*Test`
---
 .../log4j/core/pattern/DatePatternConverterWithThreadLocalsTest.java | 5 +++--
 .../core/pattern/DatePatternConverterWithoutThreadLocalsTest.java| 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithThreadLocalsTest.java
 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithThreadLocalsTest.java
index e116120a97..e632d2785d 100644
--- 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithThreadLocalsTest.java
+++ 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithThreadLocalsTest.java
@@ -16,11 +16,12 @@
  */
 package org.apache.logging.log4j.core.pattern;
 
+import org.apache.logging.log4j.spi.LoggingSystemProperty;
 import org.apache.logging.log4j.test.junit.SetTestProperty;
 import org.apache.logging.log4j.test.junit.UsingTestProperties;
 
-@SetTestProperty(key = "log4j2.is.webapp", value = "false")
-@SetTestProperty(key = "log4j2.enable.threadlocals", value = "true")
+@SetTestProperty(key = LoggingSystemProperty.Constant.WEB_IS_WEBAPP, value = 
"false")
+@SetTestProperty(key = LoggingSystemProperty.Constant.THREAD_LOCALS_ENABLE, 
value = "true")
 @UsingTestProperties
 class DatePatternConverterWithThreadLocalsTest extends 
DatePatternConverterTestBase {
 
diff --git 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithoutThreadLocalsTest.java
 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithoutThreadLocalsTest.java
index 1559e28efb..3e5f9a46e7 100644
--- 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithoutThreadLocalsTest.java
+++ 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterWithoutThreadLocalsTest.java
@@ -16,10 +16,11 @@
  */
 package org.apache.logging.log4j.core.pattern;
 
+import org.apache.logging.log4j.spi.LoggingSystemProperty;
 import org.apache.logging.log4j.test.junit.SetTestProperty;
 import org.apache.logging.log4j.test.junit.UsingTestProperties;
 
-@SetTestProperty(key = "log4j2.enable.threadlocals", value = "false")
+@SetTestProperty(key = LoggingSystemProperty.Constant.THREAD_LOCALS_ENABLE, 
value = "false")
 @UsingTestProperties
 class DatePatternConverterWithoutThreadLocalsTest extends 
DatePatternConverterTestBase {
 



(logging-log4j2) 02/03: Remove duplicate ``

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

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

commit c0363f0026a3d882e01fd58a18fd5774cd85e159
Author: Volkan Yazıcı 
AuthorDate: Tue Dec 5 09:42:53 2023 +0100

Remove duplicate ``
---
 log4j-parent/pom.xml | 6 --
 1 file changed, 6 deletions(-)

diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index e3a2829a1c..57ca29a996 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -742,12 +742,6 @@
 ${opentest4j.version}
   
 
-  
-org.openjdk.nashorn
-nashorn-core
-${nashorn.version}
-  
-
   
 org.apache.felix
 org.apache.felix.framework



(logging-log4j2) branch main-j17 updated (a3180fab17 -> 85cc9a3928)

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

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


from a3180fab17 Initial cherry-pick for upgrading the compiler baseline to 
Java 17
 new d864cea6c9 Set version to `3.0.0-j17-SNAPSHOT` to ease testing
 new c0363f0026 Remove duplicate ``
 new 85cc9a3928 [WIP] Improve `DatePatternConverter*Test`

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:
 .../core/pattern/DatePatternConverterWithThreadLocalsTest.java  | 5 +++--
 .../core/pattern/DatePatternConverterWithoutThreadLocalsTest.java   | 3 ++-
 log4j-parent/pom.xml| 6 --
 pom.xml | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)