diff --git a/src/changelog/10.4.0/.release-notes.adoc.ftl b/src/changelog/10.4.0/.release-notes.adoc.ftl new file mode 100644 index 00000000..b2209845 --- /dev/null +++ b/src/changelog/10.4.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 several small improvements. + +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/10.4.0/.release.xml b/src/changelog/10.4.0/.release.xml new file mode 100644 index 00000000..ef12f072 --- /dev/null +++ b/src/changelog/10.4.0/.release.xml @@ -0,0 +1,21 @@ + + + diff --git a/src/changelog/.10.x.x/add-deterministic-formatter.xml b/src/changelog/10.4.0/add-deterministic-formatter.xml similarity index 100% rename from src/changelog/.10.x.x/add-deterministic-formatter.xml rename to src/changelog/10.4.0/add-deterministic-formatter.xml diff --git a/src/changelog/.10.x.x/increase-file-walk-depth.xml b/src/changelog/10.4.0/increase-file-walk-depth.xml similarity index 100% rename from src/changelog/.10.x.x/increase-file-walk-depth.xml rename to src/changelog/10.4.0/increase-file-walk-depth.xml diff --git a/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml similarity index 100% rename from src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml rename to src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml diff --git a/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml b/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml similarity index 100% rename from src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml rename to src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml diff --git a/src/changelog/.10.x.x/update_org_apache_maven_plugins_maven_artifact_plugin.xml b/src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml similarity index 100% rename from src/changelog/.10.x.x/update_org_apache_maven_plugins_maven_artifact_plugin.xml rename to src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc index 54a344cb..b5dbc787 100644 --- a/src/site/_release-notes.adoc +++ b/src/site/_release-notes.adoc @@ -36,7 +36,7 @@ [#release-notes] == Release Notes -include::_release-notes/_10.x.x.adoc[] +include::_release-notes/_10.4.0.adoc[] include::_release-notes/_10.3.0.adoc[] include::_release-notes/_10.2.0.adoc[] include::_release-notes/_10.1.1.adoc[] diff --git a/src/site/_release-notes/_10.4.0.adoc b/src/site/_release-notes/_10.4.0.adoc new file mode 100644 index 00000000..2835c72e --- /dev/null +++ b/src/site/_release-notes/_10.4.0.adoc @@ -0,0 +1,53 @@ +//// + 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-10-4-0] +=== 10.4.0 + +Release date:: 2023-11-13 + +This minor release contains several small improvements. + + +==== Added + +* Add deterministic Palantir Java formatter + +==== Changed + +* Increase directory scanning depth from 8 to 32 in the distribution BeanShell script +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` (https://github.com/apache/logging-parent/pull/58[58]) +* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` (https://github.com/apache/logging-parent/pull/57[57]) +* Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0` diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index cf47ae7b..8f674490 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -40,14 +40,3 @@ This minor release contains several small improvements. - -==== Added - -* Add deterministic Palantir Java formatter - -==== Changed - -* Increase directory scanning depth from 8 to 32 in the distribution BeanShell script -* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` (https://github.com/apache/logging-parent/pull/58[58]) -* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` (https://github.com/apache/logging-parent/pull/57[57]) -* Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0`