You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/12/27 08:04:43 UTC
(logging-log4j-kotlin) branch main updated (5645b67 -> 1979122)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
from 5645b67 Update `org.apache.logging:logging-parent` to version `10.5.0` (#58)
new f028f22 build: add project.build.outputTimestamp
new b3d6440 build: remove cyclonedx plugin, in parent now
new 2c34a87 changelogs: remove redundant author elements
new 9378476 Version 1.4.0
new 260a060 Changelog for `1.4.0`
new 048ff0a Update the `project.build.outputTimestamp` property
new b33e0d2 Release changelog for version `1.4.0`
new b40e494 Update the `project.build.outputTimestamp` property
new 90ac516 Update the `project.build.outputTimestamp` property
new 1979122 Release changelog for version `1.4.0`
The 10 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 | 28 ++++++++--------------
.../1.0.0/LOG4J2-1705_Create_Kotlin_API.xml | 2 --
...4J2-2432_Make_namedLogger_more_discoverable.xml | 2 --
.../LOG4J2-2433_Support_MDCs_with_coroutines.xml | 1 -
.../LOG4J2-2518_Support_suspend_functions.xml | 1 -
...OG4J2-2843_Update_Kotlin_baseline_to_1.3.72.xml | 1 -
.../1.2.0/LOG4J2-3218_Update_Log4j_baseline.xml | 1 -
src/changelog/1.3.0/28-Update_Log4j_baseline.xml | 1 -
.../1.3.0/29-Add_extension_property_for_logger.xml | 1 -
.../1.3.0/30-Add_facade_APIs_for_ThreadContext.xml | 1 -
src/changelog/1.3.0/32-Catching_Throwing.xml | 1 -
src/changelog/1.3.0/37-facelift.xml | 1 -
src/changelog/1.3.0/JPMS.xml | 1 -
src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml | 1 -
src/changelog/1.3.0/dokka.xml | 1 -
src/changelog/1.3.0/junit5.xml | 1 -
src/changelog/1.3.0/kotlin-baseline.xml | 2 --
src/changelog/1.3.0/skip-deploy.xml | 1 -
.../{1.0.0 => 1.4.0}/.release-notes.adoc.ftl | 2 +-
src/changelog/{1.0.0 => 1.4.0}/.release.xml | 2 +-
.../54-thread-context.xml} | 4 ++--
src/changelog/{.1.x.x => 1.4.0}/add-sbom.xml | 1 -
src/changelog/{.1.x.x => 1.4.0}/update-parent.xml | 1 -
.../update_org_apache_logging_log4j_log4j_bom.xml | 0
.../update_org_apache_logging_logging_parent.xml | 0
...org_codehaus_mojo_build_helper_maven_plugin.xml | 0
.../update_org_codehaus_mojo_exec_maven_plugin.xml | 0
.../update_org_junit_junit_bom.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
.../_release-notes/{_1.x.x.adoc => _1.4.0.adoc} | 9 +++----
src/site/_release-notes/_1.x.x.adoc | 16 -------------
32 files changed, 21 insertions(+), 66 deletions(-)
copy src/changelog/{1.0.0 => 1.4.0}/.release-notes.adoc.ftl (96%)
copy src/changelog/{1.0.0 => 1.4.0}/.release.xml (96%)
copy src/changelog/{1.3.0/OSGi-Bundle-SymbolicName.xml => 1.4.0/54-thread-context.xml} (58%)
rename src/changelog/{.1.x.x => 1.4.0}/add-sbom.xml (97%)
rename src/changelog/{.1.x.x => 1.4.0}/update-parent.xml (97%)
rename src/changelog/{.1.x.x => 1.4.0}/update_org_apache_logging_log4j_log4j_bom.xml (100%)
rename src/changelog/{.1.x.x => 1.4.0}/update_org_apache_logging_logging_parent.xml (100%)
rename src/changelog/{.1.x.x => 1.4.0}/update_org_codehaus_mojo_build_helper_maven_plugin.xml (100%)
rename src/changelog/{.1.x.x => 1.4.0}/update_org_codehaus_mojo_exec_maven_plugin.xml (100%)
rename src/changelog/{.1.x.x => 1.4.0}/update_org_junit_junit_bom.xml (100%)
copy src/site/_release-notes/{_1.x.x.adoc => _1.4.0.adoc} (91%)
(logging-log4j-kotlin) 02/10: build: remove cyclonedx plugin, in parent now
Posted by pk...@apache.org.
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
commit b3d644076f4a0fdd0c151740266ab0bc650de2a1
Author: Raman Gupta <ro...@gmail.com>
AuthorDate: Mon Dec 11 17:23:42 2023 -0500
build: remove cyclonedx plugin, in parent now
---
pom.xml | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 78c5fa0..5397bca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,23 +273,6 @@
</pluginManagement>
<plugins>
-
- <!-- `cyclonedx-maven-plugin` doesn't exclude not installed/deployed modules: https://github.com/CycloneDX/cyclonedx-maven-plugin/issues/409
- This `generate-sbom` execution override configures such exclusions. -->
- <plugin>
- <groupId>org.cyclonedx</groupId>
- <artifactId>cyclonedx-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sbom</id>
- <configuration combine.self="append">
- <excludeArtifactId>log4j-api-kotlin-benchmark</excludeArtifactId>
- <excludeArtifactId>log4j-api-kotlin-sample</excludeArtifactId>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
(logging-log4j-kotlin) 03/10: changelogs: remove redundant author elements
Posted by pk...@apache.org.
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
commit 2c34a8742aeeb5937f2d03b1379149bc879117d2
Author: Raman Gupta <ro...@gmail.com>
AuthorDate: Mon Dec 11 17:30:37 2023 -0500
changelogs: remove redundant author elements
---
src/changelog/.1.x.x/add-sbom.xml | 1 -
src/changelog/.1.x.x/update-parent.xml | 1 -
src/changelog/1.0.0/LOG4J2-1705_Create_Kotlin_API.xml | 2 --
src/changelog/1.0.0/LOG4J2-2432_Make_namedLogger_more_discoverable.xml | 2 --
src/changelog/1.1.0/LOG4J2-2433_Support_MDCs_with_coroutines.xml | 1 -
src/changelog/1.1.0/LOG4J2-2518_Support_suspend_functions.xml | 1 -
src/changelog/1.1.0/LOG4J2-2843_Update_Kotlin_baseline_to_1.3.72.xml | 1 -
src/changelog/1.2.0/LOG4J2-3218_Update_Log4j_baseline.xml | 1 -
src/changelog/1.3.0/28-Update_Log4j_baseline.xml | 1 -
src/changelog/1.3.0/29-Add_extension_property_for_logger.xml | 1 -
src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml | 1 -
src/changelog/1.3.0/32-Catching_Throwing.xml | 1 -
src/changelog/1.3.0/37-facelift.xml | 1 -
src/changelog/1.3.0/JPMS.xml | 1 -
src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml | 1 -
src/changelog/1.3.0/dokka.xml | 1 -
src/changelog/1.3.0/junit5.xml | 1 -
src/changelog/1.3.0/kotlin-baseline.xml | 2 --
src/changelog/1.3.0/skip-deploy.xml | 1 -
19 files changed, 22 deletions(-)
diff --git a/src/changelog/.1.x.x/add-sbom.xml b/src/changelog/.1.x.x/add-sbom.xml
index 3a9235e..fed2bdc 100644
--- a/src/changelog/.1.x.x/add-sbom.xml
+++ b/src/changelog/.1.x.x/add-sbom.xml
@@ -19,6 +19,5 @@
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="added">
- <author id="github:vy"/>
<description format="asciidoc">Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0`</description>
</entry>
diff --git a/src/changelog/.1.x.x/update-parent.xml b/src/changelog/.1.x.x/update-parent.xml
index 94941fc..8b82b70 100644
--- a/src/changelog/.1.x.x/update-parent.xml
+++ b/src/changelog/.1.x.x/update-parent.xml
@@ -19,6 +19,5 @@
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">
- <author id="github:vy"/>
<description format="asciidoc">Update `org.apache.logging:logging-parent` to version `10.2.0`</description>
</entry>
diff --git a/src/changelog/1.0.0/LOG4J2-1705_Create_Kotlin_API.xml b/src/changelog/1.0.0/LOG4J2-1705_Create_Kotlin_API.xml
index 12bf0dc..f2c26c3 100644
--- a/src/changelog/1.0.0/LOG4J2-1705_Create_Kotlin_API.xml
+++ b/src/changelog/1.0.0/LOG4J2-1705_Create_Kotlin_API.xml
@@ -3,7 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3556" link="https://issues.apache.org/jira/browse/LOG4J2-1705"/>
- <author id="github:jvz"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Create Kotlin wrapper API for Log4j</description>
</entry>
diff --git a/src/changelog/1.0.0/LOG4J2-2432_Make_namedLogger_more_discoverable.xml b/src/changelog/1.0.0/LOG4J2-2432_Make_namedLogger_more_discoverable.xml
index 7c8beb4..8eab1fa 100644
--- a/src/changelog/1.0.0/LOG4J2-2432_Make_namedLogger_more_discoverable.xml
+++ b/src/changelog/1.0.0/LOG4J2-2432_Make_namedLogger_more_discoverable.xml
@@ -3,7 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-2432" link="https://issues.apache.org/jira/browse/LOG4J2-2432"/>
- <author id="github:jvz"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Make `namedLogger` more discoverable</description>
</entry>
diff --git a/src/changelog/1.1.0/LOG4J2-2433_Support_MDCs_with_coroutines.xml b/src/changelog/1.1.0/LOG4J2-2433_Support_MDCs_with_coroutines.xml
index 798e49f..d70ab03 100644
--- a/src/changelog/1.1.0/LOG4J2-2433_Support_MDCs_with_coroutines.xml
+++ b/src/changelog/1.1.0/LOG4J2-2433_Support_MDCs_with_coroutines.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-2433" link="https://issues.apache.org/jira/browse/LOG4J2-2433"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Support MDCs with Kotlin coroutines</description>
</entry>
diff --git a/src/changelog/1.1.0/LOG4J2-2518_Support_suspend_functions.xml b/src/changelog/1.1.0/LOG4J2-2518_Support_suspend_functions.xml
index 7d8dea2..61d0e53 100644
--- a/src/changelog/1.1.0/LOG4J2-2518_Support_suspend_functions.xml
+++ b/src/changelog/1.1.0/LOG4J2-2518_Support_suspend_functions.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-2518" link="https://issues.apache.org/jira/browse/LOG4J2-2518"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Support suspend functions in supplier lambdas</description>
</entry>
diff --git a/src/changelog/1.1.0/LOG4J2-2843_Update_Kotlin_baseline_to_1.3.72.xml b/src/changelog/1.1.0/LOG4J2-2843_Update_Kotlin_baseline_to_1.3.72.xml
index 60b2674..6ff6cab 100644
--- a/src/changelog/1.1.0/LOG4J2-2843_Update_Kotlin_baseline_to_1.3.72.xml
+++ b/src/changelog/1.1.0/LOG4J2-2843_Update_Kotlin_baseline_to_1.3.72.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-2843" link="https://issues.apache.org/jira/browse/LOG4J2-2843"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Update Kotlin baseline version to 1.3.72</description>
</entry>
diff --git a/src/changelog/1.2.0/LOG4J2-3218_Update_Log4j_baseline.xml b/src/changelog/1.2.0/LOG4J2-3218_Update_Log4j_baseline.xml
index e4ca0d7..a07a45c 100644
--- a/src/changelog/1.2.0/LOG4J2-3218_Update_Log4j_baseline.xml
+++ b/src/changelog/1.2.0/LOG4J2-3218_Update_Log4j_baseline.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-3218" link="https://issues.apache.org/jira/browse/LOG4J2-3218"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Update Kotlin baseline version to `1.3.72`</description>
</entry>
diff --git a/src/changelog/1.3.0/28-Update_Log4j_baseline.xml b/src/changelog/1.3.0/28-Update_Log4j_baseline.xml
index 805c582..8e02f45 100644
--- a/src/changelog/1.3.0/28-Update_Log4j_baseline.xml
+++ b/src/changelog/1.3.0/28-Update_Log4j_baseline.xml
@@ -2,6 +2,5 @@
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">
- <author id="github:vy"/>
<description format="asciidoc">Updated Log4j dependency to `2.20.0`</description>
</entry>
diff --git a/src/changelog/1.3.0/29-Add_extension_property_for_logger.xml b/src/changelog/1.3.0/29-Add_extension_property_for_logger.xml
index e83ac0e..796e098 100644
--- a/src/changelog/1.3.0/29-Add_extension_property_for_logger.xml
+++ b/src/changelog/1.3.0/29-Add_extension_property_for_logger.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="29" link="https://github.com/apache/logging-log4j-kotlin/issues/29"/>
- <author id="github:jvz"/>
<description format="asciidoc">Added an extension property for storing a cached logger</description>
</entry>
diff --git a/src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml b/src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml
index 7dfaa1a..5c78a71 100644
--- a/src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml
+++ b/src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="30" link="https://github.com/apache/logging-log4j-kotlin/issues/30"/>
- <author id="github:jvz"/>
<description format="asciidoc">Added facade APIs for manipulating the context map and stack</description>
</entry>
diff --git a/src/changelog/1.3.0/32-Catching_Throwing.xml b/src/changelog/1.3.0/32-Catching_Throwing.xml
index 70acb5a..428a718 100644
--- a/src/changelog/1.3.0/32-Catching_Throwing.xml
+++ b/src/changelog/1.3.0/32-Catching_Throwing.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="32" link="https://github.com/apache/logging-log4j-kotlin/issues/32"/>
- <author id="github:rocketraman"/>
<description format="asciidoc">Added missing `catching` and `throwing` API methods in `KotlinLogger`</description>
</entry>
diff --git a/src/changelog/1.3.0/37-facelift.xml b/src/changelog/1.3.0/37-facelift.xml
index 185a94b..fe22f0a 100644
--- a/src/changelog/1.3.0/37-facelift.xml
+++ b/src/changelog/1.3.0/37-facelift.xml
@@ -3,6 +3,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="37" link="https://github.com/apache/logging-log4j-kotlin/pull/37"/>
- <author id="github:vy"/>
<description format="asciidoc">Bumped `logging-parent` version to `10.1.1` and overhauled the entire project infrastructure to take advantage of its goodies</description>
</entry>
diff --git a/src/changelog/1.3.0/JPMS.xml b/src/changelog/1.3.0/JPMS.xml
index 033ef2e..704478a 100644
--- a/src/changelog/1.3.0/JPMS.xml
+++ b/src/changelog/1.3.0/JPMS.xml
@@ -2,6 +2,5 @@
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="added">
- <author id="github:vy"/>
<description format="asciidoc">Added JPMS support and used `org.apache.logging.log4j.api.kotlin` for the module name (identical to OSGi `Bundle-SymbolicName`) of the `log4j-api-kotlin` artifact</description>
</entry>
diff --git a/src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml b/src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml
index 69832d5..655113d 100644
--- a/src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml
+++ b/src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml
@@ -2,6 +2,5 @@
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">
- <author id="github:vy"/>
<description format="asciidoc">Renamed OSGi `Bundle-SymbolicName` from `org.apache.logging.log4j.kotlin` to `org.apache.logging.log4j.api.kotlin`</description>
</entry>
diff --git a/src/changelog/1.3.0/dokka.xml b/src/changelog/1.3.0/dokka.xml
index 097744c..9bdf71c 100644
--- a/src/changelog/1.3.0/dokka.xml
+++ b/src/changelog/1.3.0/dokka.xml
@@ -2,6 +2,5 @@
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="removed">
- <author id="github:vy"/>
<description format="asciidoc">Stopped exporting KDoc to HTML</description>
</entry>
diff --git a/src/changelog/1.3.0/junit5.xml b/src/changelog/1.3.0/junit5.xml
index 9023402..110704e 100644
--- a/src/changelog/1.3.0/junit5.xml
+++ b/src/changelog/1.3.0/junit5.xml
@@ -2,6 +2,5 @@
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">
- <author id="github:vy"/>
<description format="asciidoc">Migrated tests to JUnit 5</description>
</entry>
diff --git a/src/changelog/1.3.0/kotlin-baseline.xml b/src/changelog/1.3.0/kotlin-baseline.xml
index 19b1fb5..ef607f0 100644
--- a/src/changelog/1.3.0/kotlin-baseline.xml
+++ b/src/changelog/1.3.0/kotlin-baseline.xml
@@ -2,7 +2,5 @@
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">
- <author id="github:breun"/>
- <author id="github:vy"/>
<description format="asciidoc">Bumped Kotlin and Kotlin Extensions baseline to `1.6.21` and `1.6.4` respectively</description>
</entry>
diff --git a/src/changelog/1.3.0/skip-deploy.xml b/src/changelog/1.3.0/skip-deploy.xml
index 55fdffa..85a424b 100644
--- a/src/changelog/1.3.0/skip-deploy.xml
+++ b/src/changelog/1.3.0/skip-deploy.xml
@@ -2,6 +2,5 @@
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">
- <author id="github:vy"/>
<description format="asciidoc">Skipped deploying `log4j-api-kotlin-benchmark` and `log4j-api-kotlin-sample` modules</description>
</entry>
(logging-log4j-kotlin) 10/10: Release changelog for version `1.4.0`
Posted by pk...@apache.org.
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
commit 197912246ddee47046ce0ab99169853e26388281
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Mon Dec 18 18:46:36 2023 +0000
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 @@
<release xmlns="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 c8e3009..815b283 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) 08/10: Update the `project.build.outputTimestamp` property
Posted by pk...@apache.org.
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
commit b40e49435bd8a0890e79de19e6b3347f2f71b2fc
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Tue Dec 12 19:57:58 2023 +0000
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 1b962fe..a6473b8 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*! -->
- <project.build.outputTimestamp>2023-12-12T12:22:51Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-12-12T19:06:18Z</project.build.outputTimestamp>
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>
(logging-log4j-kotlin) 04/10: Version 1.4.0
Posted by pk...@apache.org.
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
commit 93784766054d464f8947389279e16f6290287726
Author: Raman Gupta <ro...@gmail.com>
AuthorDate: Mon Dec 11 17:43:36 2023 -0500
Version 1.4.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5397bca..4f14a83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<properties>
<!-- project version -->
- <revision>1.4.0-SNAPSHOT</revision>
+ <revision>1.4.0</revision>
<!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.
(logging-log4j-kotlin) 05/10: Changelog for `1.4.0`
Posted by pk...@apache.org.
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
commit 260a0600fe0ddb32089e4282b6f2e25c7e12e99b
Author: Raman Gupta <ro...@gmail.com>
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}</#if>
+
+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 0000000..8cd9890
--- /dev/null
+++ b/src/changelog/1.4.0/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<release xmlns="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 0000000..10f0d35
--- /dev/null
+++ b/src/changelog/1.4.0/54-thread-context.xml
@@ -0,0 +1,7 @@
+<entry xmlns="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">
+ <issue id="54" link="https://github.com/apache/logging-log4j-kotlin/issues/54"/>
+ <description format="asciidoc">Coroutine context is not cleared properly, only appended to</description>
+</entry>
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 src/site/_release-notes/_1.4.0.adoc
index 2a90e46..3d48343 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes/_1.4.0.adoc
@@ -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,25 @@
██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
- 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-1-4-0]
+=== 1.4.0
-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[]
+Release date:: 2023-12-11
+
+This minor release fixes incorrect coroutine context map and stack.
+
+
+==== Changed
+
+* Coroutine context is not cleared properly, only appended to (https://github.com/apache/logging-log4j-kotlin/issues/54[54])
(logging-log4j-kotlin) 06/10: Update the `project.build.outputTimestamp` property
Posted by pk...@apache.org.
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
commit 048ff0a1d6385f40aded844773be3c040bd875a1
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Tue Dec 12 12:26:37 2023 +0000
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 4f14a83..1b962fe 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*! -->
- <project.build.outputTimestamp>2023-11-17T08:52:06Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-12-12T12:22:51Z</project.build.outputTimestamp>
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>
(logging-log4j-kotlin) 07/10: Release changelog for version `1.4.0`
Posted by pk...@apache.org.
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
commit b33e0d2fe6c5c687f99659773e8643610a938908
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Tue Dec 12 12:26:45 2023 +0000
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
...pdate_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 | 15 ++++++++++++++-
src/site/_release-notes/_1.x.x.adoc | 16 ----------------
11 files changed, 15 insertions(+), 19 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 @@
<release xmlns="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..c8e3009 100644
--- a/src/site/_release-notes/_1.4.0.adoc
+++ b/src/site/_release-notes/_1.4.0.adoc
@@ -36,11 +36,24 @@
[#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 `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0` (https://github.com/apache/logging-log4j-kotlin/pull/51[51])
+* Update `org.codehaus.mojo:exec-maven-plugin` to version `3.1.1` (https://github.com/apache/logging-log4j-kotlin/pull/50[50])
+* Update `org.junit:junit-bom` to version `5.10.1` (https://github.com/apache/logging-log4j-kotlin/pull/49[49])
+
+==== Updated
+
+* Update `org.apache.logging:logging-parent` to version `10.5.0` (https://github.com/apache/logging-log4j-kotlin/pull/58[58])
diff --git a/src/site/_release-notes/_1.x.x.adoc b/src/site/_release-notes/_1.x.x.adoc
index 9fa3a79..cc4cccf 100644
--- a/src/site/_release-notes/_1.x.x.adoc
+++ b/src/site/_release-notes/_1.x.x.adoc
@@ -40,19 +40,3 @@
This minor release bumps the Kotlin baseline to 1.6.21 and contains various small improvements.
-
-==== Added
-
-* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0`
-
-==== Changed
-
-* 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 `org.codehaus.mojo:build-helper-maven-plugin` to version `3.5.0` (https://github.com/apache/logging-log4j-kotlin/pull/51[51])
-* Update `org.codehaus.mojo:exec-maven-plugin` to version `3.1.1` (https://github.com/apache/logging-log4j-kotlin/pull/50[50])
-* Update `org.junit:junit-bom` to version `5.10.1` (https://github.com/apache/logging-log4j-kotlin/pull/49[49])
-
-==== Updated
-
-* Update `org.apache.logging:logging-parent` to version `10.5.0` (https://github.com/apache/logging-log4j-kotlin/pull/58[58])
(logging-log4j-kotlin) 01/10: build: add project.build.outputTimestamp
Posted by pk...@apache.org.
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
commit f028f22f8f195e9d068a870d2c693eaf9723e034
Author: Raman Gupta <ro...@gmail.com>
AuthorDate: Mon Dec 11 17:23:32 2023 -0500
build: add project.build.outputTimestamp
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index ddc8d63..78c5fa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,15 @@
<!-- project version -->
<revision>1.4.0-SNAPSHOT</revision>
+ <!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
+ We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.
+ Though inheriting this property has two undesired consequences:
+ 1. `artifact:compare` dumps an `ERROR` log stating that this `property should not be inherited but defined` (apache/logging-parent#50)
+ 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*! -->
+ <project.build.outputTimestamp>2023-11-17T08:52:06Z</project.build.outputTimestamp>
+
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
(logging-log4j-kotlin) 09/10: Update the `project.build.outputTimestamp` property
Posted by pk...@apache.org.
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
commit 90ac516ad75e49db76d9bf95824cbd4f17808167
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Mon Dec 18 18:46:28 2023 +0000
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 a6473b8..9f20cc3 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*! -->
- <project.build.outputTimestamp>2023-12-12T19:06:18Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-12-18T18:39:10Z</project.build.outputTimestamp>
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>