This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/13.1.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
commit 289d4dc5fe2355a178a3e2f7c031f5744651d64f Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Feb 1 10:24:25 2024 +0100 Release changelog --- .../.13.x.x/update_apache_logging_parent.xml | 8 -------- .../13.1.0/.release-notes.adoc.ftl} | 24 +++++----------------- .../update-parent.xml => 13.1.0/.release.xml} | 10 ++++----- src/changelog/{.13.x.x => 13.1.0}/add-sbom.xml | 2 +- .../fix-scala-3-macro-inlining.xml | 2 +- .../update_org_apache_logging_log4j_log4j_bom.xml | 0 .../update_org_apache_logging_logging_parent.xml | 0 src/site/_release-notes.adoc | 2 +- .../_release-notes/{_13.x.x.adoc => _13.1.0.adoc} | 16 +++++++-------- src/site/_release-notes/_13.x.x.adoc | 15 -------------- 10 files changed, 19 insertions(+), 60 deletions(-) diff --git a/src/changelog/.13.x.x/update_apache_logging_parent.xml b/src/changelog/.13.x.x/update_apache_logging_parent.xml deleted file mode 100644 index 7dce7c6..0000000 --- a/src/changelog/.13.x.x/update_apache_logging_parent.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entry xmlns:xsi="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"> - <issue id="45" link="https://github.com/apache/logging-log4j-scala/pull/45"/> - <description format="asciidoc">Update `apache/logging-parent` to version ``</description> -</entry> diff --git a/src/site/_release-notes/_13.x.x.adoc b/src/changelog/13.1.0/.release-notes.adoc.ftl similarity index 71% copy from src/site/_release-notes/_13.x.x.adoc copy to src/changelog/13.1.0/.release-notes.adoc.ftl index 6c0e7bf..b449c05 100644 --- a/src/site/_release-notes/_13.x.x.adoc +++ b/src/changelog/13.1.0/.release-notes.adoc.ftl @@ -33,25 +33,11 @@ 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc` //// -[#release-notes-13-x-x] -=== 13.x.x +[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}] +=== ${release.version} +<#if release.date?has_content>Release date:: ${release.date}</#if> +This minor release contains a bug fix, Software Bill of Materials (SBOM) generation, and some dependency updates. -This minor release contains various bug fixes and improvements. - - -==== Added - -* Start generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0` -* Fix recursive inlining issues in Scala 3 macros (https://github.com/apache/logging-log4j-scala/pull/40[40]) - -==== Changed - -* Update `org.apache.logging:logging-parent` to version `10.2.0` - -==== Updated - -* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j-scala/pull/45[45]) -* Update `org.apache.logging.log4j:log4j-bom` to version `2.22.1` (https://github.com/apache/logging-log4j-scala/pull/43[43]) -* Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j-scala/pull/44[44]) +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/.13.x.x/update-parent.xml b/src/changelog/13.1.0/.release.xml similarity index 69% rename from src/changelog/.13.x.x/update-parent.xml rename to src/changelog/13.1.0/.release.xml index 8b82b70..1ec7ceb 100644 --- a/src/changelog/.13.x.x/update-parent.xml +++ b/src/changelog/13.1.0/.release.xml @@ -15,9 +15,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<entry xmlns:xsi="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"> - <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `10.2.0`</description> -</entry> +<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.3.xsd"; + date="2024-02-01" version="13.1.0"/> diff --git a/src/changelog/.13.x.x/add-sbom.xml b/src/changelog/13.1.0/add-sbom.xml similarity index 93% rename from src/changelog/.13.x.x/add-sbom.xml rename to src/changelog/13.1.0/add-sbom.xml index 37c29aa..f83471b 100644 --- a/src/changelog/.13.x.x/add-sbom.xml +++ b/src/changelog/13.1.0/add-sbom.xml @@ -19,5 +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"> - <description format="asciidoc">Start generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0`</description> + <description format="asciidoc">Start generating CycloneDX SBOM</description> </entry> diff --git a/src/changelog/.13.x.x/fix-scala-3-macro-inlining.xml b/src/changelog/13.1.0/fix-scala-3-macro-inlining.xml similarity index 98% rename from src/changelog/.13.x.x/fix-scala-3-macro-inlining.xml rename to src/changelog/13.1.0/fix-scala-3-macro-inlining.xml index 1bedabc..1a364eb 100644 --- a/src/changelog/.13.x.x/fix-scala-3-macro-inlining.xml +++ b/src/changelog/13.1.0/fix-scala-3-macro-inlining.xml @@ -18,7 +18,7 @@ <entry xmlns:xsi="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="added"> + type="fixed"> <issue id="40" link="https://github.com/apache/logging-log4j-scala/pull/40"/> <description format="asciidoc">Fix recursive inlining issues in Scala 3 macros</description> </entry> diff --git a/src/changelog/.13.x.x/update_org_apache_logging_log4j_log4j_bom.xml b/src/changelog/13.1.0/update_org_apache_logging_log4j_log4j_bom.xml similarity index 100% rename from src/changelog/.13.x.x/update_org_apache_logging_log4j_log4j_bom.xml rename to src/changelog/13.1.0/update_org_apache_logging_log4j_log4j_bom.xml diff --git a/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/13.1.0/update_org_apache_logging_logging_parent.xml similarity index 100% rename from src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml rename to src/changelog/13.1.0/update_org_apache_logging_logging_parent.xml diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc index 2c14714..d6f29ca 100644 --- a/src/site/_release-notes.adoc +++ b/src/site/_release-notes.adoc @@ -36,6 +36,6 @@ [#release-notes] == Release Notes -include::_release-notes/_13.x.x.adoc[] +include::_release-notes/_13.1.0.adoc[] include::_release-notes/_13.0.0.adoc[] include::_release-notes/_12.0.adoc[] diff --git a/src/site/_release-notes/_13.x.x.adoc b/src/site/_release-notes/_13.1.0.adoc similarity index 86% copy from src/site/_release-notes/_13.x.x.adoc copy to src/site/_release-notes/_13.1.0.adoc index 6c0e7bf..bb806b9 100644 --- a/src/site/_release-notes/_13.x.x.adoc +++ b/src/site/_release-notes/_13.1.0.adoc @@ -33,25 +33,23 @@ 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc` //// -[#release-notes-13-x-x] -=== 13.x.x +[#release-notes-13-1-0] +=== 13.1.0 +Release date:: 2024-02-01 - -This minor release contains various bug fixes and improvements. +This minor release contains a bug fix, Software Bill of Materials (SBOM) generation, and some dependency updates. ==== Added -* Start generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0` -* Fix recursive inlining issues in Scala 3 macros (https://github.com/apache/logging-log4j-scala/pull/40[40]) +* Start generating CycloneDX SBOM -==== Changed +==== Fixed -* Update `org.apache.logging:logging-parent` to version `10.2.0` +* Fix recursive inlining issues in Scala 3 macros (https://github.com/apache/logging-log4j-scala/pull/40[40]) ==== Updated -* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j-scala/pull/45[45]) * Update `org.apache.logging.log4j:log4j-bom` to version `2.22.1` (https://github.com/apache/logging-log4j-scala/pull/43[43]) * Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j-scala/pull/44[44]) diff --git a/src/site/_release-notes/_13.x.x.adoc b/src/site/_release-notes/_13.x.x.adoc index 6c0e7bf..a7eada3 100644 --- a/src/site/_release-notes/_13.x.x.adoc +++ b/src/site/_release-notes/_13.x.x.adoc @@ -40,18 +40,3 @@ This minor release contains various bug fixes and improvements. - -==== Added - -* Start generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0` -* Fix recursive inlining issues in Scala 3 macros (https://github.com/apache/logging-log4j-scala/pull/40[40]) - -==== Changed - -* Update `org.apache.logging:logging-parent` to version `10.2.0` - -==== Updated - -* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j-scala/pull/45[45]) -* Update `org.apache.logging.log4j:log4j-bom` to version `2.22.1` (https://github.com/apache/logging-log4j-scala/pull/43[43]) -* Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j-scala/pull/44[44])
