From f3b5f663490f116c26c22e7950562e75ad8491b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20Yaz=C4=B1c=C4=B1?= Date: Mon, 15 Jan 2024 10:16:19 +0100 Subject: [PATCH] Update `org.apache.logging:logging-parent` to version `10.6.0` --- pom.xml | 2 +- .../.0.x.x/update_apache_logging_parent.xml | 7 +++---- .../update_jakarta_inject_jakarta_inject_api.xml | 4 ++-- .../update_org_apache_logging_logging_parent.xml | 2 +- ...update_org_junit_jupiter_junit_jupiter_engine.xml | 2 +- src/changelog/0.6.0/update-parent.xml | 2 +- src/changelog/0.7.0/update_commons_io_commons_io.xml | 2 +- ...e_maven_plugin_tools_maven_plugin_annotations.xml | 2 +- src/site/_release-notes/_0.2.0.adoc | 10 +++++----- src/site/_release-notes/_0.5.0.adoc | 4 ++++ src/site/_release-notes/_0.6.0.adoc | 10 +++++----- src/site/_release-notes/_0.7.0.adoc | 12 ++++++------ src/site/_release-notes/_0.x.x.adoc | 6 +++--- 13 files changed, 34 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index eeb150ad..97cea2cd 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.logging logging-parent - 10.4.0 + 10.6.0 org.apache.logging.log4j diff --git a/src/changelog/.0.x.x/update_apache_logging_parent.xml b/src/changelog/.0.x.x/update_apache_logging_parent.xml index c949aa65..3d27b089 100644 --- a/src/changelog/.0.x.x/update_apache_logging_parent.xml +++ b/src/changelog/.0.x.x/update_apache_logging_parent.xml @@ -1,8 +1,7 @@ - - Update `apache/logging-parent` to version `` + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd" + type="updated"> + Update `org.apache.logging:logging-parent` to version `10.6.0` diff --git a/src/changelog/.0.x.x/update_jakarta_inject_jakarta_inject_api.xml b/src/changelog/.0.x.x/update_jakarta_inject_jakarta_inject_api.xml index c0fa75ec..b4edaf88 100644 --- a/src/changelog/.0.x.x/update_jakarta_inject_jakarta_inject_api.xml +++ b/src/changelog/.0.x.x/update_jakarta_inject_jakarta_inject_api.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd" + type="updated"> Update `jakarta.inject:jakarta.inject-api` to version `2.0.1` diff --git a/src/changelog/0.5.0/update_org_apache_logging_logging_parent.xml b/src/changelog/0.5.0/update_org_apache_logging_logging_parent.xml index 32a329a5..01870d97 100644 --- a/src/changelog/0.5.0/update_org_apache_logging_logging_parent.xml +++ b/src/changelog/0.5.0/update_org_apache_logging_logging_parent.xml @@ -18,7 +18,7 @@ + type="updated"> Update `org.apache.logging:logging-parent` to version `10.1.1` diff --git a/src/changelog/0.5.0/update_org_junit_jupiter_junit_jupiter_engine.xml b/src/changelog/0.5.0/update_org_junit_jupiter_junit_jupiter_engine.xml index 7a23ca6a..e89731d0 100644 --- a/src/changelog/0.5.0/update_org_junit_jupiter_junit_jupiter_engine.xml +++ b/src/changelog/0.5.0/update_org_junit_jupiter_junit_jupiter_engine.xml @@ -2,6 +2,6 @@ + type="updated"> Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0` diff --git a/src/changelog/0.6.0/update-parent.xml b/src/changelog/0.6.0/update-parent.xml index b88b78f9..6119c13b 100644 --- a/src/changelog/0.6.0/update-parent.xml +++ b/src/changelog/0.6.0/update-parent.xml @@ -18,6 +18,6 @@ + type="updated"> Update `org.apache.logging:logging-parent` to version `10.4.0` diff --git a/src/changelog/0.7.0/update_commons_io_commons_io.xml b/src/changelog/0.7.0/update_commons_io_commons_io.xml index 7416f291..14a4c2d1 100644 --- a/src/changelog/0.7.0/update_commons_io_commons_io.xml +++ b/src/changelog/0.7.0/update_commons_io_commons_io.xml @@ -2,7 +2,7 @@ + type="updated"> Update `commons-io:commons-io` to version `2.15.1` diff --git a/src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml b/src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml index 2359eb07..d8cb3809 100644 --- a/src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml +++ b/src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml @@ -2,7 +2,7 @@ + type="updated"> Update `org.apache.maven.plugin-tools:maven-plugin-annotations` to version `3.10.2` diff --git a/src/site/_release-notes/_0.2.0.adoc b/src/site/_release-notes/_0.2.0.adoc index 7e912322..f9d40569 100644 --- a/src/site/_release-notes/_0.2.0.adoc +++ b/src/site/_release-notes/_0.2.0.adoc @@ -52,13 +52,13 @@ This minor release contains various bug fixes and improvements. * Rename `log4j.changelog.exporter.outputDirectory` property to `log4j.changelog.outputDirectory` (https://github.com/apache/logging-log4j-tools/issues/20[20]) -[#release-notes-0-2-0-removed] -==== Removed - -* Remove `security` as a change type from `log4j-changelog` (https://github.com/apache/logging-log4j-tools/issues/14[14]) - [#release-notes-0-2-0-fixed] ==== Fixed * Fix unreleased directory order in `ChangelogExporter` (https://github.com/apache/logging-log4j-tools/issues/17[17]) * Fix Windows compatibility (https://github.com/apache/logging-log4j-tools/issues/19[19]) + +[#release-notes-0-2-0-removed] +==== Removed + +* Remove `security` as a change type from `log4j-changelog` (https://github.com/apache/logging-log4j-tools/issues/14[14]) diff --git a/src/site/_release-notes/_0.5.0.adoc b/src/site/_release-notes/_0.5.0.adoc index caa33c47..c014f1f9 100644 --- a/src/site/_release-notes/_0.5.0.adoc +++ b/src/site/_release-notes/_0.5.0.adoc @@ -52,5 +52,9 @@ This minor release contains various bug fixes and improvements. * Made `author` element optional and bumped the XML schema version to `0.1.2` (https://github.com/apache/logging-log4j-tools/issues/81[81]) * Make `log4j-changelog-maven-plugin` thread-safe (https://github.com/apache/logging-log4j-tools/issues/80[80]) + +[#release-notes-0-5-0-updated] +==== Updated + * Update `org.apache.logging:logging-parent` to version `10.1.1` (https://github.com/apache/logging-log4j-tools/pull/82[82]) * Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0` diff --git a/src/site/_release-notes/_0.6.0.adoc b/src/site/_release-notes/_0.6.0.adoc index 5889cc3c..d6b81e82 100644 --- a/src/site/_release-notes/_0.6.0.adoc +++ b/src/site/_release-notes/_0.6.0.adoc @@ -46,12 +46,12 @@ This minor release contains various bug fixes and improvements. * Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.4.0` -[#release-notes-0-6-0-changed] -==== Changed - -* Update `org.apache.logging:logging-parent` to version `10.4.0` - [#release-notes-0-6-0-fixed] ==== Fixed * `log4j-tools-bom` was broken due to removed `parent` during flattening. This is automatically fixed by the recent `logging-parent` version `10.4.0` update. + +[#release-notes-0-6-0-updated] +==== Updated + +* Update `org.apache.logging:logging-parent` to version `10.4.0` diff --git a/src/site/_release-notes/_0.7.0.adoc b/src/site/_release-notes/_0.7.0.adoc index 65e231ef..0e876a89 100644 --- a/src/site/_release-notes/_0.7.0.adoc +++ b/src/site/_release-notes/_0.7.0.adoc @@ -46,15 +46,15 @@ This minor release contains various bug fixes and improvements. * Add the new `updated` changelog entry type and bump the XSD version to `0.1.3` -[#release-notes-0-7-0-changed] -==== 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]) - [#release-notes-0-7-0-fixed] ==== 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]) + +[#release-notes-0-7-0-updated] +==== Updated + +* 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]) diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc index e3617f4b..d285c547 100644 --- a/src/site/_release-notes/_0.x.x.adoc +++ b/src/site/_release-notes/_0.x.x.adoc @@ -46,8 +46,8 @@ This minor release contains various bug fixes and improvements. * Add a `log4j-docgen` module with a common XML model to document sets of Log4j plugins. -[#release-notes-0-x-x-changed] -==== Changed +[#release-notes-0-x-x-updated] +==== Updated -* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j-tools/pull/91[91]) +* Update `apache/logging-parent` to version `10.6.0` * Update `jakarta.inject:jakarta.inject-api` to version `2.0.1` (https://github.com/apache/logging-log4j-tools/pull/94[94])