diff --git a/src/changelog/0.7.0/.release-notes.adoc.ftl b/src/changelog/0.7.0/.release-notes.adoc.ftl new file mode 100644 index 00000000..8ffd7474 --- /dev/null +++ b/src/changelog/0.7.0/.release-notes.adoc.ftl @@ -0,0 +1,43 @@ +//// + 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. +//// + +//// + ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██ + ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██ + ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██ + ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ + ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██ + + IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT! + + 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. Find and edit the associated `.release-notes.adoc.ftl` + 2. Run `./mvnw generate-sources` + 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc` +//// + +[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}] +=== ${release.version} + +<#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.7.0/.release.xml b/src/changelog/0.7.0/.release.xml new file mode 100644 index 00000000..1c37f369 --- /dev/null +++ b/src/changelog/0.7.0/.release.xml @@ -0,0 +1,21 @@ + + + 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 b/src/changelog/0.7.0/fix-releaser-on-empty-unreleased-dir.xml similarity index 100% rename from src/changelog/.0.x.x/fix-releaser-on-empty-unreleased-dir.xml rename to src/changelog/0.7.0/fix-releaser-on-empty-unreleased-dir.xml diff --git a/src/changelog/.0.x.x/fix-releaser-regex.xml b/src/changelog/0.7.0/fix-releaser-regex.xml similarity index 100% rename from src/changelog/.0.x.x/fix-releaser-regex.xml rename to src/changelog/0.7.0/fix-releaser-regex.xml diff --git a/src/changelog/.0.x.x/update_commons_io_commons_io.xml b/src/changelog/0.7.0/update_commons_io_commons_io.xml similarity index 100% rename from src/changelog/.0.x.x/update_commons_io_commons_io.xml rename to src/changelog/0.7.0/update_commons_io_commons_io.xml diff --git a/src/changelog/.0.x.x/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 similarity index 100% rename from src/changelog/.0.x.x/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml rename to src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc index 2124b18d..0a233c36 100644 --- a/src/site/_constants.adoc +++ b/src/site/_constants.adoc @@ -34,7 +34,7 @@ //// :project-github-url: https://github.com/apache/logging-log4j-tools -:project-version: 0.7.0-SNAPSHOT +:project-version: 0.7.0 :project-name: Log4j Tools :project-id: log4j-tools :java-target-version: 8 diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc index 94a963db..1bede702 100644 --- a/src/site/_release-notes.adoc +++ b/src/site/_release-notes.adoc @@ -36,7 +36,7 @@ [#release-notes] == Release Notes -include::_release-notes/_0.x.x.adoc[] +include::_release-notes/_0.7.0.adoc[] include::_release-notes/_0.6.0.adoc[] include::_release-notes/_0.5.0.adoc[] include::_release-notes/_0.4.0.adoc[] diff --git a/src/site/_release-notes/_0.7.0.adoc b/src/site/_release-notes/_0.7.0.adoc new file mode 100644 index 00000000..65e231ef --- /dev/null +++ b/src/site/_release-notes/_0.7.0.adoc @@ -0,0 +1,60 @@ +//// + 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. +//// + +//// + ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██ + ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██ + ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██ + ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ + ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██ + + IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT! + + 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. Find and edit the associated `.release-notes.adoc.ftl` + 2. Run `./mvnw generate-sources` + 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc` +//// + +[#release-notes-0-7-0] +=== 0.7.0 + +Release date:: 2023-12-14 + +This minor release contains various bug fixes and improvements. + + +[#release-notes-0-7-0-added] +==== Added + +* 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]) diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc index 7cb9b706..5e8caa42 100644 --- a/src/site/_release-notes/_0.x.x.adoc +++ b/src/site/_release-notes/_0.x.x.adoc @@ -40,21 +40,3 @@ This minor release contains various bug fixes and improvements. - -[#release-notes-0-x-x-added] -==== Added - -* Add the new `updated` changelog entry type and bump the XSD version to `0.1.3` - -[#release-notes-0-x-x-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-x-x-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])