(logging-log4cxx) branch improve_macro_documentation created (now b71fe928)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch improve_macro_documentation in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git at b71fe928 Improve documentation of macros by labelling example usage This branch includes the following new commits: new b71fe928 Improve documentation of macros by labelling example usage 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: Improve documentation of macros by labelling example usage
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch improve_macro_documentation
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit b71fe928880112980933799f5e0d2f43da44c7a8
Author: Stephen Webb
AuthorDate: Tue Dec 19 18:07:31 2023 +1100
Improve documentation of macros by labelling example usage
---
src/main/include/log4cxx/logger.h | 100 +++---
src/site/doxy/Doxyfile.in | 2 +-
2 files changed, 63 insertions(+), 39 deletions(-)
diff --git a/src/main/include/log4cxx/logger.h
b/src/main/include/log4cxx/logger.h
index 403e7c0e..07419bb4 100644
--- a/src/main/include/log4cxx/logger.h
+++ b/src/main/include/log4cxx/logger.h
@@ -2056,19 +2056,21 @@ Add a new logging event containing \c message to
attached appender(s) if this lo
/**
Add a new logging event containing \c message to attached appender(s) if \c
logger is enabled for DEBUG events.
-@param logger the logger that has the enabled status.
-@param message a valid r-value expression of an
operator<<(std::ostream&. ...) overload.
-
+\usage
~~~{.cpp}
LOG4CXX_DEBUG(m_log, "AddMesh:"
<< " name " << meshName
<< " type 0x" << std:: hex << traits.Type
<< " materialName " << meshObject.GetMaterialName()
- << " visible " << traits.IsDefaultVisible
+ << " visible? " << traits.IsDefaultVisible
<< " at " << obj->getBoundingBox().getCenter()
<< " +/- " << obj->getBoundingBox().getHalfSize()
);
~~~
+
+@param logger the logger that has the enabled status.
+@param message a valid r-value expression of an
operator<<(std::ostream&. ...) overload.
+
*/
#define LOG4CXX_DEBUG(logger, message) do { \
if
(LOG4CXX_UNLIKELY(::LOG4CXX_NS::Logger::isDebugEnabledFor(logger))) {\
@@ -2078,6 +2080,18 @@ LOG4CXX_DEBUG(m_log, "AddMesh:"
/**
Add a new logging event containing a message defined by \c fmt and
... to attached appender(s) if \c logger is enabled for
DEBUG events.
+\usage
+~~~{.cpp}
+LOG4CXX_DEBUG(m_log, "AddMesh: name {} type 0x{x} materialName {} visible? {d}
at {} +/- {}"
+ , meshName
+ , traits.Type
+ , meshObject.GetMaterialName()
+ , traits.IsDefaultVisible
+ , obj->getBoundingBox().getCenter()
+ , obj->getBoundingBox().getHalfSize()
+ );
+~~~
+
@param logger the logger to be used.
@param fmt the layout of the message.
@param ... the variable parts of the message.
@@ -2094,12 +2108,13 @@ Add a new logging event containing a message defined by
\c fmt and ...TRACE events.
-@param logger the logger that has the enabled status.
-@param message a valid r-value expression of an
operator<<(std::ostream&. ...) overload.
-
+\usage
~~~{.cpp}
LOG4CXX_TRACE(m_log, "AddVertex:" << " at " << p << " n " << n << ' ' <<
color);
~~~
+
+@param logger the logger that has the enabled status.
+@param message a valid r-value expression of an
operator<<(std::ostream&. ...) overload.
*/
#define LOG4CXX_TRACE(logger, message) do { \
if
(LOG4CXX_UNLIKELY(::LOG4CXX_NS::Logger::isTraceEnabledFor(logger))) {\
@@ -2109,13 +2124,14 @@ Add a new logging event containing \c message to
attached appender(s) if \c logg
/**
Add a new logging event containing a message defined by \c fmt and
... to attached appender(s) if \c logger is enabled for
TRACE events.
-@param logger the logger to be used.
-@param fmt the layout of the message.
-@param ... the variable parts of the message.
-
+\usage
~~~{.cpp}
LOG4CXX_TRACE_FMT(m_log, "AddVertex: at {} n {} {}", p, n, color);
~~~
+
+@param logger the logger to be used.
+@param fmt the layout of the message.
+@param ... the variable parts of the message.
*/
#define LOG4CXX_TRACE_FMT(logger, fmt, ...) do { \
if
(LOG4CXX_UNLIKELY(::LOG4CXX_NS::Logger::isTraceEnabledFor(logger))) {\
@@ -2129,9 +2145,7 @@ Add a new logging event containing a message defined by
\c fmt and ...INFO events.
-@param logger the logger that has the enabled status.
-@param message a valid r-value expression of an
operator<<(std::ostream&. ...) overload.
-
+\usage
~~~{.cpp}
LOG4CXX_INFO(m_log, surface->GetName()
<< " successfully planned " << std::fixed << std::setprecision(1) <<
((plannedArea / (plannedArea + unplannedArea)) * 100.0) << "%"
@@ -2140,6 +2154,9 @@ LOG4CXX_INFO(m_log, surface->GetName()
<< " planned segments " << surface->GetSegmentPlanCount() << " of " <<
surface->GetSegmentCount()
);
~~~
+
+@param logger the logger that has the enabled status.
+@param message a valid r-value expression of an
operator<<(std::ostream&. ...) overload.
*/
#define LOG4CXX_INFO(logger, message) do { \
if (::LOG4CXX_NS::Logger::isInfoEnabledFor(logger)) {\
@@ -2149,10 +2166,7 @@ LOG4CXX_INFO(m_log, surface->GetName()
/**
Add a new logging event containing a message defined by \c fmt and
... to attached appender(s) if \c
(logging-log4cxx) branch benchmark_standard_format updated (0621ecb4 -> b63732ef)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch benchmark_standard_format in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from 0621ecb4 Support performance benchmarking using std::format add b63732ef Update clang workaround as per https://github.com/actions/runner-images/issues/8659#issuecomment-1853177960 No new revisions were added by this update. Summary of changes: .github/workflows/log4cxx-ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4cxx) 01/01: Support performance benchmarking using std::format
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch benchmark_standard_format
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 0621ecb47c5c0f6925fd0ddbdd9d6fe598816a7b
Author: Stephen Webb
AuthorDate: Tue Dec 19 16:13:06 2023 +1100
Support performance benchmarking using std::format
---
src/test/cpp/benchmark/CMakeLists.txt | 23 +--
src/test/cpp/benchmark/benchmark.cpp | 4 ++--
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/test/cpp/benchmark/CMakeLists.txt
b/src/test/cpp/benchmark/CMakeLists.txt
index 9acae364..6653d110 100644
--- a/src/test/cpp/benchmark/CMakeLists.txt
+++ b/src/test/cpp/benchmark/CMakeLists.txt
@@ -20,12 +20,17 @@ option(BUILD_BENCHMARK_CHECKS "Build google benchmark
checks" OFF)
if( NOT BUILD_BENCHMARK_CHECKS )
return()
endif()
+
find_package(benchmark REQUIRED)
-find_package(fmt QUIET)
-if(fmt_FOUND)
-set(LOG4CXX_HAS_FMT 1)
-else()
-set(LOG4CXX_HAS_FMT 0)
+set(BENCHMARK_TARGETS benchmark::benchmark benchmark::benchmark_main)
+
+set(LOG4CXX_HAS_FMT 0)
+if(NOT LOG4CXX_USE_STANDARD_FORMAT)
+find_package(fmt QUIET)
+if(fmt_FOUND)
+set(LOG4CXX_HAS_FMT 1)
+list(APPEND BENCHMARK_TARGETS fmt::fmt)
+endif()
endif()
add_executable(benchmark benchmark.cpp)
@@ -40,12 +45,10 @@ add_executable(benchmark benchmark.cpp)
if( WIN32 )
get_filename_component(APR_DLL_DIR "${APR_DLL}" DIRECTORY)
get_filename_component(APR_UTIL_DLL_DIR "${APR_UTIL_DLL}" DIRECTORY)
- get_filename_component(EXPAT_LIB_DIR "${EXPAT_LIBRARY}" DIRECTORY)
-
set(EXPAT_DLL_DIR "${EXPAT_LIB_DIR}/../bin")
set(LOG4CXX_DLL_DIR "$>;")
- set(PATH_FOR_TESTS
${CMAKE_PROGRAM_PATH};${APR_DLL_DIR};${APR_UTIL_DLL_DIR};${LOG4CXX_DLL_DIR};${EXPAT_DLL_DIR}\;)
+ set(PATH_FOR_TESTS
${CMAKE_PROGRAM_PATH};${APR_DLL_DIR};${APR_UTIL_DLL_DIR};${LOG4CXX_DLL_DIR}\;)
list(REMOVE_DUPLICATES PATH_FOR_TESTS)
set(NORMAL_PATH $ENV{PATH})
set(ESCAPED_PATH "")
@@ -60,5 +63,5 @@ add_custom_target(run-benchmarks COMMAND benchmark DEPENDS
benchmark)
endif( WIN32 )
target_compile_definitions(benchmark PRIVATE
"LOG4CXX_HAS_FMT=${LOG4CXX_HAS_FMT}" ${LOG4CXX_COMPILE_DEFINITIONS}
${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} )
-target_include_directories(benchmark PRIVATE ${CMAKE_CURRENT_LIST_DIR}
$)
-target_link_libraries(benchmark PRIVATE log4cxx ${APR_LIBRARIES}
${APR_SYSTEM_LIBS} Threads::Threads fmt::fmt benchmark::benchmark
benchmark::benchmark_main)
+target_include_directories(benchmark PRIVATE
$)
+target_link_libraries(benchmark PRIVATE log4cxx ${APR_LIBRARIES}
${APR_SYSTEM_LIBS} Threads::Threads ${BENCHMARK_TARGETS})
diff --git a/src/test/cpp/benchmark/benchmark.cpp
b/src/test/cpp/benchmark/benchmark.cpp
index 3c5a28d0..132c5ea6 100644
--- a/src/test/cpp/benchmark/benchmark.cpp
+++ b/src/test/cpp/benchmark/benchmark.cpp
@@ -6,7 +6,7 @@
#include
#if LOG4CXX_USING_STD_FORMAT
#include
-#else
+#elif LOG4CXX_HAS_FMT
#include
#endif
#include
@@ -135,7 +135,7 @@ BENCHMARK_DEFINE_F(benchmarker,
logStaticString)(benchmark::State& state)
}
BENCHMARK_REGISTER_F(benchmarker, logStaticString)->Name("Logging static
string");
-#if LOG4CXX_HAS_FMT
+#if LOG4CXX_USING_STD_FORMAT || LOG4CXX_HAS_FMT
BENCHMARK_DEFINE_F(benchmarker, logStaticStringFMT)(benchmark::State& state)
{
for (auto _ : state)
(logging-log4cxx) branch benchmark_standard_format created (now 0621ecb4)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch benchmark_standard_format in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git at 0621ecb4 Support performance benchmarking using std::format This branch includes the following new commits: new 0621ecb4 Support performance benchmarking using std::format 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-log4j-samples) branch dependabot/maven/com.google.guava-guava-33.0.0-jre deleted (was 02a7233)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.guava-guava-33.0.0-jre in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git was 02a7233 Update `com.google.guava:guava` to version `33.0.0-jre` (#) 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-samples) branch dependabot/maven/com.google.guava-guava-33.0.0-jre updated (1182298 -> 02a7233)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.guava-guava-33.0.0-jre in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git discard 1182298 Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre add 02a7233 Update `com.google.guava:guava` to version `33.0.0-jre` (#) 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 (1182298) \ N -- N -- N refs/heads/dependabot/maven/com.google.guava-guava-33.0.0-jre (02a7233) 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:
(logging-log4j-samples) branch main updated (96c9ed7 -> 02a7233)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git from 96c9ed7 Revert `logging-parent` action upgrade add 02a7233 Update `com.google.guava:guava` to version `33.0.0-jre` (#) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j-samples) branch dependabot/maven/com.google.guava-guava-33.0.0-jre created (now 1182298)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.guava-guava-33.0.0-jre in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git at 1182298 Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre No new revisions were added by this update.
(logging-log4j-kotlin) branch asf-staging updated (0ceb432 -> ae70e69)
This is an automated email from the ASF dual-hosted git repository. rgupta pushed a change to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git from 0ceb432 Fix `.asf.yaml` add ae70e69 Add `log4j-kotlin` version `1.4.0` website No new revisions were added by this update. Summary of changes: 1.x/index.html | 86 ++ 1 file changed, 75 insertions(+), 11 deletions(-)
(logging-log4j2) branch api-queue deleted (was 1e64ddfd23)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch api-queue in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 1e64ddfd23 Fix `spi.recycler` package version 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-log4j2) branch api-queue updated (ab1c1fe7f6 -> 1e64ddfd23)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch api-queue in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from ab1c1fe7f6 Move JCTools dependencies from `log4j-core` to `log4j-jctools` add 1e64ddfd23 Fix `spi.recycler` package version No new revisions were added by this update. Summary of changes: .../main/java/org/apache/logging/log4j/spi/recycler/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
svn commit: r66151 - /dev/logging/log4j-kotlin/
Author: svc_dist_logging Date: Mon Dec 18 18:48:28 2023 New Revision: 66151 Log: Added `apache-log4j-kotlin` artifacts for release `1.4.0` Added: 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 Mon Dec 18 18:48:28 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmWAk/sACgkQVuc7qaC1 +ktACkA/+Psm6wEHrJaljryo4r31a0WJeRsefivPzHu0ljcetN3HMz2uBvrKm0YUo +koYxwG2qB4dvjKzkY2/PVsP9oJjEJdbR7FE1lw1Fa6QqF1r2z52NxK5wFDq8EXU1 +aw7GLZMpQVvLWZA1RSumXyjUqYYP/rPlc4wWRrMwfiBKaZZI08KWQnnXZRvRlYA+ +am0oHvRCFO64dTMM85fy+y+Nz0r7Y0BNWdbURhqQc1Hwqv4ELTRt5DQ1HA23ICix +czl5GJ/NI5bDRL6sRwt+kCH4ARNUtIezGgYlltbuCmUwaUykxYoMPEMoTHgfj4dq +Pe8rsvhWONYLxC39xRDxcoSpFPWzYjhjQwPYeLGPD6Vftm5BwxmmKzH6Xdf062DL +hDaCYARQuh3fhNWquPdO4E94lcF7bP4hJEOJV8S6zXU4Rl0rkhZJ5zLeTRhYnfxf +PVOjjyQgHtSw5dk1JkIOfwYHaQZvK0fCljZa9zZUbwVPkhAGmXuvgQVC5JjA9ajI +w6Ig9EaCA+nSS7t84zMV9nf+UJ7n+JaNELOHrFehiUwFrpw8ENfiqwkCfs7ZkVl2 +h9D9ef0MIAiQwY2vHyVC/PRTJaHu0Wfq3UX4kopnLqqn/QirrUuGXtEd9HeZzO/Z +zVEBxNeOFbuoaEFjmbapjJ7nGmkLUSyc4bJwyk//o1MGr5cYyoY= +=0uU2 +-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 Mon Dec 18 18:48:28 2023 @@ -0,0 +1 @@ +0b2938685abaafd25bfab1592660208652e0208aa30f048f970eb2ba590ee83dd0f056c02f34a7536ba6bdd045f72a0922da73e631bc00a9d63318330333287d 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 Mon Dec 18 18:48:28 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 Mon Dec 18 18:48:28 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) branch release/1.4.0 updated: Release changelog for version `1.4.0`
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 ee2d4a8 Release changelog for version `1.4.0` ee2d4a8 is described below commit ee2d4a8efa16bb2223252329531c94e98ed6d1e6 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 18:46:36 2023 + Release changelog for version `1.4.0` --- src/changelog/1.4.0/.release.xml| 2 +- src/site/_release-notes/_1.4.0.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/changelog/1.4.0/.release.xml b/src/changelog/1.4.0/.release.xml index be63ef4..fba4325 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-12" version="1.4.0"/> + date="2023-12-18" version="1.4.0"/> diff --git a/src/site/_release-notes/_1.4.0.adoc b/src/site/_release-notes/_1.4.0.adoc index 94cf1dc..172032f 100644 --- a/src/site/_release-notes/_1.4.0.adoc +++ b/src/site/_release-notes/_1.4.0.adoc @@ -36,7 +36,7 @@ [#release-notes-1-4-0] === 1.4.0 -Release date:: 2023-12-12 +Release date:: 2023-12-18 This minor release fixes incorrect coroutine context map and stack.
(logging-log4j-kotlin) branch release/1.4.0 updated: Update the `project.build.outputTimestamp` property
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 3b7 Update the `project.build.outputTimestamp` property 3b7 is described below commit 3b7cd55dbb6dc3d9e2130e4b123b866ee2e8 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 18:46:28 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 162ff26..453b28a 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-12T19:06:18Z + 2023-12-18T18:39:10Z true
(logging-log4j-kotlin) 04/05: Remove redundant CI args
This is an automated email from the ASF dual-hosted git repository.
rgupta pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
commit 62a434b7a6b0d778ebd233d48b6bbea31fd5a72b
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-log4j-kotlin) 03/05: Release changelog for version `1.4.0`
This is an automated email from the ASF dual-hosted git repository.
rgupta pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
commit 6e2c00cba2429445c1e183ca6056ce4ded667cbd
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`
+* Update `org.apache.logging.log4j:log4j-bom` to version `2.22.0`
(https://github.com/apache/logging-log4j-kotlin/pull/52[52])
+* Update
(logging-log4j-kotlin) branch release/1.4.0 updated (bc5b269 -> 841a6d1)
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 bc5b269 Update the `project.build.outputTimestamp` property discard 22769f6 Remove redundant CI args discard 362ba58 Release changelog for version `1.4.0` discard 1d49f2b Update the `project.build.outputTimestamp` property omit 7ab77bd Changelog for `1.4.0` new 0e9fa8d Changelog for `1.4.0` new 47c0423 Update the `project.build.outputTimestamp` property new 6e2c00c Release changelog for version `1.4.0` new 62a434b Remove redundant CI args new 841a6d1 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 (bc5b269) \ N -- N -- N refs/heads/release/1.4.0 (841a6d1) 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 5 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) 05/05: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. rgupta pushed a commit to branch release/1.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git commit 841a6d1c388d1acf111e3210a7c47032b32f99fc 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) 01/05: Changelog for `1.4.0`
This is an automated email from the ASF dual-hosted git repository.
rgupta pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
commit 0e9fa8de9a3d565fa5c12dc39d3c93b5abf21c6e
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 | 7 ++
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
.../_1.4.0.adoc} | 27 --
6 files changed, 57 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..10f0d35
--- /dev/null
+++ b/src/changelog/1.4.0/54-thread-context.xml
@@ -0,0 +1,7 @@
+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) 02/05: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. rgupta pushed a commit to branch release/1.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git commit 47c0423b2b0f16870b9c8ae41afaa8e686d3dde6 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-audit) branch dependabot/maven/master/org.checkerframework-checker-qual-3.42.0 deleted (was df8aa8e)
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.42.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git was df8aa8e Bump org.checkerframework:checker-qual from 3.41.0 to 3.42.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.42.0` (#108)
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 0eff928 Update `org.checkerframework:checker-qual` to version `3.42.0` (#108) 0eff928 is described below commit 0eff928ce7ce455c57786ee21cdb039305b7c432 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 16:20:59 2023 + Update `org.checkerframework:checker-qual` to version `3.42.0` (#108) --- 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 636722b..a63f169 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ the independence of transitive dependencies from the order of dependencies (requireUpperBoundDeps rule). = --> -3.41.0 +3.42.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 63270c1..235c140 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/102"/> - Update `org.checkerframework:checker-qual` to version `3.41.0` + https://github.com/apache/logging-log4j-audit/pull/108"/> + Update `org.checkerframework:checker-qual` to version `3.42.0`
(logging-chainsaw) branch master updated: simplified about component, extraction to its own package
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 78ad25f simplified about component, extraction to its own package
78ad25f is described below
commit 78ad25fbbe7898a5d98188d4744fedfc53cf091e
Author: Christian Grobmeier
AuthorDate: Mon Dec 18 17:14:20 2023 +0100
simplified about component, extraction to its own package
---
.../{ => components/about}/ChainsawAbout.java | 80 -
.../org/apache/log4j/chainsaw/logui/LogUI.java | 3 +
src/main/resources/pages/about.html| 31
src/main/resources/pages/img/logo.png | Bin 0 -> 38280 bytes
src/main/resources/pages/stylesheet.css| 33 +
5 files changed, 98 insertions(+), 49 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
b/src/main/java/org/apache/log4j/chainsaw/components/about/ChainsawAbout.java
similarity index 54%
rename from src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/about/ChainsawAbout.java
index 06b1a93..50ae52e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/about/ChainsawAbout.java
@@ -14,14 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.about;
+import org.apache.log4j.chainsaw.JTextComponentFormatter;
import org.apache.log4j.chainsaw.help.HelpManager;
import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
import java.awt.*;
import java.io.IOException;
+import java.net.URL;
import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.logging.log4j.LogManager;
@@ -33,20 +35,13 @@ import org.apache.logging.log4j.Logger;
* @author Paul Smith psm...@apache.org
*/
public class ChainsawAbout extends JDialog {
-private static final Logger LOG = LogManager.getLogger();
+private static final Logger LOG =
LogManager.getLogger(ChainsawAbout.class);
-private final JEditorPane editPane = new JEditorPane("text/html", "");
-
-private final JScrollPane scrollPane = new JScrollPane(editPane,
-ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER,
-ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-
-private boolean sleep = false;
-
-private final Object guard = new Object();
+private final LogUI logUI;
public ChainsawAbout(LogUI logUI) {
super(logUI, "About Chainsaw v2", true);
+this.logUI = logUI;
setBackground(Color.white);
getContentPane().setLayout(new BorderLayout());
@@ -54,18 +49,22 @@ public class ChainsawAbout extends JDialog {
closeButton.addActionListener(e -> setVisible(false));
closeButton.setDefaultCapable(true);
+JEditorPane editPane = new JEditorPane("text/html", "");
try {
-String url = ChainsawAbout.class.getName().replace('.', '/') +
".html";
-
editPane.setPage(this.getClass().getClassLoader().getResource(url));
+URL url = ClassLoader.getSystemResource("pages/about.html");
+editPane.setPage(url);
} catch (IOException e) {
-throw new RuntimeException("Failed to find the About panel HTML",
e);
+throw new RuntimeException("Failed to find the about panel HTML",
e);
}
+JScrollPane scrollPane = new JScrollPane(
+editPane,
+ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+
getContentPane().add(scrollPane, BorderLayout.CENTER);
getContentPane().add(closeButton, BorderLayout.SOUTH);
-JTextComponentFormatter.applySystemFontAndSize(editPane);
-
editPane.setEditable(false);
editPane.addHyperlinkListener(
e -> {
@@ -74,44 +73,27 @@ public class ChainsawAbout extends JDialog {
}
});
-setSize(320, 240);
-new Thread(new Scroller()).start();
+calculateDimentions();
scrollPane.getViewport().setViewPosition(new Point(0, 0));
-
setLocationRelativeTo(logUI);
}
-private class Scroller implements Runnable {
-
-public void run() {
-while (true) {
-try {
-if (sleep) {
-synchronized (guard) {
-guard.wait();
-}
-SwingUtilities.invokeLater(() ->
scrollPane.getViewport().setViewPosition(
-new Point(0, 0)));
-continue;
-}
-
(logging-log4j-audit) branch dependabot/maven/master/org.checkerframework-checker-qual-3.42.0 created (now df8aa8e)
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.42.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git at df8aa8e Bump org.checkerframework:checker-qual from 3.41.0 to 3.42.0 No new revisions were added by this update.
(logging-site) branch asf-site updated (6cf411f6 -> 58d0a28a)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-site.git
from 6cf411f6 Automatic Site Publish by Buildbot
add 58d0a28a Automatic Site Publish by Buildbot
No new revisions were added by this update.
Summary of changes:
.../18/20-years-of-innovation.html}| 79 +++---
content/blog/index.html| 14
content/feed.xml | 47 -
content/index.html | 4 +-
4 files changed, 101 insertions(+), 43 deletions(-)
copy content/blog/2023/{11/17/flume-joins-logging-services.html =>
12/18/20-years-of-innovation.html} (73%)
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 58d0a28a Automatic Site Publish by Buildbot 58d0a28a is described below commit 58d0a28ae1f80e75068a64b95d3e31b6ab0d8362 Author: buildbot AuthorDate: Mon Dec 18 14:13:29 2023 + Automatic Site Publish by Buildbot --- .../12/18/20-years-of-innovation.html} | 114 ++--- content/blog/index.html| 14 +++ content/feed.xml | 47 - content/index.html | 4 +- 4 files changed, 114 insertions(+), 65 deletions(-) diff --git a/content/blog/index.html b/content/blog/2023/12/18/20-years-of-innovation.html similarity index 73% copy from content/blog/index.html copy to content/blog/2023/12/18/20-years-of-innovation.html index 178a7a1f..42acdd48 100644 --- a/content/blog/index.html +++ b/content/blog/2023/12/18/20-years-of-innovation.html @@ -151,76 +151,66 @@ - - + -Apache Logging Services Blog -Latest news from all Logging Services projects +Celebrating Two Decades of Innovation with Apache Log4j +Marking 20 years of growth and resilience with Apache Log4j, from its inception in 2003 to the upcoming launch of Log4j 3. + +18 Dec 2023 + + + 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, +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. - - - -14 Dec 2023 -Log4j: A New Chapter with STF Funding - -#Apache Log4j - -#Sovereign Tech Fund - -#Open Source - -#Community - - - - -02 Dec 2023 -Upgrade to Apache Commons Logging 1.3.0 - -#Apache - -#Commmons Logging - -#Open Source - - - - -28 Nov 2023 -Welcoming Stephen Webb to the Apache Logging Services PMC - -#Logging Services - -#Apache - -#Community - -#Open Source - - - - -17 Nov 2023 -Welcoming Apache Flume to Apache Logging Services - -#Logging Services - -#Flume - - - - - - +A Timeline of Success and Learning +From the early days of Log4j 1, we have witnessed numerous releases, +welcomed many new committers and PMC members, and seen the launch of various side +projects as Log4xx, Chainsaw or Log4php. The recent addition of +Apache Flume has further broadened our suite of logging +tools, showcasing our commitment to providing diverse and robust solutions. - - +We are incredibly proud of the learning curve we experienced with Log4j 1. +Every mistake was a stepping stone towards the development of Log4j 2, +which has surpassed all our previous projects in scope and impact. +Overcoming Challenges Together + +The Log4shell incident was a critical period for us. However, the strength +and support of not only our community but also the global open-source community +were astounding. Together, we transformed a challenge into an opportunity to create +the most secure logging framework to date. The extensive code reviews and +collaborative efforts post-Log4shell have significantly fortified +Log4j’s security features. + +Looking Ahead with Excitement + +The future looks bright as we eagerly anticipate the release of Log4j 3. +Alongside, we are preparing for new versions of Apache Flume, a logging processor, +and other exciting side projects. These developments are a testament to our +commitment to innovation and excellence. + +A Community That Values Collaboration + +At the heart of our success is our community spirit, perfectly encapsulated +in the Apache Software Foundation’s motto, “Community Over Code.” +This philosophy has been our guiding light, ensuring that we prioritize +collaboration, mutual respect, and collective growth. + +We warmly invite you to join us in this celebratory moment. Whether you +are a seasoned contributor or new to the open-source
(logging-site) branch main updated (f7a4857a -> 954ee01d)
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-site.git from f7a4857a added new timestamp for css add dc742d54 added new team members for Flume add 07895144 corrected my projects add 17584592 corrected branch name add 954ee01d retrigger build No new revisions were added by this update. Summary of changes: .asf.yaml | 2 +- _posts/2023-12-18-20-years-of-innovation.md | 4 ++-- team-list.adoc | 9 +++-- 3 files changed, 10 insertions(+), 5 deletions(-)
(logging-site) branch jekyll deleted (was 954ee01d)
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 was 954ee01d retrigger build 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-site) branch jekyll updated: retrigger build
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 954ee01d retrigger build 954ee01d is described below commit 954ee01dcf68e6dfae7c9ddc384599226da9a911 Author: Christian Grobmeier AuthorDate: Mon Dec 18 15:12:35 2023 +0100 retrigger build --- _posts/2023-12-18-20-years-of-innovation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2023-12-18-20-years-of-innovation.md b/_posts/2023-12-18-20-years-of-innovation.md index c78ab296..90853afe 100644 --- a/_posts/2023-12-18-20-years-of-innovation.md +++ b/_posts/2023-12-18-20-years-of-innovation.md @@ -29,8 +29,8 @@ 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, -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. +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. ## A Timeline of Success and Learning
(logging-site) branch asf-site updated (82b8bda2 -> 6cf411f6)
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git from 82b8bda2 Automatic Site Publish by Buildbot add bf59080d Automatic Site Publish by Buildbot add 6cf411f6 Automatic Site Publish by Buildbot No new revisions were added by this update. Summary of changes: content/feed.xml | 2 +- content/team-list.html | 28 ++-- 2 files changed, 27 insertions(+), 3 deletions(-)
(logging-parent) branch asf-staging updated: Add `logging-parent` version `10.5.0` (RC3) website
This is an automated email from the ASF dual-hosted git repository. vy 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 87bf76c Add `logging-parent` version `10.5.0` (RC3) website 87bf76c is described below commit 87bf76cda1d340393b2db7ee826964f0986e6636 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 13:25:59 2023 +0100 Add `logging-parent` version `10.5.0` (RC3) website --- 10.x/index.html | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/10.x/index.html b/10.x/index.html index 9634a22..32a87f5 100644 --- a/10.x/index.html +++ b/10.x/index.html @@ -819,6 +819,9 @@ Note that BND Maven Plugins version 7.0.0 increased the minimum req Switch from bnd:jar to bnd:bnd-process to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69;>69) +Replace log4j-changelog entry type of dependabot updates from changed to updated + + Minimum required Maven version is increased to 3.8.1 due to BND Maven Plugin updates @@ -844,7 +847,7 @@ Note that BND Maven Plugins version 7.0.0 increased the minimum req Update com.github.spotbugs:spotbugs-maven-plugin to version 4.8.2.0 (https://github.com/apache/logging-parent/pull/71;>71) -Replace log4j-changelog entry type of dependabot updates from changed to updated +Update com.palantir.javaformat:palantir-java-format to version 2.39.0 Update org.apache:apache to version 31 (https://github.com/apache/logging-parent/pull/73;>73) @@ -1666,7 +1669,7 @@ See the License for the specific language governing permissions and limitations -Last updated 2023-12-18 11:59:10 UTC +Last updated 2023-12-18 12:23:23 UTC
(logging-parent) branch release/10.5.0 updated: Release changelog for version `10.5.0`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.5.0 by this push: new e4816c8 Release changelog for version `10.5.0` e4816c8 is described below commit e4816c8c364c594359914cad808cf8fa582f1c0d Author: ASF Logging Services RM AuthorDate: Mon Dec 18 12:23:42 2023 + Release changelog for version `10.5.0` --- src/changelog/10.5.0/.release.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changelog/10.5.0/.release.xml b/src/changelog/10.5.0/.release.xml index bae8fcb..a307fdd 100644 --- a/src/changelog/10.5.0/.release.xml +++ b/src/changelog/10.5.0/.release.xml @@ -17,5 +17,5 @@ --> 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; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; date="2023-12-18" version="10.5.0"/>
(logging-parent) branch release/10.5.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.5.0 by this push: new f4787cc Update the `project.build.outputTimestamp` property f4787cc is described below commit f4787cc6c3524ff62892fd5319df42121d610a67 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 12:23:33 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 e3f3381..263f9a2 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,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-11T08:39:02Z + 2023-12-18T12:22:03Z 8
svn commit: r66125 - /dev/logging/logging-parent/
Author: svc_dist_logging Date: Mon Dec 18 12:24:26 2023 New Revision: 66125 Log: Added `apache-logging-parent` artifacts for release `10.5.0` Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt dev/logging/logging-parent/apache-logging-parent-10.5.0-email-vote.txt dev/logging/logging-parent/apache-logging-parent-10.5.0-site.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip.asc dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip.sha512 Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc Mon Dec 18 12:24:26 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmWAOfUACgkQVuc7qaC1 +ktCEzhAAhzHJNYMp8a/i/4Ev2RlXGWau8GMoqt3JFZ8tZlyFgUpZ3QGtQEbxHma4 +2jcQnxMQkvrUKky4xFxcVPkvVMg28b5LiANQgz6EaRU+iTEkPjg2cMmrvmnOOeFD +p/JuH0f81p+0TWqfmJRYe/ktrNzhtD5CUdDGDOY2Ebhx3Tv72xNFmS33dhOW0GqZ +a0qWg8IzT231YIybnSEopFArVIP1vJVwsImupUgWAK6TgtQa0NqAoBNU4GbiOpjn +l6Rg4HhcvJ/n98cWyFPBbN2sx+yWwE2pxNfGbsyMvQ4cBvegQ1FZREZehE9ymbt/ +HAB2hJjtOtryey9RA048QcnWdlTXcy10hywF923BxXi7GEw/4zvGp4WOXhWheupd +zuakjvjrIK23gFhkXoqqT1Z5KdLQzbNCvYGsWooSbE1G6JXEp4qDYTtZ7GzO9pvc +uWxd0W2bsW7CYzxVonsRwXX9OpYvfcRTiWdr7C85E4JWtoTl3mkyXzK7Kl4Ojdki +fwo4EOnTpNZhH7uyELpt3ThDouFigWWNpsjPp7uRRHC583Tk8D9loe/cbq4T9QqN +kYK4BSk0hMw3eGCExt6vHx3ipxKFhVrdfsPySsoLHKGj5eRsNCCFBrTDKDPp5o6s +Wf6QvgjhByUfgxfSSr2WwXzQPLP8/17OHuhmvpsNGtRa8jcXPkk= +=TdcF +-END PGP SIGNATURE- Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 Mon Dec 18 12:24:26 2023 @@ -0,0 +1 @@ +30e68a56f590407ed6a971a0516d2f779b62d11d93bc67efbf025ac347978edae0b62f6ed840e67a04f266f7c0108b38c9ec265e6c6d86ebfc2d43cef8f120ef apache-logging-parent-10.5.0-bin.zip Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt Mon Dec 18 12:24:26 2023 @@ -0,0 +1,35 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Logging Parent 10.5.0 released + +Apache Logging Parent team is pleased to announce the 10.5.0 +release. This project contains the parent POM for other Maven-based +Apache Logging Services projects. For further information (support, +download, etc.) see the project website[1]. + +[1] https://logging.apache.org/logging-parent + +=== Release Notes + +This minor release contains dependency updates and a change in the way BND is employed. + +BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17. +Log4j was the blocker for this upgrade and the issue is resolved in apache/logging-log4j2#2021. +Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven version to `3.8.1`. + + + Changed + +* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (#69) +* Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` +* Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates + + Updated + +* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (#78) +* Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0` +* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (#70) +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (#80) +* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (#71) +* Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0` +* Update `org.apache:apache` to version `31` (#73) +*
(logging-parent) 01/01: Improve changelog
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 69ddbe11216bc4968712c2099f01ecdd482e6c10 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 13:22:03 2023 +0100 Improve changelog --- ...gelog_entry_type.xml => change_dependabot_changelog_entry_type.xml} | 2 +- ...ype.xml => update_com_palantir_javaformat_palantir_java_format.xml} | 2 +- src/site/_release-notes/_10.5.0.adoc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml b/src/changelog/10.5.0/change_dependabot_changelog_entry_type.xml similarity index 94% copy from src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml copy to src/changelog/10.5.0/change_dependabot_changelog_entry_type.xml index fb2e0fc..3d07165 100644 --- a/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml +++ b/src/changelog/10.5.0/change_dependabot_changelog_entry_type.xml @@ -2,6 +2,6 @@ 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.3.xsd; - type="updated"> + type="changed"> Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` diff --git a/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml b/src/changelog/10.5.0/update_com_palantir_javaformat_palantir_java_format.xml similarity index 69% rename from src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml rename to src/changelog/10.5.0/update_com_palantir_javaformat_palantir_java_format.xml index fb2e0fc..86a30a0 100644 --- a/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml +++ b/src/changelog/10.5.0/update_com_palantir_javaformat_palantir_java_format.xml @@ -3,5 +3,5 @@ xmlns="http://logging.apache.org/log4j/changelog; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; type="updated"> - Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` + Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0` diff --git a/src/site/_release-notes/_10.5.0.adoc b/src/site/_release-notes/_10.5.0.adoc index 1569852..31115a0 100644 --- a/src/site/_release-notes/_10.5.0.adoc +++ b/src/site/_release-notes/_10.5.0.adoc @@ -48,6 +48,7 @@ Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven Changed * Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69[69]) +* Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` * Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates Updated @@ -57,6 +58,6 @@ Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) * Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80]) * Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (https://github.com/apache/logging-parent/pull/71[71]) -* Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` +* Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0` * Update `org.apache:apache` to version `31` (https://github.com/apache/logging-parent/pull/73[73]) * Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (https://github.com/apache/logging-parent/pull/84[84])
(logging-parent) branch release/10.5.0 updated (f0526c5 -> 69ddbe1)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
discard f0526c5 Release changelog for version `10.5.0`
discard 345c15e Update the `project.build.outputTimestamp` property
new 69ddbe1 Improve changelog
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 (f0526c5)
\
N -- N -- N refs/heads/release/10.5.0 (69ddbe1)
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/10.5.0/.release.xml | 2 +-
...gelog_entry_type.xml => change_dependabot_changelog_entry_type.xml} | 2 +-
...gin.xml => update_com_palantir_javaformat_palantir_java_format.xml} | 2 +-
src/site/_release-notes/_10.5.0.adoc | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
rename src/changelog/10.5.0/{update_dependabot_changelog_entry_type.xml =>
change_dependabot_changelog_entry_type.xml} (94%)
copy src/changelog/10.5.0/{update_biz_aqute_bnd_bnd_maven_plugin.xml =>
update_com_palantir_javaformat_palantir_java_format.xml} (72%)
(logging-parent) branch asf-staging updated: Add `logging-parent` version `10.5.0` (RC3) website
This is an automated email from the ASF dual-hosted git repository. vy 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 79b0b9b Add `logging-parent` version `10.5.0` (RC3) website 79b0b9b is described below commit 79b0b9bc1181613e8f0dd5fa19f7d980c79fed78 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 13:16:24 2023 +0100 Add `logging-parent` version `10.5.0` (RC3) website --- 10.x/index.html | 86 ++--- 1 file changed, 57 insertions(+), 29 deletions(-) diff --git a/10.x/index.html b/10.x/index.html index 5e5069d..9634a22 100644 --- a/10.x/index.html +++ b/10.x/index.html @@ -799,7 +799,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur Release date -2023-12-11 +2023-12-18 @@ -808,7 +808,8 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur BND Maven Plugins are upgraded to version 7.0.0, which requires Java 17. -Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/pull/2021;>apache/logging-log4j2#2021. +Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/pull/2021;>apache/logging-log4j2#2021. +Note that BND Maven Plugins version 7.0.0 increased the minimum required Maven version to 3.8.1. Changed @@ -818,6 +819,16 @@ Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-parent/issues/69;>69) +Minimum required Maven version is increased to 3.8.1 due to BND Maven Plugin updates + + + + + +Updated + + + Update biz.aQute.bnd:bnd-baseline-maven-plugin to version 7.0.0 (https://github.com/apache/logging-parent/pull/78;>78) @@ -827,16 +838,19 @@ Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-parent/pull/70;>70) -Update com.github.spotbugs:spotbugs-annotations to version 4.8.2 (https://github.com/apache/logging-parent/pull/68;>68) +Update com.github.spotbugs:spotbugs-annotations to version 4.8.3 (https://github.com/apache/logging-parent/pull/80;>80) Update com.github.spotbugs:spotbugs-maven-plugin to version 4.8.2.0 (https://github.com/apache/logging-parent/pull/71;>71) +Replace log4j-changelog entry type of dependabot updates from changed to updated + + Update org.apache:apache to version 31 (https://github.com/apache/logging-parent/pull/73;>73) -Update org.apache.logging.log4j:log4j-changelog-maven-plugin to version 0.6.0 (https://github.com/apache/logging-parent/pull/72;>72) +Update org.apache.logging.log4j:log4j-changelog-maven-plugin to version 0.7.0 (https://github.com/apache/logging-parent/pull/84;>84) @@ -921,36 +935,43 @@ Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/issues/1895;>apache/logging-log4j2#1895) + + + + +Fixed + + -Update com.github.spotbugs:spotbugs-annotations to version 4.8.1 (https://github.com/apache/logging-parent/pull/58;>58) - - -Update com.github.spotbugs:spotbugs-maven-plugin to version 4.8.1.0 (https://github.com/apache/logging-parent/pull/57;>57) - - -Update com.google.errorprone:error_prone_core to version 2.23.0 (https://github.com/apache/logging-parent/pull/49;>49) +Fix broken changelog entry validation -Update org.apache.maven.plugins:maven-artifact-plugin to version 3.5.0 +Attach flatten:clean to clean phase -Update org.cyclonedx:cyclonedx-maven-plugin to version 2.7.10 (https://github.com/apache/logging-parent/pull/54;>54) +Add missing Implementation- and Specification- entries in MANIFEST.MF to bnd-maven-plugin configuration (https://github.com/apache/logging-log4j2/issues/1923;>apache/logging-log4j2#1923) -Fixed +Updated -Fix broken changelog entry validation +Update com.github.spotbugs:spotbugs-annotations to version 4.8.1 (https://github.com/apache/logging-parent/pull/58;>58) -Attach flatten:clean to clean phase +Update com.github.spotbugs:spotbugs-maven-plugin to version 4.8.1.0 (https://github.com/apache/logging-parent/pull/57;>57) -Add missing Implementation- and Specification- entries in MANIFEST.MF to bnd-maven-plugin configuration (https://github.com/apache/logging-log4j2/issues/1923;>apache/logging-log4j2#1923) +Update com.google.errorprone:error_prone_core to version 2.23.0 (https://github.com/apache/logging-parent/pull/49;>49) + + +Update org.apache.maven.plugins:maven-artifact-plugin to version 3.5.0 + + +Update org.cyclonedx:cyclonedx-maven-plugin to version 2.7.10 (https://github.com/apache/logging-parent/pull/54;>54) @@ -993,14 +1014,8 @@ Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-parent/pull/44;>44) - @@ -1026,6 +1041,19 @@ Log4j was the blocker for
svn commit: r66124 - /dev/logging/logging-parent/
Author: svc_dist_logging Date: Mon Dec 18 12:00:07 2023 New Revision: 66124 Log: Added `apache-logging-parent` artifacts for release `10.5.0` Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt dev/logging/logging-parent/apache-logging-parent-10.5.0-email-vote.txt dev/logging/logging-parent/apache-logging-parent-10.5.0-site.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip.asc dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip.sha512 Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc Mon Dec 18 12:00:07 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmWANEYACgkQVuc7qaC1 +ktAQew//XoSBN0zqAQCzXDGhEqQi2o7PjMA1jYzx9yFZ7QZzk8/aRlIwMx7g0G/T +DhQQfvgxQYT0uL+m0YCFzRyyc9BpLBW0HbtfmMmCdosQBihqcfjp+/hIjlyBYC42 +io/4k2G+nh3OcPclG5iFn4fCSUek1rhuLcFz99vC8FGZRNxk5AEJAXgT6Y3c3hmo +J4+uQXIRcIvLMCmf0FQ15ezIUHSUN0Is4o/zVOjJBHfK+fOreJT+5LOJ4abdUbdP +8DhQ+lkP36GDuMAZX9zA/dnth2sQc6g0yIcsKa2lK6yzVJD5wn/9vcvIraETwGFV +37pQY95UBXlPCc4jWzBWmM6GJQBx5ZR7FuxqLYXStDlUTAqzZCYzXcNCxOTlyZ3o +i7F4SGEYqLqNQIWr4yjsEoAmumTHbo1VWGJ99/k9er1B5FkD4x8bg3ajRaWyisoS +zpc5yM1HtvZ/3Xn64TNNRanV4xYQGUUHuIOVdhEHsQ+U+n98PncI9VLE7dgdjFj+ +Ee1kAwIfkwZ4Uh4h9gqzRLiOgGnLW174VmbP7vPY3Kp9lrWemncSV0D0XypcsOkU +Sz0OL50rdwGort+W57y4iUnfj9zUYT9se04QiHqHtSP5gIisjXA0j0lMMdlb7BuJ +os4F/UmaJ9md6qzds7upt2bUh/fYcVPoQPxaDPYML0wCDO0acI0= +=4eVm +-END PGP SIGNATURE- Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 Mon Dec 18 12:00:07 2023 @@ -0,0 +1 @@ +0c435792d618928b6a77c265e72a80658df779d02f993b4985aaa0a60922ae874cc60f21c20a63e1ca3afd75214448227a6d3483f0621a562128354ea8224516 apache-logging-parent-10.5.0-bin.zip Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt Mon Dec 18 12:00:07 2023 @@ -0,0 +1,34 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Logging Parent 10.5.0 released + +Apache Logging Parent team is pleased to announce the 10.5.0 +release. This project contains the parent POM for other Maven-based +Apache Logging Services projects. For further information (support, +download, etc.) see the project website[1]. + +[1] https://logging.apache.org/logging-parent + +=== Release Notes + +This minor release contains dependency updates and a change in the way BND is employed. + +BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17. +Log4j was the blocker for this upgrade and the issue is resolved in apache/logging-log4j2#2021. +Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven version to `3.8.1`. + + + Changed + +* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (#69) +* Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates + + Updated + +* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (#78) +* Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0` +* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (#70) +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (#80) +* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (#71) +* Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` +* Update `org.apache:apache` to version `31` (#73) +* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
(logging-parent) branch release/10.5.0 updated: Release changelog for version `10.5.0`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.5.0 by this push: new f0526c5 Release changelog for version `10.5.0` f0526c5 is described below commit f0526c5d075cd2347f9bf11a4ed0b9fd3a5689d6 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 11:59:27 2023 + Release changelog for version `10.5.0` --- src/changelog/10.5.0/.release.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changelog/10.5.0/.release.xml b/src/changelog/10.5.0/.release.xml index bae8fcb..a307fdd 100644 --- a/src/changelog/10.5.0/.release.xml +++ b/src/changelog/10.5.0/.release.xml @@ -17,5 +17,5 @@ --> 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; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; date="2023-12-18" version="10.5.0"/>
(logging-log4j2) branch main updated: Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (#2102)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/main by this push: new 13538c5b8b Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (#2102) 13538c5b8b is described below commit 13538c5b8b0d37feb6049e41cded3774e6850532 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 11:58:26 2023 + Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (#2102) --- log4j-parent/pom.xml | 2 +- ..._java_allocation_instrumenter_java_allocation_instrumenter.xml | 8 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index bb7693dbf5..c44ecb4360 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -120,7 +120,7 @@ 2.16.0 2.4.0 2.0.1 - 3.3.3 + 3.3.4 4.0.2 18.3.12 9.4.52.v20230823 diff --git a/src/changelog/.3.x.x/update_com_google_code_java_allocation_instrumenter_java_allocation_instrumenter.xml b/src/changelog/.3.x.x/update_com_google_code_java_allocation_instrumenter_java_allocation_instrumenter.xml new file mode 100644 index 00..ba9b6823d3 --- /dev/null +++ b/src/changelog/.3.x.x/update_com_google_code_java_allocation_instrumenter_java_allocation_instrumenter.xml @@ -0,0 +1,8 @@ + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="changed"> + https://github.com/apache/logging-log4j2/pull/2102"/> + Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` +
(logging-log4j2) branch dependabot/maven/main/com.google.code.java-allocation-instrumenter-java-allocation-instrumenter-3.3.4 deleted (was 20b4874ef0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/com.google.code.java-allocation-instrumenter-java-allocation-instrumenter-3.3.4 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 20b4874ef0 Bump com.google.code.java-allocation-instrumenter:java-allocation-instrumenter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch release/10.5.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.5.0 by this push: new 345c15e Update the `project.build.outputTimestamp` property 345c15e is described below commit 345c15edf883fff30cc65409973766316a766c05 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 11:59:19 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 e3f3381..74e706b 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,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-11T08:39:02Z + 2023-12-18T11:54:42Z 8
(logging-parent) branch release/10.5.0 updated (a5ec441 -> 8dc2241)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
discard a5ec441 Release changelog for version `10.5.0`
discard 317ad5d Update the `project.build.outputTimestamp` property
new f2503e9 Update `com.palantir.javaformat:palantir-java-format` to
version `2.39.0`
new 8dc2241 Minor changes and bump the required Maven version to `3.8.1`
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 (a5ec441)
\
N -- N -- N refs/heads/release/10.5.0 (8dc2241)
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| 18 +++---
src/changelog/10.5.0/.release-notes.adoc.ftl | 1 +
src/changelog/10.5.0/.release.xml | 2 +-
.../maven-min-version.xml} | 3 +--
.../10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml | 3 +--
src/site/_release-notes/_10.5.0.adoc | 4 +++-
6 files changed, 22 insertions(+), 9 deletions(-)
copy src/changelog/{10.1.0/update_org_osgi_osgi_annotation.xml =>
10.5.0/maven-min-version.xml} (69%)
(logging-parent) 02/02: Minor changes and bump the required Maven version to `3.8.1`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 8dc2241b8646208a89b4474544581a41f9cd4c42 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 12:54:42 2023 +0100 Minor changes and bump the required Maven version to `3.8.1` --- pom.xml | 5 - src/changelog/10.5.0/.release-notes.adoc.ftl | 1 + ...date_biz_aqute_bnd_bnd_maven_plugin.xml => maven-min-version.xml} | 5 ++--- src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml | 3 +-- src/site/_release-notes/_10.5.0.adoc | 4 +++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cf52a74..e3f3381 100644 --- a/pom.xml +++ b/pom.xml @@ -165,6 +165,9 @@ `minimalJavaBuildVersion` is used for enforcing the compiler version. --> [17,18) + +3.8.1 + false @@ -278,7 +281,7 @@ 6.8.0.202311291450-r -6.4.1 +7.0.0 8.1.0 2.0.0 1.1.2 diff --git a/src/changelog/10.5.0/.release-notes.adoc.ftl b/src/changelog/10.5.0/.release-notes.adoc.ftl index bdcdc24..2eedf4e 100644 --- a/src/changelog/10.5.0/.release-notes.adoc.ftl +++ b/src/changelog/10.5.0/.release-notes.adoc.ftl @@ -42,5 +42,6 @@ This minor release contains dependency updates and a change in the way BND is em BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17. Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/pull/2021[apache/logging-log4j2#2021]. +Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven version to `3.8.1`. <#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml b/src/changelog/10.5.0/maven-min-version.xml similarity index 59% copy from src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml copy to src/changelog/10.5.0/maven-min-version.xml index 05227a6..72b3dac 100644 --- a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml +++ b/src/changelog/10.5.0/maven-min-version.xml @@ -2,7 +2,6 @@ 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.3.xsd; - type="updated"> - https://github.com/apache/logging-parent/pull/81"/> - Update `github/codeql-action` to version `3.22.11` + type="changed"> + Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates diff --git a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml index 05227a6..d3dc825 100644 --- a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml +++ b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml @@ -3,6 +3,5 @@ xmlns="http://logging.apache.org/log4j/changelog; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; type="updated"> - https://github.com/apache/logging-parent/pull/81"/> - Update `github/codeql-action` to version `3.22.11` + Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0` diff --git a/src/site/_release-notes/_10.5.0.adoc b/src/site/_release-notes/_10.5.0.adoc index 0ba2ebe..1569852 100644 --- a/src/site/_release-notes/_10.5.0.adoc +++ b/src/site/_release-notes/_10.5.0.adoc @@ -42,16 +42,18 @@ This minor release contains dependency updates and a change in the way BND is em BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17. Log4j was the blocker for this upgrade and the issue is resolved in https://github.com/apache/logging-log4j2/pull/2021[apache/logging-log4j2#2021]. +Note that BND Maven Plugins version `7.0.0` increased the minimum required Maven version to `3.8.1`. Changed * Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69[69]) +* Minimum required Maven version is increased to `3.8.1` due to BND Maven Plugin updates Updated * Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (https://github.com/apache/logging-parent/pull/78[78]) -* Update `github/codeql-action` to version `3.22.11` (https://github.com/apache/logging-parent/pull/81[81]) +* Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0` * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) * Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3`
(logging-parent) 01/02: Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit f2503e922485b2cadcc8a3a45700c1328908685f
Author: Volkan Yazıcı
AuthorDate: Mon Dec 18 12:48:56 2023 +0100
Update `com.palantir.javaformat:palantir-java-format` to version `2.39.0`
---
pom.xml | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fed644c..cf52a74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@
8.1.0
2.0.0
1.1.2
-2.38.0
+2.39.0
4.8.3
@@ -878,6 +878,15 @@ import org.apache.commons.codec.digest.*;
UNIX
+
+
+
+com.palantir.javaformat
+palantir-java-format
+${palantir-java-format.version}
+
+
default-spotless
(logging-log4j2) branch dependabot/maven/2.x/com.google.code.java-allocation-instrumenter-java-allocation-instrumenter-3.3.4 created (now a081eb983a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/com.google.code.java-allocation-instrumenter-java-allocation-instrumenter-3.3.4 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at a081eb983a Bump com.google.code.java-allocation-instrumenter:java-allocation-instrumenter No new revisions were added by this update.
(logging-parent) branch dependabot/maven/biz.aQute.bnd-biz.aQute.bnd.annotation-7.0.0 deleted (was 9a5acc9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/biz.aQute.bnd-biz.aQute.bnd.annotation-7.0.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was 9a5acc9 Bump biz.aQute.bnd:biz.aQute.bnd.annotation from 6.4.1 to 7.0.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch dependabot/maven/main/com.google.code.java-allocation-instrumenter-java-allocation-instrumenter-3.3.4 created (now 20b4874ef0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/com.google.code.java-allocation-instrumenter-java-allocation-instrumenter-3.3.4 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 20b4874ef0 Bump com.google.code.java-allocation-instrumenter:java-allocation-instrumenter No new revisions were added by this update.
(logging-parent) branch main updated: Update `biz.aQute.bnd:biz.aQute.bnd.annotation` to version `7.0.0` (#42)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main by this push: new a5a5639 Update `biz.aQute.bnd:biz.aQute.bnd.annotation` to version `7.0.0` (#42) a5a5639 is described below commit a5a5639b07ca909569ff745e7bae025cd9ec2660 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 10:51:52 2023 + Update `biz.aQute.bnd:biz.aQute.bnd.annotation` to version `7.0.0` (#42) --- pom.xml | 2 +- .../.10.x.x/update_biz_aqute_bnd_biz_aqute_bnd_annotation.xml | 8 src/site/_release-notes/_10.x.x.adoc | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adf84cd..80bad33 100644 --- a/pom.xml +++ b/pom.xml @@ -278,7 +278,7 @@ 6.8.0.202311291450-r -6.4.1 +7.0.0 8.1.0 2.0.0 1.1.2 diff --git a/src/changelog/.10.x.x/update_biz_aqute_bnd_biz_aqute_bnd_annotation.xml b/src/changelog/.10.x.x/update_biz_aqute_bnd_biz_aqute_bnd_annotation.xml new file mode 100644 index 000..7f93a1c --- /dev/null +++ b/src/changelog/.10.x.x/update_biz_aqute_bnd_biz_aqute_bnd_annotation.xml @@ -0,0 +1,8 @@ + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="changed"> + https://github.com/apache/logging-parent/pull/42"/> + Update `biz.aQute.bnd:biz.aQute.bnd.annotation` to version `7.0.0` + diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index ca838ae..9bfe00b 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -46,6 +46,7 @@ This minor release contains several small improvements. * Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69[69]) * Update `actions/setup-java` to version `4.0.0` (https://github.com/apache/logging-parent/pull/67[67]) * Update `actions/upload-artifact` to version `4.0.0` (https://github.com/apache/logging-parent/pull/83[83]) +* Update `biz.aQute.bnd:biz.aQute.bnd.annotation` to version `7.0.0` (https://github.com/apache/logging-parent/pull/42[42]) * Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (https://github.com/apache/logging-parent/pull/78[78]) * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) * Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80])
(logging-log4j2) 03/04: Create `log4j-jctools` module with a JCTools-based recycler
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch api-queue
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b37dcc14c3d6b674508c1f856f686818031f03d5
Author: Volkan Yazıcı
AuthorDate: Fri Dec 15 19:15:38 2023 +0100
Create `log4j-jctools` module with a JCTools-based recycler
---
.../log4j/internal/RecyclerFactoriesTest.java | 102 --
.../log4j/internal/StringParameterParserTest.java | 373 -
.../internal/{ => recycler}/ArrayQueueTest.java| 2 +-
.../recycler/RecyclerFactoriesTestUtil.java| 46 +++
.../recycler/RecyclerFactoryRegistryTest.java | 85 +
.../ThreadLocalRecyclerFactoryProviderTest.java} | 46 ++-
.../logging/log4j/internal/DefaultLogBuilder.java | 4 +-
.../logging/log4j/internal/QueueFactories.java | 143
.../log4j/internal/QueueingRecyclerFactory.java| 92 -
.../logging/log4j/internal/RecyclerFactories.java | 173 --
.../log4j/internal/StringParameterParser.java | 304 -
.../log4j/internal/ThreadLocalRecyclerFactory.java | 101 --
.../log4j/internal/{ => recycler}/ArrayQueue.java | 2 +-
.../recycler/DummyRecyclerFactoryProvider.java | 81 +
.../recycler/QueueingRecyclerFactoryProvider.java | 106 ++
.../ThreadLocalRecyclerFactoryProvider.java| 125 +++
.../logging/log4j/message/MessageFactory.java | 2 +-
.../log4j/message/ParameterizedMessage.java| 2 +-
.../log4j/message/ReusableMessageFactory.java | 4 +-
.../message/ReusableParameterizedMessage.java | 4 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 2 +
.../logging/log4j/spi/DummyRecyclerFactory.java| 59
.../apache/logging/log4j/spi/LoggingSystem.java| 6 +-
.../logging/log4j/spi/LoggingSystemProperty.java | 13 +-
.../logging/log4j/spi/PropertyComponent.java | 2 +
.../org/apache/logging/log4j/spi/QueueFactory.java | 32 --
.../apache/logging/log4j/spi/RecyclerFactory.java | 58
.../log4j/spi/{ => recycler}/AbstractRecycler.java | 10 +-
.../logging/log4j/spi/{ => recycler}/Recycler.java | 10 +-
.../log4j/spi/{ => recycler}/RecyclerAware.java| 3 +-
.../log4j/spi/recycler/RecyclerFactory.java| 58
.../spi/recycler/RecyclerFactoryProvider.java | 59
.../spi/recycler/RecyclerFactoryRegistry.java | 119 +++
.../logging/log4j/spi/recycler/package-info.java | 26 ++
.../apache/logging/log4j/status/StatusLogger.java | 5 +-
.../logging/log4j/util/ServiceLoaderUtil.java | 11 +
.../logging/log4j/core/config/Configuration.java | 2 +-
.../log4j/core/filter/StructuredDataFilter.java| 4 +-
.../logging/log4j/core/impl/DefaultBundle.java | 1 +
.../logging/log4j/core/impl/MutableLogEvent.java | 2 +-
.../log4j/core/impl/ReusableLogEventFactory.java | 4 +-
.../log4j/core/layout/AbstractStringLayout.java| 4 +-
.../logging/log4j/core/layout/PatternLayout.java | 2 +-
.../log4j/core/layout/StringBuilderEncoder.java| 2 +-
.../apache/logging/log4j/core/util/JsonUtils.java | 2 +-
{log4j-api-queue-jctools => log4j-jctools}/pom.xml | 21 +-
.../JCToolsMpmcRecyclerFactoryProvider.java| 106 ++
.../JCToolsMpmcRecyclerFactoryProviderTest.java| 32 +-
...ging.log4j.spi.recycler.RecyclerFactoryProvider | 6 +
.../layout/template/json/JsonTemplateLayout.java | 2 +-
.../template/json/resolver/CounterResolver.java| 2 +-
.../json/resolver/MessageParameterResolver.java| 2 +-
.../json/resolver/ReadOnlyStringMapResolver.java | 4 +-
.../json/resolver/StackTraceStringResolver.java| 4 +-
.../plugins/convert/TypeConverterFactory.java | 3 -
.../java/org/apache/logging/slf4j/SLF4JLogger.java | 2 +-
pom.xml| 2 +-
57 files changed, 961 insertions(+), 1518 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/RecyclerFactoriesTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/RecyclerFactoriesTest.java
deleted file mode 100644
index 9673abe14f..00
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/RecyclerFactoriesTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- *
(logging-log4j2) 02/04: Move JCTools-based queues in the API to a new module
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch api-queue
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4fd515f7833d4c3e37a728106d34c8e34b5c0fa7
Author: Volkan Yazıcı
AuthorDate: Tue Dec 12 12:45:09 2023 +0100
Move JCTools-based queues in the API to a new module
---
{log4j-api => log4j-api-queue-jctools}/pom.xml | 41 +++--
.../log4j/api/queue/JCToolsQueueFactory.java | 37 +++
log4j-api/pom.xml | 11 +---
.../logging/log4j/internal/QueueFactories.java | 71 +-
.../logging/log4j/internal/RecyclerFactories.java | 4 +-
.../apache/logging/log4j/status/StatusLogger.java | 2 +-
pom.xml| 7 +++
7 files changed, 99 insertions(+), 74 deletions(-)
diff --git a/log4j-api/pom.xml b/log4j-api-queue-jctools/pom.xml
similarity index 64%
copy from log4j-api/pom.xml
copy to log4j-api-queue-jctools/pom.xml
index 2ea9e66998..18dd10d906 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api-queue-jctools/pom.xml
@@ -15,44 +15,45 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
4.0.0
+
org.apache.logging.log4j
log4j
${revision}
../log4j-parent
- log4j-api
- jar
- Apache Log4j API
- The Apache Log4j API
+
+ log4j-api-queue-jctools
+ Apache Log4j API queue provider (JCTools)
+ Provides JCTools-based queue implementations for the Apache
Log4j API.
+
-false
+
+${basedir}/..
-org.apache.logging.log4j
-
-
- !javax.annotation.*,
-
- org.jctools.*;resolution:=optional
-
-
-
- jsr305;ignore=true,
-
- java.sql;static=true
-
+
org.apache.logging.log4j.api.queue.jctools
+org.apache.logging.log4j.core
+
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
org.jctools
jctools-core
- true
+
+
diff --git
a/log4j-api-queue-jctools/src/main/java/org/apache/logging/log4j/api/queue/JCToolsQueueFactory.java
b/log4j-api-queue-jctools/src/main/java/org/apache/logging/log4j/api/queue/JCToolsQueueFactory.java
new file mode 100644
index 00..57a39e31f8
--- /dev/null
+++
b/log4j-api-queue-jctools/src/main/java/org/apache/logging/log4j/api/queue/JCToolsQueueFactory.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.logging.log4j.api.queue;
+
+import aQute.bnd.annotation.spi.ServiceProvider;
+import java.util.Queue;
+import org.apache.logging.log4j.spi.QueueFactory;
+import org.jctools.queues.MpmcArrayQueue;
+
+/**
+ * A multi-producer-multi-consumer, thread-safe {@link QueueFactory}
implementation based on https://jctools.github.io/JCTools/;>JCTools.
+ */
+@ServiceProvider(QueueFactory.class)
+public final class JCToolsQueueFactory implements QueueFactory {
+
+@Override
+public Queue create(final int capacity) {
+if (capacity < 1) {
+throw new IllegalArgumentException("invalid capacity: " +
capacity);
+}
+return new MpmcArrayQueue<>(capacity);
+}
+}
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 2ea9e66998..bb22c40e74 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -36,9 +36,7 @@
org.apache.logging.log4j
- !javax.annotation.*,
-
- org.jctools.*;resolution:=optional
+ !javax.annotation.*
@@ -48,11 +46,4 @@
-
-
- org.jctools
- jctools-core
- true
-
-
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/QueueFactories.java
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/QueueFactories.java
index
(logging-log4j2) 04/04: Move JCTools dependencies from `log4j-core` to `log4j-jctools`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch api-queue
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ab1c1fe7f67e14879e6ac571bd7fbb65ee2788fa
Author: Volkan Yazıcı
AuthorDate: Mon Dec 18 11:45:18 2023 +0100
Move JCTools dependencies from `log4j-core` to `log4j-jctools`
---
.../recycler/RecyclerFactoryRegistryTest.java | 2 +-
...sTestUtil.java => RecyclerFactoryTestUtil.java} | 4 +-
.../ThreadLocalRecyclerFactoryProviderTest.java| 2 +-
log4j-core-its/pom.xml | 6 --
log4j-core-test/pom.xml| 6 --
.../log4j/core/appender/AsyncAppenderTest.java | 8 ---
.../log4j/core/async/perftest/RunJCTools.java | 29 -
log4j-core/pom.xml | 7 --
log4j-gctests/pom.xml | 6 --
log4j-jctools/pom.xml | 6 ++
.../jctools}/JCToolsBlockingQueueFactory.java | 9 +--
...er.java => JCToolsRecyclerFactoryProvider.java} | 16 ++---
.../jctools/JCToolsBlockingQueueFactoryTest.java | 76 ++
...ava => JCToolsRecyclerFactoryProviderTest.java} | 4 +-
.../resources/JCToolsBlockingQueueFactoryTest.xml | 2 +-
...ging.log4j.spi.recycler.RecyclerFactoryProvider | 2 +-
log4j-layout-template-json-test/pom.xml| 6 --
...rFactoryCustomizedJsonTemplateLayoutLogging.xml | 30 -
log4j-layout-template-json/pom.xml | 5 --
pom.xml| 12 ++--
src/site/asciidoc/manual/appenders.adoc| 1 +
src/site/asciidoc/runtime-dependencies.adoc| 4 --
22 files changed, 109 insertions(+), 134 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryRegistryTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryRegistryTest.java
index 8793c1244e..f6684f63cc 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryRegistryTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.logging.log4j.internal.recycler;
-import static
org.apache.logging.log4j.internal.recycler.RecyclerFactoriesTestUtil.createForEnvironment;
+import static
org.apache.logging.log4j.internal.recycler.RecyclerFactoryTestUtil.createForEnvironment;
import static org.apache.logging.log4j.spi.recycler.Recycler.DEFAULT_CAPACITY;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoriesTestUtil.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryTestUtil.java
similarity index 95%
rename from
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoriesTestUtil.java
rename to
log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryTestUtil.java
index 44422a3319..a6c8f99a2c 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoriesTestUtil.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/RecyclerFactoryTestUtil.java
@@ -23,9 +23,9 @@ import
org.apache.logging.log4j.spi.recycler.RecyclerFactoryRegistry;
import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.PropertyEnvironment;
-final class RecyclerFactoriesTestUtil {
+final class RecyclerFactoryTestUtil {
-private RecyclerFactoriesTestUtil() {}
+private RecyclerFactoryTestUtil() {}
@Nullable
static RecyclerFactory createForEnvironment(
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/ThreadLocalRecyclerFactoryProviderTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/ThreadLocalRecyclerFactoryProviderTest.java
index 7ccde99823..147a84e52c 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/ThreadLocalRecyclerFactoryProviderTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler/ThreadLocalRecyclerFactoryProviderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.logging.log4j.internal.recycler;
-import static
org.apache.logging.log4j.internal.recycler.RecyclerFactoriesTestUtil.createForEnvironment;
+import static
org.apache.logging.log4j.internal.recycler.RecyclerFactoryTestUtil.createForEnvironment;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index c1dee9b916..2b38ca60b5 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -72,12 +72,6 @@
(logging-log4j2) 01/04: Remove the need for an SPSC queue
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch api-queue
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8954e0770a7824e6199d515dcb63db11c040dcd3
Author: Volkan Yazıcı
AuthorDate: Tue Dec 12 11:48:15 2023 +0100
Remove the need for an SPSC queue
---
.../logging/log4j/internal/ArrayQueueTest.java | 101 +
.../apache/logging/log4j/internal/ArrayQueue.java | 100
.../logging/log4j/internal/QueueFactories.java | 6 --
.../log4j/internal/ThreadLocalRecyclerFactory.java | 11 ++-
4 files changed, 207 insertions(+), 11 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/ArrayQueueTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/ArrayQueueTest.java
new file mode 100644
index 00..e063e7f81c
--- /dev/null
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/ArrayQueueTest.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.logging.log4j.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.Queue;
+import java.util.Random;
+import java.util.concurrent.ArrayBlockingQueue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class ArrayQueueTest {
+
+@ParameterizedTest
+@ValueSource(ints = {-1, 0})
+void invalid_capacity_should_not_be_allowed(final int invalidCapacity) {
+assertThatThrownBy(() -> new ArrayQueue<>(invalidCapacity))
+.isInstanceOf(IllegalArgumentException.class)
+.hasMessage("invalid capacity: " + invalidCapacity);
+}
+
+@Test
+void should_work_with_capacity_1() {
+
+// Verify initials
+final Queue queue = new ArrayQueue<>(1);
+assertThat(queue.size()).isEqualTo(0);
+assertThat(queue.peek()).isNull();
+assertThat(queue.poll()).isNull();
+assertThat(queue).isEmpty();
+
+// Verify enqueue & deque
+assertThat(queue.offer("foo")).isTrue();
+assertThat(queue.offer("bar")).isFalse();
+assertThat(queue.size()).isEqualTo(1);
+assertThat(queue).containsOnly("foo");
+assertThat(queue.peek()).isEqualTo("foo");
+assertThat(queue.poll()).isEqualTo("foo");
+
+// Verify final state
+assertThat(queue.size()).isEqualTo(0);
+assertThat(queue.peek()).isNull();
+assertThat(queue.poll()).isNull();
+assertThat(queue).isEmpty();
+}
+
+@ParameterizedTest
+@CsvSource({
+"1,0.3", "1,0.5", "1,0.8", "2,0.3", "2,0.5", "2,0.8", "3,0.3",
"3,0.5", "3,0.8", "4,0.3", "4,0.5", "4,0.8"
+})
+void ops_should_match_with_std_lib(final int capacity, final double
pollRatio) {
+
+// Set the stage
+final Random random = new Random(0);
+final int opCount = random.nextInt(100);
+final Queue queueRef = new ArrayBlockingQueue<>(capacity);
+final Queue queueTarget = new ArrayQueue<>(capacity);
+
+for (int opIndex = 0; opIndex < opCount; opIndex++) {
+
+// Verify entry
+assertThat(queueTarget.size()).isEqualTo(queueRef.size());
+assertThat(queueTarget.peek()).isEqualTo(queueRef.peek());
+assertThat(queueTarget).containsExactlyElementsOf(queueRef);
+
+// Is this a `poll()`?
+if (pollRatio >= random.nextDouble()) {
+assertThat(queueTarget.poll()).isEqualTo(queueRef.poll());
+}
+
+// Then this is an `offer()`
+else {
+final String item = "op@" + opIndex;
+
assertThat(queueTarget.offer(item)).isEqualTo(queueRef.offer(item));
+}
+
+// Verify exit
+assertThat(queueTarget.size()).isEqualTo(queueRef.size());
+assertThat(queueTarget.peek()).isEqualTo(queueRef.peek());
+
(logging-log4j2) branch api-queue created (now ab1c1fe7f6)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch api-queue in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at ab1c1fe7f6 Move JCTools dependencies from `log4j-core` to `log4j-jctools` This branch includes the following new commits: new 8954e0770a Remove the need for an SPSC queue new 4fd515f783 Move JCTools-based queues in the API to a new module new b37dcc14c3 Create `log4j-jctools` module with a JCTools-based recycler new ab1c1fe7f6 Move JCTools dependencies from `log4j-core` to `log4j-jctools` The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(logging-parent) branch dependabot/maven/biz.aQute.bnd-biz.aQute.bnd.annotation-7.0.0 updated (afa7bf7 -> 9a5acc9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/biz.aQute.bnd-biz.aQute.bnd.annotation-7.0.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git discard afa7bf7 Bump biz.aQute.bnd:biz.aQute.bnd.annotation from 6.4.1 to 7.0.0 add c708cb9 Add website-specific release instructions add a9fc596 Fix website release instructions add f15ec64 Keep the BND baseline below 6, 7+ requires Java 17 (#41) add b3abbf9 Fixed the archiving of symbolically linked directories (#43) add 08b34b4 Build `site` in CI, if requested add 8a51eeb Avoid `--non-recursive` while running Maven `site` goal add 4a4b2e7 Add CodeQL Analysis add 1095045 Add Scorecards analysis add 8772c8d Remove unused parameter add bccb293 Issue `install` before `site` in reusable CI workflow add f693825 added line break to retrigger build add 890ee9c Update `github/codeql-action` to version `2.22.3` (#1558328036) add f7fbeee Update `ossf/scorecard-action` to version `2.3.0` (#1553916310) add f78e01d Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.0` (#1553835070) add 53062ea Update `actions/checkout` to version `4.1.1` (#1562197994) add 4af1637 Moves `.flattened-pom.xml` to the same directory as `pom.xml` add ebc246f Add SBOM support via `cyclonedx-maven-plugin` (apache/logging-log4j2#1707) add 81dfd72 Add compulsory `bnd-baseline-maven-plugin` execution add 423bcb3 Apply a common configuration to all `bnd-maven-plugin` goals add 5307a88 Update `log4j-changelog` and its XSD version to `0.5.0` and `0.1.2`, respectively add c44c782 Update auto-generated files add f294d2a Fix GitHub PR ID in the `dependabot` workflow add a5346d6 Clean-up changelog add b90d29e Update `com.google.errorprone:error_prone_core` to version `2.23.0` (#49) add c2cfd52 Set the version to `10.2.0` add 203f15b Release changelog for version `10.2.0` add d980925 Add concurrency limit add 13ee5ca Add --force to the release pushes performed by the CI add 995a1b9 Merge tag 'rel/10.2.0' add 8c841b6 Set version to `10.3.0-SNAPSHOT` add cd0f78c Improve release instructions add e329d5f Improve release instructions add fc8fd36 Enhance SBOM integration and its docs add 0ccf1d3 Update `github/codeql-action` to version `2.22.4` (#51) add 6d87af0 Attach `flatten:clean` to `clean` phase add cfdda22 Improve plugin execution IDs add d4c2081 Improve BND config (apache/logging-log4j2#1895) add 6b66b9c Fix broken changelog validation add d3e0af2 Remove `author` from changelogs add 54deb26 Update `ossf/scorecard-action` to version `2.3.1` (#52) add 519c980 Allow to override most BND properties add 9c48549 Auto-derive distribution attachments from the deployed ones add e3a127a Remove uninteresting changelog entries add ae5b110 Accept `*.pom` as a distribution attachment for testing purposes add aa47813 Match attachments against relative path in `distribution` BSH add eaaebe5 Fix auto-generated attachment filepath pattern in CI add 87266da Replace `project.build.outputTimestamp` in CI (#50) add 88d3ffe Fix `sed` in CI (#50) add d49fe10 Fix vote duration in `generate-email.sh` add 0ccafb1 Update `github/codeql-action` to version `2.22.5` (#53) add 0f06898 Update `org.cyclonedx:cyclonedx-maven-plugin` to version `2.7.10` (#54) add f39223f Update `actions/setup-java` to version `3.13.0` (#55) add fa0f758 Add `*.zip` files to reproducibility report add fc9cc55 Changes to `bnd-baseline-maven-plugin` add 2e488c5 Use `github.head_ref` for the `pull_request_target` event add a43a0b2 Add missing `Implementation-` and `Specification-` entries in `MANIFEST.MF` to `bnd-maven-plugin` configuration (apache/logging-log4j2#1923) add f3be97b Remove redundant changelog entries add 25df2e8 Change plugin version props naming convention add b69f628 Fix missing version property change add 47e93f8 Revert "Change plugin version props naming convention" add 954f7f2 Add `serialNumber` and VEX references to generate SBOMs (#56) add 0ed43aa Use the last commit date for setting `project.build.outputTimestamp` add 770f18d Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0` add a1fe5ab Replace '/security' with '/cyclonedx' add 4c5ecc1 Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` (#57) add b34cfa7 Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` (#58) add 0c7c23e Set version to `10.3.0` add d5a36f2 Release changelog for version `10.3.0` add 3677658 Dummy commit to trigger CI add 10e616c Match attachments against relative path in
(logging-parent) branch dependabot/maven/biz.aQute.bnd-biz.aQute.bnd.annotation-7.0.0 created (now afa7bf7)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch dependabot/maven/biz.aQute.bnd-biz.aQute.bnd.annotation-7.0.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at afa7bf7 Bump biz.aQute.bnd:biz.aQute.bnd.annotation from 6.4.1 to 7.0.0 No new revisions were added by this update.
svn commit: r66120 - /dev/logging/logging-parent/
Author: svc_dist_logging Date: Mon Dec 18 10:43:13 2023 New Revision: 66120 Log: Added `apache-logging-parent` artifacts for release `10.5.0` Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt dev/logging/logging-parent/apache-logging-parent-10.5.0-email-vote.txt dev/logging/logging-parent/apache-logging-parent-10.5.0-site.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip.asc dev/logging/logging-parent/apache-logging-parent-10.5.0-src.zip.sha512 Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.asc Mon Dec 18 10:43:13 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmWAIjwACgkQVuc7qaC1 +ktCx+A//duTOxW5K3ilgFrQ71NHCkALk0HP7ZyCDyHYExSmF44h5oB5L0KxtQ+Er +UgEwa/WTip4N4aNtQabA2f+25DsOk7qXhKSA1wTi3lV7Q//pqvFtZ4JDd0GcjurI +aNgtiTHszBskg/X2kn1dxGB3P32QyJJZ2IWZT9KUq/VLKBgBpFBkGxpf467gJ2Lv +xEoc9IdQfCWPNLniE9E9rp7asOD+caAkoFTziJBDg+nHyAiMm/OVcDlc9CbVZT+H +m8VZh4jiDpk5U1bQ5zPP5cpQJtz+srsI8GO6LilmLF9ALzTrSv1EvnR1AY79REur +Efo8+XAGMGfhamXpvPgwX34KcDTvqKM2wkqIfwoYIvEWbyB2RB2JzZKL5FsDzJdn +p7Acq1kj5YrI6RSOk5OUcp3RJMpcCN3t+R0pK8aFz6F3DD/DJ4wcnQaGLRvrNwrL +5crHNAi+kQzhZrAxwVrNueN+2pUNLggubdYk4B0X/NXvdzYfj3OtUQZU1HeT+kpa +dhm6WSOI2Ery62zsN4HyDjbqPMg8KMiA0HqO/WgyqP0WPLle/UIAP+2hRd5c3T5Z +7J+kwSp1lkoCV+ZHqRAQ/7P7G+4XexR5GlOxc8DDOIwrLUhN4pqAuGMIJmC9JtBq +dvIxVS1xwfovBSZpa05quG2dZJaEGgrOBjhj2dJswaA/N2aosAc= +=xyT3 +-END PGP SIGNATURE- Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-bin.zip.sha512 Mon Dec 18 10:43:13 2023 @@ -0,0 +1 @@ +05d0be894a17d288551b97e24a43c96e49f7187b3dacbdf9a1aab88b1e627eb56490c6b0119ff4fb52b26009f668d29562cf28a6a16096a504b8dab399fc6918 apache-logging-parent-10.5.0-bin.zip Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt == --- dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.5.0-email-announce.txt Mon Dec 18 10:43:13 2023 @@ -0,0 +1,32 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Logging Parent 10.5.0 released + +Apache Logging Parent team is pleased to announce the 10.5.0 +release. This project contains the parent POM for other Maven-based +Apache Logging Services projects. For further information (support, +download, etc.) see the project website[1]. + +[1] https://logging.apache.org/logging-parent + +=== Release Notes + +This minor release contains dependency updates and a change in the way BND is employed. + +BND Maven Plugins are upgraded to version `7.0.0`, which requires Java 17. +Log4j was the blocker for this upgrade and the issue is resolved in apache/logging-log4j2#2021. + + + Changed + +* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (#69) + + Updated + +* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (#78) +* Update `github/codeql-action` to version `3.22.11` (#81) +* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (#70) +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (#80) +* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (#71) +* Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` +* Update `org.apache:apache` to version `31` (#73) +* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (#84) Added: dev/logging/logging-parent/apache-logging-parent-10.5.0-email-vote.txt == ---
(logging-parent) branch release/10.5.0 updated: Release changelog for version `10.5.0`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.5.0 by this push: new a5ec441 Release changelog for version `10.5.0` a5ec441 is described below commit a5ec441ded70b1e6d5a6d565a86bdbc5626d741a Author: ASF Logging Services RM AuthorDate: Mon Dec 18 10:42:30 2023 + Release changelog for version `10.5.0` --- src/changelog/10.5.0/.release.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changelog/10.5.0/.release.xml b/src/changelog/10.5.0/.release.xml index bae8fcb..a307fdd 100644 --- a/src/changelog/10.5.0/.release.xml +++ b/src/changelog/10.5.0/.release.xml @@ -17,5 +17,5 @@ --> 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; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; date="2023-12-18" version="10.5.0"/>
(logging-parent) branch release/10.5.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.5.0 by this push: new 317ad5d Update the `project.build.outputTimestamp` property 317ad5d is described below commit 317ad5d5b285d607930a68a2478af43e8a0f16a4 Author: ASF Logging Services RM AuthorDate: Mon Dec 18 10:42:21 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 fed644c..2817bca 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,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-11T08:39:02Z + 2023-12-18T10:38:23Z 8
(logging-parent) 05/11: Update `actions/upload-artifact` to version `4.0.0` (#83)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 94b03204d06f23488ccbae84e1cab43bbfdec91e
Author: ASF Logging Services RM
AuthorDate: Fri Dec 15 10:12:59 2023 +
Update `actions/upload-artifact` to version `4.0.0` (#83)
---
.github/workflows/build-reusable.yaml| 4 ++--
.github/workflows/scorecards-analysis-reusable.yaml | 2 +-
src/changelog/.10.x.x/update_actions_upload_artifact.xml | 8
src/site/_release-notes/_10.x.x.adoc | 1 +
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build-reusable.yaml
b/.github/workflows/build-reusable.yaml
index 41c4d97..82424dd 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -80,7 +80,7 @@ jobs:
# We upload tests results if the build fails.
- name: Upload test results
if: failure() && steps.build.conclusion == 'failure'
-uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
# 3.1.3
+uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
# 4.0.0
with:
name:
surefire-${{matrix.os}}-${{github.run_number}}-${{github.run_attempt}}
path: |
@@ -101,7 +101,7 @@ jobs:
# We reproducibility results if the build fails.
- name: Upload reproducibility results
if: failure() && steps.reproducibility.conclusion == 'failure'
-uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
# 3.1.3
+uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
# 4.0.0
with:
name:
reproducibility-${{matrix.os}}-${{github.run_number}}-${{github.run_attempt}}
path: |
diff --git a/.github/workflows/scorecards-analysis-reusable.yaml
b/.github/workflows/scorecards-analysis-reusable.yaml
index 4383b16..cc01db3 100644
--- a/.github/workflows/scorecards-analysis-reusable.yaml
+++ b/.github/workflows/scorecards-analysis-reusable.yaml
@@ -47,7 +47,7 @@ jobs:
publish_results: true
- name: "Upload artifact"
-uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
# 3.1.0
+uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
# 3.1.0
with:
name: SARIF file
path: results.sarif
diff --git a/src/changelog/.10.x.x/update_actions_upload_artifact.xml
b/src/changelog/.10.x.x/update_actions_upload_artifact.xml
new file mode 100644
index 000..839e3b4
--- /dev/null
+++ b/src/changelog/.10.x.x/update_actions_upload_artifact.xml
@@ -0,0 +1,8 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+ xmlns="http://logging.apache.org/log4j/changelog;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ type="changed">
+ https://github.com/apache/logging-parent/pull/83"/>
+ Update `actions/upload-artifact` to version
`4.0.0`
+
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index fc5a846..6ef81d5 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -45,6 +45,7 @@ This minor release contains several small improvements.
* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the
ecosystem; IDEs, Maven plugins, etc.
(https://github.com/apache/logging-parent/issues/69[69])
* Update `actions/setup-java` to version `4.0.0`
(https://github.com/apache/logging-parent/pull/67[67])
+* Update `actions/upload-artifact` to version `4.0.0`
(https://github.com/apache/logging-parent/pull/83[83])
* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0`
(https://github.com/apache/logging-parent/pull/78[78])
* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1`
(https://github.com/apache/logging-parent/pull/70[70])
* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3`
(https://github.com/apache/logging-parent/pull/80[80])
(logging-parent) 10/11: Employ `updated` changelog entry type
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 61f15b16d32658df4fe0bf9e293271722d75637e Author: Volkan Yazıcı AuthorDate: Mon Dec 18 10:57:07 2023 +0100 Employ `updated` changelog entry type --- src/changelog/10.2.0/update-changelog-version.xml | 2 +- .../update_com_github_spotbugs_spotbugs_annotations.xml | 2 +- .../update_com_github_spotbugs_spotbugs_annotations.xml | 2 +- .../update_com_github_spotbugs_spotbugs_maven_plugin.xml| 2 +- .../update_com_google_errorprone_error_prone_core.xml | 2 +- ...pdate_org_apache_maven_plugins_maven_artifact_plugin.xml | 2 +- .../10.3.0/update_org_cyclonedx_cyclonedx_maven_plugin.xml | 2 +- .../update_biz_aqute_bnd_bnd_baseline_maven_plugin.xml | 2 +- .../10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml| 2 +- .../update_com_diffplug_spotless_spotless_maven_plugin.xml | 2 +- .../update_com_github_spotbugs_spotbugs_annotations.xml | 2 +- .../update_com_github_spotbugs_spotbugs_maven_plugin.xml| 2 +- .../10.5.0/update_dependabot_changelog_entry_type.xml | 2 +- src/changelog/10.5.0/update_org_apache_apache.xml | 2 +- ...rg_apache_logging_log4j_log4j_changelog_maven_plugin.xml | 2 +- src/site/_release-notes/_10.2.0.adoc| 7 +-- src/site/_release-notes/_10.3.0.adoc| 13 - src/site/_release-notes/_10.5.0.adoc| 3 +++ 18 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/changelog/10.2.0/update-changelog-version.xml b/src/changelog/10.2.0/update-changelog-version.xml index 18bbdb5..0fdca35 100644 --- a/src/changelog/10.2.0/update-changelog-version.xml +++ b/src/changelog/10.2.0/update-changelog-version.xml @@ -2,6 +2,6 @@ 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.3.xsd; - type="changed"> + type="updated"> Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.5.0` diff --git a/src/changelog/10.2.0/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/10.2.0/update_com_github_spotbugs_spotbugs_annotations.xml index 9267416..08e5c2a 100644 --- a/src/changelog/10.2.0/update_com_github_spotbugs_spotbugs_annotations.xml +++ b/src/changelog/10.2.0/update_com_github_spotbugs_spotbugs_annotations.xml @@ -2,7 +2,7 @@ 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.3.xsd; - type="changed"> + type="updated"> https://github.com/apache/logging-parent/pull/44"/> Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.0` diff --git a/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_annotations.xml index 8653f4a..a6d9ca0 100644 --- a/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_annotations.xml +++ b/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_annotations.xml @@ -2,7 +2,7 @@ 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.3.xsd; - type="changed"> + type="updated"> https://github.com/apache/logging-parent/pull/58"/> Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` diff --git a/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml b/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml index 86c3994..1ac5cb4 100644 --- a/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml +++ b/src/changelog/10.3.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml @@ -2,7 +2,7 @@ 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.3.xsd; - type="changed"> + type="updated"> https://github.com/apache/logging-parent/pull/57"/> Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` diff --git a/src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml b/src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml index 5f209b8..c220bd2 100644 --- a/src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml +++ b/src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml @@ -2,7 +2,7 @@
(logging-parent) 09/11: Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 6a856ce913e4203378e533ece7796edd1a7803b5 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 10:54:48 2023 +0100 Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` --- .github/workflows/merge-dependabot-reusable.yaml| 2 +- src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml | 7 +++ src/site/_release-notes/_10.5.0.adoc| 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-reusable.yaml b/.github/workflows/merge-dependabot-reusable.yaml index 753e602..d862a4c 100644 --- a/.github/workflows/merge-dependabot-reusable.yaml +++ b/.github/workflows/merge-dependabot-reusable.yaml @@ -107,7 +107,7 @@ jobs: 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.3.xsd; - type="changed"> + type="updated"> Update \`$DEPENDENCY_NAME\` to version \`$DEPENDENCY_VERSION\` diff --git a/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml b/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml new file mode 100644 index 000..3d07165 --- /dev/null +++ b/src/changelog/10.5.0/update_dependabot_changelog_entry_type.xml @@ -0,0 +1,7 @@ + +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.3.xsd; + type="changed"> + Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` + diff --git a/src/site/_release-notes/_10.5.0.adoc b/src/site/_release-notes/_10.5.0.adoc index 8672a3b..94a7c0f 100644 --- a/src/site/_release-notes/_10.5.0.adoc +++ b/src/site/_release-notes/_10.5.0.adoc @@ -52,5 +52,6 @@ Log4j was the blocker for this upgrade and the issue is resolved in https://gith * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) * Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80]) * Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (https://github.com/apache/logging-parent/pull/71[71]) +* Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` * Update `org.apache:apache` to version `31` (https://github.com/apache/logging-parent/pull/73[73]) * Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (https://github.com/apache/logging-parent/pull/84[84])
(logging-parent) 07/11: Rearrange changelog
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 2876cb4900fd3d8792c1f2d103088bb790e00983 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 10:50:59 2023 +0100 Rearrange changelog --- src/changelog/.10.x.x/update_actions_upload_artifact.xml | 8 src/site/_release-notes/_10.5.0.adoc | 6 +++--- src/site/_release-notes/_10.x.x.adoc | 15 --- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/changelog/.10.x.x/update_actions_upload_artifact.xml b/src/changelog/.10.x.x/update_actions_upload_artifact.xml deleted file mode 100644 index 839e3b4..000 --- a/src/changelog/.10.x.x/update_actions_upload_artifact.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.w3.org/2001/XMLSchema-instance; - xmlns="http://logging.apache.org/log4j/changelog; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; - type="changed"> - https://github.com/apache/logging-parent/pull/83"/> - Update `actions/upload-artifact` to version `4.0.0` - diff --git a/src/site/_release-notes/_10.5.0.adoc b/src/site/_release-notes/_10.5.0.adoc index 892f59f..8672a3b 100644 --- a/src/site/_release-notes/_10.5.0.adoc +++ b/src/site/_release-notes/_10.5.0.adoc @@ -48,9 +48,9 @@ Log4j was the blocker for this upgrade and the issue is resolved in https://gith * Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69[69]) * Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (https://github.com/apache/logging-parent/pull/78[78]) -* Update `biz.aQute.bnd:bnd-maven-plugin` to version `7.0.0` +* Update `github/codeql-action` to version `3.22.11` (https://github.com/apache/logging-parent/pull/81[81]) * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) -* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` (https://github.com/apache/logging-parent/pull/68[68]) +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80]) * Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (https://github.com/apache/logging-parent/pull/71[71]) * Update `org.apache:apache` to version `31` (https://github.com/apache/logging-parent/pull/73[73]) -* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.6.0` (https://github.com/apache/logging-parent/pull/72[72]) +* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (https://github.com/apache/logging-parent/pull/84[84]) diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index ca838ae..8f67449 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -40,18 +40,3 @@ This minor release contains several small improvements. - - Changed - -* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the ecosystem; IDEs, Maven plugins, etc. (https://github.com/apache/logging-parent/issues/69[69]) -* Update `actions/setup-java` to version `4.0.0` (https://github.com/apache/logging-parent/pull/67[67]) -* Update `actions/upload-artifact` to version `4.0.0` (https://github.com/apache/logging-parent/pull/83[83]) -* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (https://github.com/apache/logging-parent/pull/78[78]) -* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) -* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80]) -* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (https://github.com/apache/logging-parent/pull/71[71]) -* Update `github/codeql-action` to version `3.22.11` (https://github.com/apache/logging-parent/pull/81[81]) -* Update `org.apache:apache` to version `31` (https://github.com/apache/logging-parent/pull/73[73]) -* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (https://github.com/apache/logging-parent/pull/84[84]) -* Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0` (https://github.com/apache/logging-parent/pull/65[65]) -* Update `org.eclipse.jgit:org.eclipse.jgit` to version `6.8.0.202311291450-r` (https://github.com/apache/logging-parent/pull/74[74])
(logging-parent) 01/11: Improve docs
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit dd2bc62dedc0cd8cca304c7b255ac8a6afdd24a2
Author: Volkan Yazıcı
AuthorDate: Fri Dec 15 09:53:49 2023 +0100
Improve docs
---
src/site/_release-instructions.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/_release-instructions.adoc
b/src/site/_release-instructions.adoc
index 0350383..9336002 100644
--- a/src/site/_release-instructions.adoc
+++ b/src/site/_release-instructions.adoc
@@ -66,7 +66,7 @@ You can iterate on the `release/7.8.0` branch to perfect it.
+
If not, commit necessary fixes, push, and repeat.
-. _Close_ the repository in
https://repository.apache.org/[repository.apache.org]
+. _Close_ the repository in
https://repository.apache.org/[repository.apache.org] using a self-explanatory
description, e.g., ``\`{project-id}` version \`7.8.0` RC1``
[#stage-release-website]
=== Stage the release website
(logging-parent) branch release/10.5.0 updated (9bb4400 -> ed70fa3)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git from 9bb4400 Release changelog for version `10.5.0` new dd2bc62 Improve docs new d4b9485 Update `github/codeql-action` to version `2.22.10` (#79) new 4d8d0be Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (#80) new eb05d45 Update `github/codeql-action` to version `3.22.11` (#81) new 94b0320 Update `actions/upload-artifact` to version `4.0.0` (#83) new 3f572ca Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (#84) new 2876cb4 Rearrange changelog new 05d4d38 Upgrade `log4j-changelog` XSD version to `0.1.3` new 6a856ce Replace `log4j-changelog` entry type of `dependabot` updates from `changed` to `updated` new 61f15b1 Employ `updated` changelog entry type new ed70fa3 Update release date The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build-reusable.yaml | 4 ++-- .github/workflows/codeql-analysis-reusable.yaml | 4 ++-- .github/workflows/merge-dependabot-reusable.yaml| 4 ++-- .github/workflows/scorecards-analysis-reusable.yaml | 4 ++-- pom.xml | 6 +++--- src/changelog/10.0.0/add-changelog-export-profile.xml | 2 +- src/changelog/10.0.0/add-changelog-release-profile.xml | 2 +- src/changelog/10.0.0/add-deploy-profile.xml | 2 +- src/changelog/10.0.0/add-distribution-profile.xml | 2 +- src/changelog/10.0.0/add-release-instructions.xml | 2 +- src/changelog/10.0.0/add-release-profile.xml| 2 +- src/changelog/10.0.0/add-reusable-build-workflow.xml| 2 +- src/changelog/10.0.0/use-changelog-plugin.xml | 2 +- src/changelog/10.0.0/use-semver.xml | 2 +- src/changelog/10.1.0/add-asciidoc-profile.xml | 2 +- src/changelog/10.1.0/add-dependabot-changelog.xml | 2 +- .../10.1.0/add-osgi-jpms-descriptor-generation.xml | 2 +- src/changelog/10.1.0/add-reports-on-failure.xml | 2 +- src/changelog/10.1.0/add-website.xml| 2 +- src/changelog/10.1.0/fix-java-version.xml | 2 +- src/changelog/10.1.0/remove-outputTimestamp.xml | 2 +- src/changelog/10.1.0/switch-changelog-to-adoc.xml | 2 +- src/changelog/10.1.0/update_actions_checkout.xml| 2 +- .../update_com_github_spotbugs_spotbugs_maven_plugin.xml| 2 +- .../update_com_google_errorprone_error_prone_core.xml | 2 +- src/changelog/10.1.0/update_org_apache_apache.xml | 2 +- src/changelog/10.1.0/update_org_osgi_osgi_annotation.xml| 2 +- src/changelog/10.1.1/change_default_module_name.xml | 2 +- src/changelog/10.1.1/checksum_file.xml | 2 +- src/changelog/10.1.1/fix_bnd_required_module_names.xml | 2 +- src/changelog/10.1.1/timestamp.xml | 2 +- .../update_com_diffplug_spotless_spotless_maven_plugin.xml | 2 +- src/changelog/10.2.0/.release.xml | 2 +- src/changelog/10.2.0/add-sbom-support.xml | 2 +- src/changelog/10.2.0/add_bnd_baseline_plugin.xml| 2 +- src/changelog/10.2.0/apply_bnd_config_all_goals.xml | 2 +- src/changelog/10.2.0/change_flattened_pom.xml | 2 +- src/changelog/10.2.0/fix_bnd_extra_options.xml | 2 +- src/changelog/10.2.0/keep-parent-in-flatten-bom.xml | 2 +- src/changelog/10.2.0/remove-build-in-flatten-bom.xml| 2 +- src/changelog/10.2.0/skip-symlink-dirs.xml | 2 +- src/changelog/10.2.0/update-changelog-version.xml | 4 ++-- src/changelog/10.2.0/update-changelog-xsd-version.xml | 2 +- .../update_com_github_spotbugs_spotbugs_annotations.xml | 4 ++-- src/changelog/10.2.0/use-specific-defaultGoal.xml | 2 +- src/changelog/10.3.0/.release.xml | 2 +- src/changelog/10.3.0/add-bnd-extra-config.xml | 2 +- src/changelog/10.3.0/add-pom-xml-timestamp-substitution.xml | 2 +- src/changelog/10.3.0/add-sbom-serialNumber-and-vex.xml | 2 +- src/changelog/10.3.0/add-spotbugs-exclude.xml | 2 +- src/changelog/10.3.0/auto-derive-dist-attachments.xml | 2 +- src/changelog/10.3.0/change-bnd-baseline.xml| 2 +- src/changelog/10.3.0/fail-bnd-on-api-leak.xml | 2 +- src/changelog/10.3.0/fix-changelog-validation.xml | 2
(logging-parent) 04/11: Update `github/codeql-action` to version `3.22.11` (#81)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit eb05d45654cff08b2745181e0026a15b38102028
Author: ASF Logging Services RM
AuthorDate: Thu Dec 14 10:11:17 2023 +
Update `github/codeql-action` to version `3.22.11` (#81)
---
.github/workflows/codeql-analysis-reusable.yaml| 4 ++--
.github/workflows/scorecards-analysis-reusable.yaml| 2 +-
src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml | 4 ++--
src/site/_release-notes/_10.x.x.adoc | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/codeql-analysis-reusable.yaml
b/.github/workflows/codeql-analysis-reusable.yaml
index f86b200..a8f46e6 100644
--- a/.github/workflows/codeql-analysis-reusable.yaml
+++ b/.github/workflows/codeql-analysis-reusable.yaml
@@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #
4.1.1
- name: Initialize CodeQL
-uses:
github/codeql-action/init@305f6546310b9203e892c28c1484e82977f4f63d# 2.22.10
+uses:
github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c# 3.22.11
with:
languages: ${{ inputs.language }}
@@ -63,4 +63,4 @@ jobs:
clean verify
- name: Perform CodeQL Analysis
-uses:
github/codeql-action/analyze@305f6546310b9203e892c28c1484e82977f4f63d#
2.22.10
+uses:
github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c#
3.22.11
diff --git a/.github/workflows/scorecards-analysis-reusable.yaml
b/.github/workflows/scorecards-analysis-reusable.yaml
index 3110e71..4383b16 100644
--- a/.github/workflows/scorecards-analysis-reusable.yaml
+++ b/.github/workflows/scorecards-analysis-reusable.yaml
@@ -54,6 +54,6 @@ jobs:
retention-days: 5
- name: "Upload to code-scanning"
-uses:
github/codeql-action/upload-sarif@305f6546310b9203e892c28c1484e82977f4f63d#
2.1.22
+uses:
github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c#
2.1.22
with:
sarif_file: results.sarif
diff --git a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
index 33451fe..cde270f 100644
--- a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
+++ b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.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-parent/pull/79"/>
- Update `github/codeql-action` to version
`2.22.10`
+ https://github.com/apache/logging-parent/pull/81"/>
+ Update `github/codeql-action` to version
`3.22.11`
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index d692eff..fc5a846 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -49,7 +49,7 @@ This minor release contains several small improvements.
* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1`
(https://github.com/apache/logging-parent/pull/70[70])
* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3`
(https://github.com/apache/logging-parent/pull/80[80])
* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0`
(https://github.com/apache/logging-parent/pull/71[71])
-* Update `github/codeql-action` to version `2.22.10`
(https://github.com/apache/logging-parent/pull/79[79])
+* Update `github/codeql-action` to version `3.22.11`
(https://github.com/apache/logging-parent/pull/81[81])
* Update `org.apache:apache` to version `31`
(https://github.com/apache/logging-parent/pull/73[73])
* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.6.0` (https://github.com/apache/logging-parent/pull/72[72])
* Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0`
(https://github.com/apache/logging-parent/pull/65[65])
(logging-parent) 08/11: Upgrade `log4j-changelog` XSD version to `0.1.3`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 05d4d3825f9a78bc94e8d7d66002936b7297ade4 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 10:52:25 2023 +0100 Upgrade `log4j-changelog` XSD version to `0.1.3` --- .github/workflows/merge-dependabot-reusable.yaml| 2 +- pom.xml | 2 +- src/changelog/10.0.0/add-changelog-export-profile.xml | 2 +- src/changelog/10.0.0/add-changelog-release-profile.xml | 2 +- src/changelog/10.0.0/add-deploy-profile.xml | 2 +- src/changelog/10.0.0/add-distribution-profile.xml | 2 +- src/changelog/10.0.0/add-release-instructions.xml | 2 +- src/changelog/10.0.0/add-release-profile.xml| 2 +- src/changelog/10.0.0/add-reusable-build-workflow.xml| 2 +- src/changelog/10.0.0/use-changelog-plugin.xml | 2 +- src/changelog/10.0.0/use-semver.xml | 2 +- src/changelog/10.1.0/add-asciidoc-profile.xml | 2 +- src/changelog/10.1.0/add-dependabot-changelog.xml | 2 +- src/changelog/10.1.0/add-osgi-jpms-descriptor-generation.xml| 2 +- src/changelog/10.1.0/add-reports-on-failure.xml | 2 +- src/changelog/10.1.0/add-website.xml| 2 +- src/changelog/10.1.0/fix-java-version.xml | 2 +- src/changelog/10.1.0/remove-outputTimestamp.xml | 2 +- src/changelog/10.1.0/switch-changelog-to-adoc.xml | 2 +- src/changelog/10.1.0/update_actions_checkout.xml| 2 +- .../10.1.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml | 2 +- src/changelog/10.1.0/update_com_google_errorprone_error_prone_core.xml | 2 +- src/changelog/10.1.0/update_org_apache_apache.xml | 2 +- src/changelog/10.1.0/update_org_osgi_osgi_annotation.xml| 2 +- src/changelog/10.1.1/change_default_module_name.xml | 2 +- src/changelog/10.1.1/checksum_file.xml | 2 +- src/changelog/10.1.1/fix_bnd_required_module_names.xml | 2 +- src/changelog/10.1.1/timestamp.xml | 2 +- .../10.1.1/update_com_diffplug_spotless_spotless_maven_plugin.xml | 2 +- src/changelog/10.2.0/.release.xml | 2 +- src/changelog/10.2.0/add-sbom-support.xml | 2 +- src/changelog/10.2.0/add_bnd_baseline_plugin.xml| 2 +- src/changelog/10.2.0/apply_bnd_config_all_goals.xml | 2 +- src/changelog/10.2.0/change_flattened_pom.xml | 2 +- src/changelog/10.2.0/fix_bnd_extra_options.xml | 2 +- src/changelog/10.2.0/keep-parent-in-flatten-bom.xml | 2 +- src/changelog/10.2.0/remove-build-in-flatten-bom.xml| 2 +- src/changelog/10.2.0/skip-symlink-dirs.xml | 2 +- src/changelog/10.2.0/update-changelog-version.xml | 2 +- src/changelog/10.2.0/update-changelog-xsd-version.xml | 2 +- .../10.2.0/update_com_github_spotbugs_spotbugs_annotations.xml | 2 +- src/changelog/10.2.0/use-specific-defaultGoal.xml | 2 +- src/changelog/10.3.0/.release.xml | 2 +- src/changelog/10.3.0/add-bnd-extra-config.xml | 2 +- src/changelog/10.3.0/add-pom-xml-timestamp-substitution.xml | 2 +- src/changelog/10.3.0/add-sbom-serialNumber-and-vex.xml | 2 +- src/changelog/10.3.0/add-spotbugs-exclude.xml | 2 +- src/changelog/10.3.0/auto-derive-dist-attachments.xml | 2 +- src/changelog/10.3.0/change-bnd-baseline.xml| 2 +- src/changelog/10.3.0/fail-bnd-on-api-leak.xml | 2 +- src/changelog/10.3.0/fix-changelog-validation.xml | 2 +- src/changelog/10.3.0/fix-flatten-clean.xml | 2 +- src/changelog/10.3.0/fix-manifest.xml | 2 +- .../10.3.0/update_com_github_spotbugs_spotbugs_annotations.xml | 2 +- .../10.3.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml | 2 +- src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml | 2 +- .../10.3.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml| 2 +- src/changelog/10.3.0/update_org_cyclonedx_cyclonedx_maven_plugin.xml| 2 +-
(logging-parent) 11/11: Update release date
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit ed70fa3d3c09613a80fcb746979f26fd58cdf385 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 11:38:23 2023 +0100 Update release date --- src/changelog/10.5.0/.release.xml| 2 +- src/site/_release-notes/_10.5.0.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/changelog/10.5.0/.release.xml b/src/changelog/10.5.0/.release.xml index 4dc0b20..bae8fcb 100644 --- a/src/changelog/10.5.0/.release.xml +++ b/src/changelog/10.5.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="10.5.0"/> + date="2023-12-18" version="10.5.0"/> diff --git a/src/site/_release-notes/_10.5.0.adoc b/src/site/_release-notes/_10.5.0.adoc index 329f520..0ba2ebe 100644 --- a/src/site/_release-notes/_10.5.0.adoc +++ b/src/site/_release-notes/_10.5.0.adoc @@ -36,7 +36,7 @@ [#release-notes-10-5-0] === 10.5.0 -Release date:: 2023-12-11 +Release date:: 2023-12-18 This minor release contains dependency updates and a change in the way BND is employed.
(logging-parent) 06/11: Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (#84)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 3f572cafcdc5d6578bc386bef4b6d5c5837d1a1c
Author: ASF Logging Services RM
AuthorDate: Mon Dec 18 08:46:20 2023 +
Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.7.0` (#84)
---
pom.xml | 2 +-
...date_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml | 4 ++--
src/site/_release-notes/_10.1.0.adoc | 8
src/site/_release-notes/_10.x.x.adoc | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 174a7c1..dedc396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,7 +293,7 @@
3.5.0
2.7.10
1.5.0
-
0.6.0
+
0.7.0
3.5.0
1.0.1
4.8.2.0
diff --git
a/src/changelog/10.5.0/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
b/src/changelog/10.5.0/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
index d8ba536..b934f68 100644
---
a/src/changelog/10.5.0/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
+++
b/src/changelog/10.5.0/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.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-parent/pull/72"/>
- Update
`org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.6.0`
+ https://github.com/apache/logging-parent/pull/84"/>
+ Update
`org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.7.0`
diff --git a/src/site/_release-notes/_10.1.0.adoc
b/src/site/_release-notes/_10.1.0.adoc
index c17892b..d76c2de 100644
--- a/src/site/_release-notes/_10.1.0.adoc
+++ b/src/site/_release-notes/_10.1.0.adoc
@@ -64,10 +64,10 @@ In particular, we expect the absence of `module-info.java`
files to avoid severa
* Update `org.apache:apache` to version `30`
* Update `org.osgi:osgi.annotation` to version `8.1.0`
- Removed
-
-* Removed `project.build.outputTimestamp` override since it is already
provided by the parent POM and its old value `0` was causing
https://github.com/spring-projects/spring-boot/pull/37438[reproducibility
issues] for `spring-boot:repackage`
-
Fixed
* Replaced incorrect `java.version` Maven property override with
`maven.compiler.{source,release,target}`
+
+ Removed
+
+* Removed `project.build.outputTimestamp` override since it is already
provided by the parent POM and its old value `0` was causing
https://github.com/spring-projects/spring-boot/pull/37438[reproducibility
issues] for `spring-boot:repackage`
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index 6ef81d5..ca838ae 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -52,6 +52,6 @@ This minor release contains several small improvements.
* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0`
(https://github.com/apache/logging-parent/pull/71[71])
* Update `github/codeql-action` to version `3.22.11`
(https://github.com/apache/logging-parent/pull/81[81])
* Update `org.apache:apache` to version `31`
(https://github.com/apache/logging-parent/pull/73[73])
-* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.6.0` (https://github.com/apache/logging-parent/pull/72[72])
+* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.7.0` (https://github.com/apache/logging-parent/pull/84[84])
* Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0`
(https://github.com/apache/logging-parent/pull/65[65])
* Update `org.eclipse.jgit:org.eclipse.jgit` to version `6.8.0.202311291450-r`
(https://github.com/apache/logging-parent/pull/74[74])
(logging-parent) 02/11: Update `github/codeql-action` to version `2.22.10` (#79)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/10.5.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit d4b9485639c2424ee97dfc2bb8dde3d3f2dff4e1
Author: ASF Logging Services RM
AuthorDate: Wed Dec 13 10:18:52 2023 +
Update `github/codeql-action` to version `2.22.10` (#79)
---
.github/workflows/codeql-analysis-reusable.yaml| 4 ++--
.github/workflows/scorecards-analysis-reusable.yaml| 2 +-
.../10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml | 3 ++-
src/site/_release-notes/_10.x.x.adoc | 14 ++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/codeql-analysis-reusable.yaml
b/.github/workflows/codeql-analysis-reusable.yaml
index e8d9b7c..f86b200 100644
--- a/.github/workflows/codeql-analysis-reusable.yaml
+++ b/.github/workflows/codeql-analysis-reusable.yaml
@@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #
4.1.1
- name: Initialize CodeQL
-uses:
github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2# 2.22.9
+uses:
github/codeql-action/init@305f6546310b9203e892c28c1484e82977f4f63d# 2.22.10
with:
languages: ${{ inputs.language }}
@@ -63,4 +63,4 @@ jobs:
clean verify
- name: Perform CodeQL Analysis
-uses:
github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2#
2.22.9
+uses:
github/codeql-action/analyze@305f6546310b9203e892c28c1484e82977f4f63d#
2.22.10
diff --git a/.github/workflows/scorecards-analysis-reusable.yaml
b/.github/workflows/scorecards-analysis-reusable.yaml
index 8075858..3110e71 100644
--- a/.github/workflows/scorecards-analysis-reusable.yaml
+++ b/.github/workflows/scorecards-analysis-reusable.yaml
@@ -54,6 +54,6 @@ jobs:
retention-days: 5
- name: "Upload to code-scanning"
-uses:
github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2#
2.1.22
+uses:
github/codeql-action/upload-sarif@305f6546310b9203e892c28c1484e82977f4f63d#
2.1.22
with:
sarif_file: results.sarif
diff --git a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
index 3569ef6..33451fe 100644
--- a/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
+++ b/src/changelog/10.5.0/update_biz_aqute_bnd_bnd_maven_plugin.xml
@@ -3,5 +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">
- Update `biz.aQute.bnd:bnd-maven-plugin` to
version `7.0.0`
+ https://github.com/apache/logging-parent/pull/79"/>
+ Update `github/codeql-action` to version
`2.22.10`
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index 8f67449..5886c2b 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -40,3 +40,17 @@
This minor release contains several small improvements.
+
+ Changed
+
+* Switch from `bnd:jar` to `bnd:bnd-process` to improve integration with the
ecosystem; IDEs, Maven plugins, etc.
(https://github.com/apache/logging-parent/issues/69[69])
+* Update `actions/setup-java` to version `4.0.0`
(https://github.com/apache/logging-parent/pull/67[67])
+* Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0`
(https://github.com/apache/logging-parent/pull/78[78])
+* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1`
(https://github.com/apache/logging-parent/pull/70[70])
+* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2`
(https://github.com/apache/logging-parent/pull/68[68])
+* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0`
(https://github.com/apache/logging-parent/pull/71[71])
+* Update `github/codeql-action` to version `2.22.10`
(https://github.com/apache/logging-parent/pull/79[79])
+* Update `org.apache:apache` to version `31`
(https://github.com/apache/logging-parent/pull/73[73])
+* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.6.0` (https://github.com/apache/logging-parent/pull/72[72])
+* Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0`
(https://github.com/apache/logging-parent/pull/65[65])
+* Update `org.eclipse.jgit:org.eclipse.jgit` to version `6.8.0.202311291450-r`
(https://github.com/apache/logging-parent/pull/74[74])
(logging-parent) 03/11: Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (#80)
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.5.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 4d8d0beebab25dd22baf3ca0c5dd6ed5d03934ea Author: ASF Logging Services RM AuthorDate: Wed Dec 13 10:21:04 2023 + Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (#80) --- pom.xml | 2 +- .../10.5.0/update_com_github_spotbugs_spotbugs_annotations.xml| 4 ++-- src/site/_release-notes/_10.x.x.adoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 966ce95..174a7c1 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,7 @@ 2.0.0 1.1.2 2.38.0 -4.8.2 +4.8.3 2.2.4 diff --git a/src/changelog/10.5.0/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/10.5.0/update_com_github_spotbugs_spotbugs_annotations.xml index c1a877f..1671973 100644 --- a/src/changelog/10.5.0/update_com_github_spotbugs_spotbugs_annotations.xml +++ b/src/changelog/10.5.0/update_com_github_spotbugs_spotbugs_annotations.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-parent/pull/68"/> - Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` + https://github.com/apache/logging-parent/pull/80"/> + Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index 5886c2b..d692eff 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -47,7 +47,7 @@ This minor release contains several small improvements. * Update `actions/setup-java` to version `4.0.0` (https://github.com/apache/logging-parent/pull/67[67]) * Update `biz.aQute.bnd:bnd-baseline-maven-plugin` to version `7.0.0` (https://github.com/apache/logging-parent/pull/78[78]) * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.41.1` (https://github.com/apache/logging-parent/pull/70[70]) -* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.2` (https://github.com/apache/logging-parent/pull/68[68]) +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.3` (https://github.com/apache/logging-parent/pull/80[80]) * Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0` (https://github.com/apache/logging-parent/pull/71[71]) * Update `github/codeql-action` to version `2.22.10` (https://github.com/apache/logging-parent/pull/79[79]) * Update `org.apache:apache` to version `31` (https://github.com/apache/logging-parent/pull/73[73])
(logging-chainsaw) branch master updated: Comment-out temporarily unsupported column types, fix iso8601/simple date conversion through the menu on the timestamp table header
This is an automated email from the ASF dual-hosted git repository.
sdeboy 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 6475b4a Comment-out temporarily unsupported column types, fix
iso8601/simple date conversion through the menu on the timestamp table header
6475b4a is described below
commit 6475b4ab77e9bb0908aeb63b78e898210267656d
Author: sdeboy
AuthorDate: Mon Dec 18 01:12:05 2023 -0800
Comment-out temporarily unsupported column types, fix iso8601/simple date
conversion through the menu on the timestamp table header
---
.../org/apache/log4j/chainsaw/ChainsawColumns.java | 30 +++--
.../chainsaw/ChainsawCyclicBufferTableModel.java | 4 ++
.../apache/log4j/chainsaw/ColumnComparator.java| 8 ++-
.../log4j/chainsaw/TableColorizingRenderer.java| 26
.../chainsaw/components/logpanel/LogPanel.java | 72 --
5 files changed, 83 insertions(+), 57 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
index 14f7549..3ff83b7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
@@ -32,38 +32,22 @@ public class ChainsawColumns {
private static final List columnNames = new ArrayList<>();
static {
-columnNames.add(ChainsawConstants.LOGGER_COL_NAME);
-columnNames.add(ChainsawConstants.LOG4J_MARKER_COL_NAME); //add
uppercase col name
columnNames.add(ChainsawConstants.TIMESTAMP_COL_NAME);
+columnNames.add(ChainsawConstants.LOG4J_MARKER_COL_NAME);
columnNames.add(ChainsawConstants.LEVEL_COL_NAME);
-columnNames.add(ChainsawConstants.THREAD_COL_NAME);
+columnNames.add(ChainsawConstants.LOGGER_COL_NAME);
columnNames.add(ChainsawConstants.MESSAGE_COL_NAME);
-columnNames.add(ChainsawConstants.NDC_COL_NAME);
-columnNames.add(ChainsawConstants.THROWABLE_COL_NAME);
-columnNames.add(ChainsawConstants.CLASS_COL_NAME);
-columnNames.add(ChainsawConstants.METHOD_COL_NAME);
-columnNames.add(ChainsawConstants.FILE_COL_NAME);
-columnNames.add(ChainsawConstants.LINE_COL_NAME);
-
columnNames.add(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE.toUpperCase());
//add uppercase col name
//NOTE: ID must ALWAYS be last field because the model adds this
value itself as an identifier to the end of the consructed vector
columnNames.add(ChainsawConstants.ID_COL_NAME);
}
-public static final int INDEX_LOGGER_COL_NAME = 1;
+public static final int INDEX_TIMESTAMP_COL_NAME = 1;
public static final int INDEX_LOG4J_MARKER_COL_NAME = 2;
-public static final int INDEX_TIMESTAMP_COL_NAME = 3;
-public static final int INDEX_LEVEL_COL_NAME = 4;
-public static final int INDEX_THREAD_COL_NAME = 5;
-public static final int INDEX_MESSAGE_COL_NAME = 6;
-public static final int INDEX_NDC_COL_NAME = 7;
-public static final int INDEX_THROWABLE_COL_NAME = 8;
-public static final int INDEX_CLASS_COL_NAME = 9;
-public static final int INDEX_METHOD_COL_NAME = 10;
-public static final int INDEX_FILE_COL_NAME = 11;
-public static final int INDEX_LINE_COL_NAME = 12;
-public static final int INDEX_MILLIS_DELTA_COL_NAME = 13;
-public static final int INDEX_ID_COL_NAME = 14;
+public static final int INDEX_LEVEL_COL_NAME = 3;
+public static final int INDEX_LOGGER_COL_NAME = 4;
+public static final int INDEX_MESSAGE_COL_NAME = 5;
+public static final int INDEX_ID_COL_NAME = 6;
public static final Cursor CURSOR_FOCUS_ON;
diff --git
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index aa7437a..00b8fe9 100644
---
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -558,9 +558,11 @@ public class ChainsawCyclicBufferTableModel extends
AbstractTableModel
case ChainsawColumns.INDEX_LOG4J_MARKER_COL_NAME:
return
event.getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME);
+/*
case ChainsawColumns.INDEX_MILLIS_DELTA_COL_NAME:
return
event.getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
+*/
case ChainsawColumns.INDEX_LOGGER_COL_NAME:
return event.m_logger;
@@ -570,6 +572,7 @@ public class ChainsawCyclicBufferTableModel extends
AbstractTableModel
case ChainsawColumns.INDEX_MESSAGE_COL_NAME:
return event.m_message;
+/*
case ChainsawColumns.INDEX_NDC_COL_NAME:
return
(logging-parent) branch dependabot/maven/org.apache.logging.log4j-log4j-changelog-maven-plugin-0.7.0 deleted (was b70fd6a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-changelog-maven-plugin-0.7.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was b70fd6a Bump org.apache.logging.log4j:log4j-changelog-maven-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch main updated: Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (#84)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new bc803a1 Update
`org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.7.0` (#84)
bc803a1 is described below
commit bc803a1d616e9fdd715e28ce1206ea5778a3ce64
Author: ASF Logging Services RM
AuthorDate: Mon Dec 18 08:46:20 2023 +
Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.7.0` (#84)
---
pom.xml | 2 +-
...date_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml | 4 ++--
src/site/_release-notes/_10.1.0.adoc | 8
src/site/_release-notes/_10.x.x.adoc | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index b873d2b..adf84cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,7 +293,7 @@
3.5.0
2.7.10
1.5.0
-
0.6.0
+
0.7.0
3.5.0
1.0.1
4.8.2.0
diff --git
a/src/changelog/.10.x.x/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
b/src/changelog/.10.x.x/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
index d8ba536..b934f68 100644
---
a/src/changelog/.10.x.x/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
+++
b/src/changelog/.10.x.x/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.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-parent/pull/72"/>
- Update
`org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.6.0`
+ https://github.com/apache/logging-parent/pull/84"/>
+ Update
`org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.7.0`
diff --git a/src/site/_release-notes/_10.1.0.adoc
b/src/site/_release-notes/_10.1.0.adoc
index c17892b..d76c2de 100644
--- a/src/site/_release-notes/_10.1.0.adoc
+++ b/src/site/_release-notes/_10.1.0.adoc
@@ -64,10 +64,10 @@ In particular, we expect the absence of `module-info.java`
files to avoid severa
* Update `org.apache:apache` to version `30`
* Update `org.osgi:osgi.annotation` to version `8.1.0`
- Removed
-
-* Removed `project.build.outputTimestamp` override since it is already
provided by the parent POM and its old value `0` was causing
https://github.com/spring-projects/spring-boot/pull/37438[reproducibility
issues] for `spring-boot:repackage`
-
Fixed
* Replaced incorrect `java.version` Maven property override with
`maven.compiler.{source,release,target}`
+
+ Removed
+
+* Removed `project.build.outputTimestamp` override since it is already
provided by the parent POM and its old value `0` was causing
https://github.com/spring-projects/spring-boot/pull/37438[reproducibility
issues] for `spring-boot:repackage`
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index 6ef81d5..ca838ae 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -52,6 +52,6 @@ This minor release contains several small improvements.
* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.2.0`
(https://github.com/apache/logging-parent/pull/71[71])
* Update `github/codeql-action` to version `3.22.11`
(https://github.com/apache/logging-parent/pull/81[81])
* Update `org.apache:apache` to version `31`
(https://github.com/apache/logging-parent/pull/73[73])
-* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.6.0` (https://github.com/apache/logging-parent/pull/72[72])
+* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version
`0.7.0` (https://github.com/apache/logging-parent/pull/84[84])
* Update `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0`
(https://github.com/apache/logging-parent/pull/65[65])
* Update `org.eclipse.jgit:org.eclipse.jgit` to version `6.8.0.202311291450-r`
(https://github.com/apache/logging-parent/pull/74[74])
(logging-parent) branch dependabot/maven/org.apache.logging.log4j-log4j-changelog-maven-plugin-0.7.0 created (now b70fd6a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-changelog-maven-plugin-0.7.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at b70fd6a Bump org.apache.logging.log4j:log4j-changelog-maven-plugin No new revisions were added by this update.
(logging-log4j-tools) branch asf-site updated: Add version `0.7.0` RC1 site
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7dfbb65 Add version `0.7.0` RC1 site
7dfbb65 is described below
commit 7dfbb651c31b7b5de5fd29fc3bf7eaa18ef214c1
Author: Volkan Yazıcı
AuthorDate: Thu Dec 14 13:17:11 2023 +0100
Add version `0.7.0` RC1 site
---
0.x/index.html | 73 +++---
1 file changed, 65 insertions(+), 8 deletions(-)
diff --git a/0.x/index.html b/0.x/index.html
index 4699492..42ac9d0 100644
--- a/0.x/index.html
+++ b/0.x/index.html
@@ -562,6 +562,7 @@ table.CodeRay td.code{padding:0 0 0 .75em}
Security
Release Notes
+0.7.0
0.6.0
0.5.0
0.4.0
@@ -600,7 +601,7 @@ It is designed for Apache Log4j, but can be used for any
Java project.
dependency
groupIdorg.apache.logging.log4j/groupId
artifactIdlog4j-changelog/artifactId
- version0.6.0/version
+ version0.7.0/version
/dependency
@@ -696,7 +697,7 @@ A sample release entry file is shared below.
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
+ https://logging.apache.org/log4j/changelog-0.1.3.xsd
date=2022-09-09
version=2.19.0/
@@ -735,7 +736,7 @@ Consider the following examples:
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
+ https://logging.apache.org/log4j/changelog-0.1.3.xsd
type=fixed
issue id=LOG4J2-3556 link=https://issues.apache.org/jira/browse/LOG4J2-3556/
author id=github:vy/
@@ -768,10 +769,13 @@ Consider the following examples:
deprecated – for soon-to-be removed features
+fixed – for any bug fixes
+
+
removed – for now removed features
-fixed – for any bug fixes
+updated – for dependency updates
@@ -1027,7 +1031,7 @@ This allows one to run ChangelogReleaser
multiple times, e.g., to i
plugin
groupIdorg.apache.logging.log4j/groupId
artifactIdlog4j-changelog-maven-plugin/artifactId
- version0.6.0/version
+ version0.7.0/version
/plugin
@@ -1065,7 +1069,7 @@ These are generally used to generate the index page
referencing to release notes
plugin
groupIdorg.apache.logging.log4j/groupId
artifactIdlog4j-changelog-maven-plugin/artifactId
- version0.6.0/version
+ version0.7.0/version
inheritedfalse/inherited
configuration
indexTemplates
@@ -1254,7 +1258,7 @@ As a result, you dont have to specify versions of
the imported modules (<
dependency
groupIdorg.apache.logging.log4j/groupId
artifactIdlog4j-tools-bom/artifactId
- version0.6.0/version
+ version0.7.0/version
scopeimport/scope
typepom/type
/dependency
@@ -1295,6 +1299,59 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
Release Notes
+0.7.0
+
+
+Release date
+
+2023-12-14
+
+
+
+
+This minor release contains various bug fixes and improvements.
+
+
+Added
+
+
+
+Add the new updated changelog entry type and bump the XSD
version to 0.1.3
+
+
+
+
+
+Changed
+
+
+
+Update commons-io:commons-io to version 2.15.1
(https://github.com/apache/logging-log4j-tools/pull/86;>86)
+
+
+Update org.apache.maven.plugin-tools:maven-plugin-annotations
to version 3.10.2 (https://github.com/apache/logging-log4j-tools/pull/87;>87)
+
+
+
+
+
+Fixed
+
+
+
+Sort changelog entry types alphanumerically
+
+
+Fix log4j-changelog:release failure on empty unreleased
changelog directory (https://github.com/apache/logging-log4j-tools/issues/90;>90)
+
+
+Fix parsing of patch versions in log4j-changelog:release goal
(https://github.com/apache/logging-log4j-tools/issues/89;>89)
+
+
+
+
+
+
0.6.0
@@ -1582,7 +1639,7 @@ See the License for the specific language governing
permissions and limitations
-Last updated 2023-11-17 08:58:48 UTC
+Last updated 2023-12-14 11:03:04 UTC
(logging-log4j-transform) branch dependabot/maven/org.apache.logging-logging-parent-10.4.0 deleted (was 92e813d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging-logging-parent-10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git was 92e813d Bump org.apache.logging:logging-parent from 10.2.0 to 10.4.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-transform) branch main updated: Update `org.apache.logging:logging-parent` to version `10.4.0` (#66)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git The following commit(s) were added to refs/heads/main by this push: new bcc6585 Update `org.apache.logging:logging-parent` to version `10.4.0` (#66) bcc6585 is described below commit bcc658529344cba7a5141e215f1923d18a8d6f4c Author: ASF Logging Services RM AuthorDate: Mon Dec 18 08:36:13 2023 + Update `org.apache.logging:logging-parent` to version `10.4.0` (#66) --- pom.xml | 2 +- src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml | 8 src/site/_release-notes/_0.x.x.adoc | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73d0ac7..2cea830 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.logging logging-parent -10.2.0 +10.4.0 org.apache.logging.log4j diff --git a/src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml new file mode 100644 index 000..dbf8613 --- /dev/null +++ b/src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml @@ -0,0 +1,8 @@ + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="changed"> + https://github.com/apache/logging-log4j-transform/pull/66"/> + Update `org.apache.logging:logging-parent` to version `10.4.0` + diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc index 2b3b4fd..7a0bcdf 100644 --- a/src/site/_release-notes/_0.x.x.adoc +++ b/src/site/_release-notes/_0.x.x.adoc @@ -53,6 +53,7 @@ This is the second release of the project. * Update `commons-logging:commons-logging` to version `1.3.0` (https://github.com/apache/logging-log4j-transform/pull/67[67]) * Update `org.apache.commons:commons-lang3` to version `3.14.0` (https://github.com/apache/logging-log4j-transform/pull/69[69]) * Update `org.apache.logging.log4j:log4j-bom` to version `2.22.0` (https://github.com/apache/logging-log4j-transform/pull/71[71]) +* Update `org.apache.logging:logging-parent` to version `10.4.0` (https://github.com/apache/logging-log4j-transform/pull/66[66]) * Update `org.apache.maven:maven-core` to version `3.9.6` (https://github.com/apache/logging-log4j-transform/pull/65[65]) * Update `org.apache.maven.plugins:maven-invoker-plugin` to version `3.6.0` (https://github.com/apache/logging-log4j-transform/pull/68[68]) * Update `org.apache.maven.plugins:maven-shade-plugin` to version `3.5.1` (https://github.com/apache/logging-log4j-transform/pull/64[64])
(logging-log4j-transform) branch dependabot/maven/org.apache.logging-logging-parent-10.4.0 updated (28f339a -> 92e813d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging-logging-parent-10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git omit 28f339a Bump org.apache.logging:logging-parent from 10.2.0 to 10.4.0 add 583a63c Fix location-based tests after reformatting add 92e813d Bump org.apache.logging:logging-parent from 10.2.0 to 10.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 (28f339a) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging-logging-parent-10.4.0 (92e813d) 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: .../logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j-transform) branch main updated: Fix location-based tests after reformatting
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 583a63c Fix location-based tests after reformatting
583a63c is described below
commit 583a63ce72ce65dce6d3356be674db487c658d70
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:31:08 2023 +0100
Fix location-based tests after reformatting
---
.../logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java
b/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java
index a0b0148..e56048b 100644
---
a/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java
+++
b/log4j-weaver/src/test/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandlerExample.java
@@ -62,7 +62,7 @@ public class LoggerConversionHandlerExample {
private static final Logger logger = LogManager.getLogger();
-private static final int referenceLine = 63;
+private static final int referenceLine = 65;
public void testFatal(final ListAppender app) {
app.clear();
svn commit: r66118 - /dev/logging/log4j-tools/
Author: vy Date: Mon Dec 18 08:24:38 2023 New Revision: 66118 Log: Remove `log4j-tools` version `0.7.0` files released Removed: dev/logging/log4j-tools/
svn commit: r66117 - /release/logging/log4j-tools/0.7.0/
Author: vy Date: Mon Dec 18 08:23:48 2023 New Revision: 66117 Log: Add `log4j-tools` version `0.7.0` distribution Added: release/logging/log4j-tools/0.7.0/ release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip (with props) release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.asc release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.sha512 release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip (with props) release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.asc release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.sha512 Added: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip == Binary file - no diff available. Propchange: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip -- svn:mime-type = application/octet-stream Added: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.asc == --- release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.asc (added) +++ release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.asc Mon Dec 18 08:23:48 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmV64XMACgkQVuc7qaC1 +ktADPw//f0f7JI0xp6wQmA8X0qiFd1ck29MpAVKJI7qYUXKfyA/TNe0qf15VVuCg +jSmJLcM488M1aJd4qwn6cVITgPAQbFZXhtXR+T0C7OymGzx5Ozuu9Xw8h3ph6nfR +TZV7ktc/WvVDgGZzK/gR0EAil6vT5Dgi41ZpoZtJUqU+m0hfubgiVxmDIbZSghrZ +I1VgIhSD7ij9sL7EgJgdEfR8UidTZIVq8zeEWXeo6OxkimMy39LbnptXPSYgfjeS +O2zi6IWbpXJ02d2ojiA+G6a5uY01jIhxilFIFB7Pp8SbB57pTSrXGxpzefJyMxkO +gx3jDKPZUNft5HvcZ19VDH2NX1YtCl2Vx0+HqgL1K+JBoqep8Od1oqJ67X37KV+i +9W0Bfg9kL4JeVoh+nrnOryuuQMqTxMLg5Sddgy6DxQywXUqDDqX6Z+v1iQYQcgw2 +q3sSDudKqras87sheZRvtPM2aYaucDNjhdTY9K1QI8oJpppQ8ys4iyffS+7iWWZg +Aa+a3FmcSrUEu/V62j1qxWHXUl/uRlYQDhDzP15YaePmijJYeOlwWsCuXCV068H/ +c+F9ZytrCdyRbvuZ3+hhP60kOnwGr0/ks4Fo9SDYfhP7j/Z3wh6fVpIModoImoMm +SmRHgkgbxusSIGDa+dtln8SEGTs7EIqpaagax3fBIDMBmF7mA8s= +=5yAP +-END PGP SIGNATURE- Added: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.sha512 == --- release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.sha512 (added) +++ release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-bin.zip.sha512 Mon Dec 18 08:23:48 2023 @@ -0,0 +1 @@ +8dffa0599b8e022beb541908813babdb94e55a76553e4ab380a15a475afb2856e625fdb9b2e94150b11a6db5efab575f5dd9236155f5dd5cd39e5801097a5115 apache-log4j-tools-0.7.0-bin.zip Added: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip == Binary file - no diff available. Propchange: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip -- svn:mime-type = application/octet-stream Added: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.asc == --- release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.asc (added) +++ release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.asc Mon Dec 18 08:23:48 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmV64XMACgkQVuc7qaC1 +ktBH4Q/+OPbRwjIoDe9echyKUOUoZO4LbwoHThhK/x/NEVRYIM9RcdtoVVs+V4h4 +6rZaWLFptYfHSmpsozK90BoZOqQIvBJje+SHYU4N4mGGwWesPMm1bd9ThVRH5DjV +foHw6DqIgYJest7fmsvfKtnXcVaSnbWRQXm5fq/vnqEA6BT//EjB6oeyVyfRPk+S +x7Zy3o+aXBmt1Xxe86srPFxzjcRV33FUdqrhCJAJBgB/ReW6l2tx0fdgwMXIXIsf +TxGTeHXloQ8KWcCVoyuDEtBwkqx2g+trHWOw6fYfrK5Lnf1BHnOfMPDjtKCIwXD3 +pNuMf4QQ8Kfikoq2IkukI8Rym3aN7LSfr2xQvV3OAPh7YWbIREn/aF5vQKbHagGt +y+HuexLR3ZTUj+kJr2M2ot2x2MGf8zwn1ZgXyXRscR9OcPsBIT7zsEC5Ix5wSWm8 +F1sQCHiYpmFaWXqvRRqXihNK4naawaaXMjWes2L/4xwa85HUvyO1GOFtbQYXKKIx +Lcphmodog8bsoGeir8M+ZbnZG7NXtkQtuJLDLC4Cv0xYJPlSFWDXTqsg26qWtKMQ +PB48xURcEesxQy0Puf1aUHN4aHwFmwVdKNkwjQpou1Yvo/x9oZ6AlUBoqzIqZGDF +8ReoCWThlhAPEXCMwbAWy/tW+o85IfNB4LmCkw9nlpEn2fKpgC0= +=l3+e +-END PGP SIGNATURE- Added: release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.sha512 == --- release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.sha512 (added) +++ release/logging/log4j-tools/0.7.0/apache-log4j-tools-0.7.0-src.zip.sha512 Mon Dec 18 08:23:48 2023 @@ -0,0 +1 @@ +fe8547982e6f5fa0cb416af556e10ac65e24246459c2d4c02a02fc385c47f9a4abe43b33ba2b67794acb499277a38a50a6872110d38f96df0df5e00feaab89f1 apache-log4j-tools-0.7.0-src.zip
(logging-log4j-transform) branch dependabot/maven/org.apache.logging-logging-parent-10.4.0 updated (b998683 -> 28f339a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging-logging-parent-10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git discard b998683 Bump org.apache.logging:logging-parent from 10.2.0 to 10.4.0 add 2c87e88 Pin reusable workflows to version 10.4.0 add 78ac32c Update version comment on `logging-parent` action add 28f339a Bump org.apache.logging:logging-parent from 10.2.0 to 10.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 (b998683) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging-logging-parent-10.4.0 (28f339a) 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: .github/workflows/build.yaml| 6 +++--- .github/workflows/merge-dependabot.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
(logging-log4j-tools) branch release/0.7.0 deleted (was 04d9a79)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/0.7.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git was 04d9a79 Release changelog for version `0.7.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-tools) 02/04: Update the `project.build.outputTimestamp` property
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-log4j-tools.git commit ffbcaaf68f5d5db30c649eb0ec240c11de0011dc Author: ASF Logging Services RM AuthorDate: Thu Dec 14 11:03:29 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 150d384..3d2eaeb 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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:55:12Z + 2023-12-14T11:00:06Z true
(logging-log4j-tools) 03/04: Release changelog for version `0.7.0`
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-log4j-tools.git
commit b7a1b091bb38cd026c577d33075104b690ea8c7a
Author: Volkan Yazıcı
AuthorDate: Mon Dec 18 09:15:51 2023 +0100
Release changelog for version `0.7.0`
---
.../0.7.0/.release-notes.adoc.ftl} | 26 ++
.../.release.xml} | 10 -
.../{.0.x.x => 0.7.0}/add-update-type.xml | 0
.../fix-changelog-entry-type-order.xml | 0
.../fix-releaser-on-empty-unreleased-dir.xml | 0
.../{.0.x.x => 0.7.0}/fix-releaser-regex.xml | 0
.../update_commons_io_commons_io.xml | 0
...maven_plugin_tools_maven_plugin_annotations.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
.../_release-notes/{_0.x.x.adoc => _0.7.0.adoc}| 13 +--
src/site/_release-notes/_0.x.x.adoc| 14
12 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/src/site/_release-notes.adoc
b/src/changelog/0.7.0/.release-notes.adoc.ftl
similarity index 70%
copy from src/site/_release-notes.adoc
copy to src/changelog/0.7.0/.release-notes.adoc.ftl
index 94a963d..8ffd747 100644
--- a/src/site/_release-notes.adoc
+++ b/src/changelog/0.7.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,24 +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/_0.x.x.adoc[]
-include::_release-notes/_0.6.0.adoc[]
-include::_release-notes/_0.5.0.adoc[]
-include::_release-notes/_0.4.0.adoc[]
-include::_release-notes/_0.3.0.adoc[]
-include::_release-notes/_0.2.0.adoc[]
-include::_release-notes/_0.1.0.adoc[]
+<#if release.date?has_content>Release date:: ${release.date}
+
+This minor release contains various bug fixes and improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
b/src/changelog/0.7.0/.release.xml
similarity index 70%
copy from src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
copy to src/changelog/0.7.0/.release.xml
index b4776e4..1c37f36 100644
--- a/src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
+++ b/src/changelog/0.7.0/.release.xml
@@ -15,9 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-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.3.xsd;
- type="fixed">
- Sort changelog entry types
alphanumerically
-
+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-14" version="0.7.0"/>
diff --git a/src/changelog/.0.x.x/add-update-type.xml
b/src/changelog/0.7.0/add-update-type.xml
similarity index 100%
rename from src/changelog/.0.x.x/add-update-type.xml
rename to src/changelog/0.7.0/add-update-type.xml
diff --git a/src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
b/src/changelog/0.7.0/fix-changelog-entry-type-order.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
rename to src/changelog/0.7.0/fix-changelog-entry-type-order.xml
diff --git a/src/changelog/.0.x.x/fix-releaser-on-empty-unreleased-dir.xml
(logging-log4j-tools) 04/04: Set the version to `0.8.0-SNAPSHOT`
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-log4j-tools.git commit 2ded1ff42a0f2be3ffbb24afd7eccef0713fcd08 Author: Volkan Yazıcı AuthorDate: Mon Dec 18 09:15:11 2023 +0100 Set the version to `0.8.0-SNAPSHOT` --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d2eaeb..0bd5370 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ -0.7.0 +0.8.0-SNAPSHOT
(logging-log4j-tools) branch main updated (4b65fad -> 2ded1ff)
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-log4j-tools.git
from 4b65fad Revert `logging-parent` action upgrade
new 86d4cd6 Set the version to `0.7.0`
new ffbcaaf Update the `project.build.outputTimestamp` property
new b7a1b09 Release changelog for version `0.7.0`
new 2ded1ff Set the version to `0.8.0-SNAPSHOT`
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml| 4 ++--
src/changelog/{.0.x.x => 0.7.0}/.release-notes.adoc.ftl| 0
src/changelog/{0.4.0 => 0.7.0}/.release.xml| 4 ++--
src/changelog/{.0.x.x => 0.7.0}/add-update-type.xml| 0
.../{.0.x.x => 0.7.0}/fix-changelog-entry-type-order.xml | 0
.../fix-releaser-on-empty-unreleased-dir.xml | 0
src/changelog/{.0.x.x => 0.7.0}/fix-releaser-regex.xml | 0
.../{.0.x.x => 0.7.0}/update_commons_io_commons_io.xml | 0
..._apache_maven_plugin_tools_maven_plugin_annotations.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
src/site/_release-notes/{_0.x.x.adoc => _0.7.0.adoc} | 13 ++---
src/site/_release-notes/_0.x.x.adoc| 14 --
13 files changed, 12 insertions(+), 26 deletions(-)
copy src/changelog/{.0.x.x => 0.7.0}/.release-notes.adoc.ftl (100%)
copy src/changelog/{0.4.0 => 0.7.0}/.release.xml (90%)
rename src/changelog/{.0.x.x => 0.7.0}/add-update-type.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/fix-changelog-entry-type-order.xml
(100%)
rename src/changelog/{.0.x.x =>
0.7.0}/fix-releaser-on-empty-unreleased-dir.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/fix-releaser-regex.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/update_commons_io_commons_io.xml (100%)
rename src/changelog/{.0.x.x =>
0.7.0}/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml (100%)
copy src/site/_release-notes/{_0.x.x.adoc => _0.7.0.adoc} (92%)
(logging-log4j-tools) 01/04: Set the version to `0.7.0`
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-log4j-tools.git commit 86d4cd6ebac6849bd52a2f1500a53a04bd91d0f2 Author: Volkan Yazıcı AuthorDate: Thu Dec 14 12:00:06 2023 +0100 Set the version to `0.7.0` --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f339d88..150d384 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ -0.7.0-SNAPSHOT +0.7.0
(logging-log4j-transform) branch main updated: Update version comment on `logging-parent` action
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 78ac32c Update version comment on `logging-parent` action
78ac32c is described below
commit 78ac32c5dfee8fd0a8af13098dc9f593e7190d0c
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:13:42 2023 +0100
Update version comment on `logging-parent` action
---
.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 0aad30c..178e898 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
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 e17e841..9ad4d76 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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
# 10.4.0
permissions:
contents: write # to push
changelog commits
pull-requests: write# to close
the PR
(logging-log4j-tools) annotated tag rel/0.7.0 updated (04d9a79 -> 6ecf759)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to annotated tag rel/0.7.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git *** WARNING: tag rel/0.7.0 was modified! *** from 04d9a79 (commit) to 6ecf759 (tag) tagging 04d9a79fb5cadb791c9e66fc671d6c0ffedf7e1e (commit) replaces rel/0.6.0 by Volkan Yazıcı on Mon Dec 18 09:13:14 2023 +0100 - Log - 0.7.0 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEE8aX8gXYUJVqORBqa031Dh8m9No4FAmV//xoACgkQ031Dh8m9 No4SIQgAsy0R54OdsbuzlAw4sYszPPfGUvTEdZIlOcNOTleRvZ0TKCZfebGnS5TF VcCRN5j8yLO8W9+tw3EQuYnQ6xNv7xPWUwGttf6nvuEyzGdn6z+4WMhchS3hjCTg 6qfz4K+SJrJ1iXCrhs9J/wrr6z+im7v7w/XDwv2P4nt0IabHrCjyW6FZNlJBvEHM cbreXO2/HSFi0O1nO1oC3GVehgN3jRnD+NxuTNQNkE/5pgqJidZMrORWpd2uE260 91NWtEQnnBpecufCItUd4UaXbkKHTJgU8ih81Yk5Xsvtpe+v/soTPp6ooiXtNIRx +fCBTpvI35jX25mk/Q1X6RfhAvH3QQ== =OqE3 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(logging-log4j-tools) branch main updated: Revert `logging-parent` action upgrade
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 4b65fad Revert `logging-parent` action upgrade
4b65fad is described below
commit 4b65fade6374e5806997e835009ef1b96d5c57a8
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:12:13 2023 +0100
Revert `logging-parent` action upgrade
---
.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 7f79860..73c721b 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@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 fac7f80..11b32c4 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@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
merge-dependabot:
needs: build
-uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
permissions:
contents: write # to push changelog
commits
pull-requests: write# to close the PR
(logging-chainsaw) branch master updated: Fix marker support
This is an automated email from the ASF dual-hosted git repository.
sdeboy 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 6203572 Fix marker support
6203572 is described below
commit 620357237e591f8eaacbd1c2b91bce00183b60d0
Author: sdeboy
AuthorDate: Mon Dec 18 00:11:57 2023 -0800
Fix marker support
---
.../org/apache/log4j/chainsaw/ChainsawColumns.java | 2 +-
.../apache/log4j/chainsaw/ChainsawConstants.java | 2 +-
.../chainsaw/ChainsawCyclicBufferTableModel.java | 5 ++--
.../log4j/chainsaw/TableColorizingRenderer.java| 2 +-
.../logpanel/ColumnNameKeywordMapper.java | 2 +-
.../chainsaw/components/logpanel/LogPanel.java | 30 --
.../logpanel/LogPanelPreferenceModel.java | 4 +--
7 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
index 1736a70..14f7549 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
@@ -33,7 +33,7 @@ public class ChainsawColumns {
static {
columnNames.add(ChainsawConstants.LOGGER_COL_NAME);
-
columnNames.add(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE.toUpperCase());
//add uppercase col name
+columnNames.add(ChainsawConstants.LOG4J_MARKER_COL_NAME); //add
uppercase col name
columnNames.add(ChainsawConstants.TIMESTAMP_COL_NAME);
columnNames.add(ChainsawConstants.LEVEL_COL_NAME);
columnNames.add(ChainsawConstants.THREAD_COL_NAME);
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
index f861a97..1af38f1 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
@@ -72,7 +72,7 @@ public class ChainsawConstants {
//COLUMN NAMES
public static final String LOGGER_COL_NAME = "LOGGER";
-public static final String LOG4J_MARKER_COL_NAME_LOWERCASE = "marker";
+public static final String LOG4J_MARKER_COL_NAME = "MARKER";
public static final String TIMESTAMP_COL_NAME = "TIMESTAMP";
public static final String LEVEL_COL_NAME = "LEVEL";
public static final String THREAD_COL_NAME = "THREAD";
diff --git
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index 62cd9ff..aa7437a 100644
---
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -31,7 +31,6 @@ import javax.swing.table.AbstractTableModel;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.time.ZoneId;
import java.util.*;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
@@ -557,7 +556,7 @@ public class ChainsawCyclicBufferTableModel extends
AbstractTableModel
return event.m_level;
case ChainsawColumns.INDEX_LOG4J_MARKER_COL_NAME:
-return
event.getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE);
+return
event.getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME);
case ChainsawColumns.INDEX_MILLIS_DELTA_COL_NAME:
return
event.getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
@@ -784,7 +783,7 @@ public class ChainsawCyclicBufferTableModel extends
AbstractTableModel
*/
@Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
-if
(getColumnName(columnIndex).equalsIgnoreCase(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE))
{
+if
(getColumnName(columnIndex).equalsIgnoreCase(ChainsawConstants.LOG4J_MARKER_COL_NAME))
{
return true;
}
diff --git
a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
index 8b9c886..c71bf6d 100644
--- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
@@ -279,7 +279,7 @@ public class TableColorizingRenderer extends
DefaultTableCellRenderer {
if (colIndex == ChainsawColumns.INDEX_LOG4J_MARKER_COL_NAME) {
//property keys are set as all uppercase
-
setHighlightAttributesInternal(matches.get(LoggingEventFieldResolver.PROP_FIELD
+ ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE.toUpperCase()),
(StyledDocument) textPane.getDocument());
+
(logging-log4j-scala) branch main updated: Revert `logging-parent` action upgrade
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-scala.git
The following commit(s) were added to refs/heads/main by this push:
new 0b4e930 Revert `logging-parent` action upgrade
0b4e930 is described below
commit 0b4e93062e2321f3580848fd5d1cfb3b06e988cb
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:10:28 2023 +0100
Revert `logging-parent` action upgrade
---
.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 22bc977..d32225a 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@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
with:
java-version: |
8
@@ -48,7 +48,7 @@ jobs:
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j-scala' && github.ref_name
== 'main'
-uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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-log4j-scala' &&
startsWith(github.ref_name, 'release/')
-uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 5529865..4cbec3f 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,7 +30,7 @@ jobs:
build:
if: github.repository == 'apache/logging-log4j-scala' && github.event_name
== 'pull_request_target' && github.actor == 'dependabot[bot]'
-uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@7750fb0f674da0abb358414ea19464ecd996e36f
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
permissions:
contents: write # to push
changelog commits
pull-requests: write# to close
the PR
(logging-log4j-kotlin) branch main updated: Update version comment on `logging-parent` action
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 297b0bc Update version comment on `logging-parent` action
297b0bc is described below
commit 297b0bcdb88d00498587d311a480929ed4c2dd26
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:08:23 2023 +0100
Update version comment on `logging-parent` action
---
.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 35ed5f4..c185a2a 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
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 5905f7a..ab601c9 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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
# 10.4.0
permissions:
contents: write # to push
changelog commits
pull-requests: write# to close
the PR
(logging-log4j-jmx-gui) branch main updated: Update version comment on `logging-parent` action
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 8ea0672 Update version comment on `logging-parent` action
8ea0672 is described below
commit 8ea06720119a6444a01ac0dabdbca613382f1c4a
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:07:42 2023 +0100
Update version comment on `logging-parent` action
---
.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 92159b9..e170457 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 2e56743..031e60d 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
# 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 854b792..8c87dde 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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
# 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 de940f5..56e5ca6 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
# 10.4.0
permissions:
# Needed to upload the results to the code-scanning dashboard.
security-events: write
(logging-log4j-jakarta) branch main updated: Update version comment on `logging-parent` action
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 9ba1234 Update version comment on `logging-parent` action
9ba1234 is described below
commit 9ba1234973fa73ad0e0ae031c2b431928765b536
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:06:21 2023 +0100
Update version comment on `logging-parent` action
---
.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 b7ab586..0f3f1de 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
# 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
# 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
# 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 2e56743..031e60d 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
# 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 8f7d520..3ed4236 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
# 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
# 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 de940f5..56e5ca6 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
# 10.4.0
permissions:
# Needed to upload the results to the code-scanning dashboard.
security-events: write
(logging-log4j2) branch main updated: Update version comment on `logging-parent` action
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 797d5303ee Update version comment on `logging-parent` action
797d5303ee is described below
commit 797d5303ee5edb3b44d45a84818e9152df414c70
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:04:07 2023 +0100
Update version comment on `logging-parent` action
---
.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 cb2ba73ad6..f014bb09df 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 b1c69b92a8..17f7726128 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 df13f169ae..20c795681e 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
with:
java-version: 17
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
# 10.4.0
with:
java-version: 17
permissions:
(logging-log4j2) branch 2.x updated: Update version comment on `logging-parent` action
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 cf4ebaca58 Update version comment on `logging-parent` action
cf4ebaca58 is described below
commit cf4ebaca58fbfb5b87514b66047b708c90fae904
Author: Piotr P. Karwasz
AuthorDate: Mon Dec 18 09:02:28 2023 +0100
Update version comment on `logging-parent` action
---
.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 517085a7a5..7003fa1808 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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 a00818082d..da21d51824 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
with:
java-version: |
8
diff --git a/.github/workflows/merge-dependabot.yaml
b/.github/workflows/merge-dependabot.yaml
index 52ee1e16e3..ef4c590188 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 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@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# rel/10.4.0
+uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@e45457c683302242be5e8e7c3c33edf8f0e0ec0e
# 10.4.0
with:
java-version: 17
permissions:
