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/10/18 13:11:12 UTC
[logging-parent] branch release/10.2.0 updated: Release changelog for version `10.2.0`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release/10.2.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/release/10.2.0 by this push:
new 203f15b Release changelog for version `10.2.0`
203f15b is described below
commit 203f15b6a8864f9c1b86d9ebe0af4a478015578f
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Wed Oct 18 13:11:07 2023 +0000
Release changelog for version `10.2.0`
---
.../10.2.0/.release-notes.adoc.ftl} | 23 +++++++++++-----------
src/changelog/10.2.0/.release.xml | 21 ++++++++++++++++++++
.../{.10.x.x => 10.2.0}/add-sbom-support.xml | 0
.../add_bnd_baseline_plugin.xml | 0
.../apply_bnd_config_all_goals.xml | 0
.../{.10.x.x => 10.2.0}/change_flattened_pom.xml | 0
.../{.10.x.x => 10.2.0}/fix_bnd_extra_options.xml | 0
.../keep-parent-in-flatten-bom.xml | 0
.../remove-build-in-flatten-bom.xml | 0
.../{.10.x.x => 10.2.0}/skip-symlink-dirs.xml | 0
.../update-changelog-version.xml | 0
.../update-changelog-xsd-version.xml | 0
...te_com_github_spotbugs_spotbugs_annotations.xml | 0
.../use-specific-defaultGoal.xml | 0
src/site/_release-notes.adoc | 2 +-
.../_release-notes/{_10.x.x.adoc => _10.2.0.adoc} | 6 +++---
src/site/_release-notes/_10.x.x.adoc | 21 --------------------
17 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/src/site/_release-notes.adoc b/src/changelog/10.2.0/.release-notes.adoc.ftl
similarity index 71%
copy from src/site/_release-notes.adoc
copy to src/changelog/10.2.0/.release-notes.adoc.ftl
index a12df66..b220984 100644
--- a/src/site/_release-notes.adoc
+++ b/src/changelog/10.2.0/.release-notes.adoc.ftl
@@ -6,7 +6,7 @@
(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
+ 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,
@@ -22,21 +22,22 @@
██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
- IF THIS FILE IS CALLED `index.adoc`, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+ IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
- Release notes `index.adoc` is generated from `src/changelog/.index.adoc.ftl`.
+ 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. Edit `.index.adoc.ftl`
+ 1. Find and edit the associated `.release-notes.adoc.ftl`
2. Run `./mvnw generate-sources`
- 3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
+ 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
////
-[#release-notes]
-== Release Notes
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
-include::_release-notes/_10.x.x.adoc[]
-include::_release-notes/_10.1.1.adoc[]
-include::_release-notes/_10.1.0.adoc[]
-include::_release-notes/_10.0.0.adoc[]
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This minor release contains several small improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.2.0/.release.xml b/src/changelog/10.2.0/.release.xml
new file mode 100644
index 0000000..991811d
--- /dev/null
+++ b/src/changelog/10.2.0/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<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-10-18" version="10.2.0"/>
diff --git a/src/changelog/.10.x.x/add-sbom-support.xml b/src/changelog/10.2.0/add-sbom-support.xml
similarity index 100%
rename from src/changelog/.10.x.x/add-sbom-support.xml
rename to src/changelog/10.2.0/add-sbom-support.xml
diff --git a/src/changelog/.10.x.x/add_bnd_baseline_plugin.xml b/src/changelog/10.2.0/add_bnd_baseline_plugin.xml
similarity index 100%
rename from src/changelog/.10.x.x/add_bnd_baseline_plugin.xml
rename to src/changelog/10.2.0/add_bnd_baseline_plugin.xml
diff --git a/src/changelog/.10.x.x/apply_bnd_config_all_goals.xml b/src/changelog/10.2.0/apply_bnd_config_all_goals.xml
similarity index 100%
rename from src/changelog/.10.x.x/apply_bnd_config_all_goals.xml
rename to src/changelog/10.2.0/apply_bnd_config_all_goals.xml
diff --git a/src/changelog/.10.x.x/change_flattened_pom.xml b/src/changelog/10.2.0/change_flattened_pom.xml
similarity index 100%
rename from src/changelog/.10.x.x/change_flattened_pom.xml
rename to src/changelog/10.2.0/change_flattened_pom.xml
diff --git a/src/changelog/.10.x.x/fix_bnd_extra_options.xml b/src/changelog/10.2.0/fix_bnd_extra_options.xml
similarity index 100%
rename from src/changelog/.10.x.x/fix_bnd_extra_options.xml
rename to src/changelog/10.2.0/fix_bnd_extra_options.xml
diff --git a/src/changelog/.10.x.x/keep-parent-in-flatten-bom.xml b/src/changelog/10.2.0/keep-parent-in-flatten-bom.xml
similarity index 100%
rename from src/changelog/.10.x.x/keep-parent-in-flatten-bom.xml
rename to src/changelog/10.2.0/keep-parent-in-flatten-bom.xml
diff --git a/src/changelog/.10.x.x/remove-build-in-flatten-bom.xml b/src/changelog/10.2.0/remove-build-in-flatten-bom.xml
similarity index 100%
rename from src/changelog/.10.x.x/remove-build-in-flatten-bom.xml
rename to src/changelog/10.2.0/remove-build-in-flatten-bom.xml
diff --git a/src/changelog/.10.x.x/skip-symlink-dirs.xml b/src/changelog/10.2.0/skip-symlink-dirs.xml
similarity index 100%
rename from src/changelog/.10.x.x/skip-symlink-dirs.xml
rename to src/changelog/10.2.0/skip-symlink-dirs.xml
diff --git a/src/changelog/.10.x.x/update-changelog-version.xml b/src/changelog/10.2.0/update-changelog-version.xml
similarity index 100%
rename from src/changelog/.10.x.x/update-changelog-version.xml
rename to src/changelog/10.2.0/update-changelog-version.xml
diff --git a/src/changelog/.10.x.x/update-changelog-xsd-version.xml b/src/changelog/10.2.0/update-changelog-xsd-version.xml
similarity index 100%
rename from src/changelog/.10.x.x/update-changelog-xsd-version.xml
rename to src/changelog/10.2.0/update-changelog-xsd-version.xml
diff --git a/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/10.2.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.2.0/update_com_github_spotbugs_spotbugs_annotations.xml
diff --git a/src/changelog/.10.x.x/use-specific-defaultGoal.xml b/src/changelog/10.2.0/use-specific-defaultGoal.xml
similarity index 100%
rename from src/changelog/.10.x.x/use-specific-defaultGoal.xml
rename to src/changelog/10.2.0/use-specific-defaultGoal.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index a12df66..6f01324 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.2.0.adoc[]
include::_release-notes/_10.1.1.adoc[]
include::_release-notes/_10.1.0.adoc[]
include::_release-notes/_10.0.0.adoc[]
diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.2.0.adoc
similarity index 98%
copy from src/site/_release-notes/_10.x.x.adoc
copy to src/site/_release-notes/_10.2.0.adoc
index 0077123..71e0c36 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.2.0.adoc
@@ -33,10 +33,10 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
////
-[#release-notes-10-x-x]
-=== 10.x.x
-
+[#release-notes-10-2-0]
+=== 10.2.0
+Release date:: 2023-10-18
This minor release contains several small improvements.
diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc
index 0077123..8f67449 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -40,24 +40,3 @@
This minor release contains several small improvements.
-
-==== Added
-
-* Added support for auto-generating CycloneDX Software Bill of Materials (SBOM)
-
-==== Changed
-
-* Add a compulsory `bnd-baseline-maven-plugin` execution to check for breaking API changes
-* Apply the default `bnd-maven-plugin` configuration to all the plugin's goals
-* Moves `.flattened-pom.xml` to the same directory as `pom.xml` to preserve the relative parent path. This requires adding `.flattened-pom.xml` to the `.gitignore` file of the repository.
-* Update `org.apache.logging.log4j:log4j-changelog-maven-plugin` to version `0.5.0`
-* Update `log4j-changelog` XSD (used for validating changelog entries) to version `0.1.2`
-* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.0` (https://github.com/apache/logging-parent/pull/44[44])
-
-==== Fixed
-
-* Prioritize definitions in `bnd-extra-*` variables over those inherited (https://github.com/apache/logging-parent/issues/39[39])
-* Keep parent in `flatten-bom` configuration (https://github.com/apache/logging-parent/issues/37[37])
-* Remove `build` in `flatten-bom` configuration
-* Fixed the archiving of symbolically linked directories in the `distribution` Maven profile (https://github.com/apache/logging-parent/issues/43[43])
-* Used specific execution IDs in ``defaultGoal``s to avoid running unwanted plugins