You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2023/12/12 12:25:01 UTC

(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 927aa7f  Release changelog for version `1.4.0`
927aa7f is described below

commit 927aa7fab9cc5673a464b924278d6f1a140ebae8
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Tue Dec 12 12:24:56 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
 .../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 @@
 <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..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 `org.apache.logging:logging-parent` to version `10.4.0` (https://github.com/apache/logging-log4j-kotlin/pull/53[53])
+* 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])
diff --git a/src/site/_release-notes/_1.x.x.adoc b/src/site/_release-notes/_1.x.x.adoc
index 4124ca5..cc4cccf 100644
--- a/src/site/_release-notes/_1.x.x.adoc
+++ b/src/site/_release-notes/_1.x.x.adoc
@@ -40,16 +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.apache.logging:logging-parent` to version `10.4.0` (https://github.com/apache/logging-log4j-kotlin/pull/53[53])
-* 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])