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/25 14:58:56 UTC
[logging-parent] branch release/10.3.0 updated: Release changelog for version `10.3.0`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release/10.3.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/release/10.3.0 by this push:
new d5a36f2 Release changelog for version `10.3.0`
d5a36f2 is described below
commit d5a36f2d5326b5f14b45ac0c46e30ceb50283c83
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Wed Oct 25 14:58:50 2023 +0000
Release changelog for version `10.3.0`
---
.../10.3.0/.release-notes.adoc.ftl} | 24 +++++++++++-----------
src/changelog/10.3.0/.release.xml | 21 +++++++++++++++++++
.../{.10.x.x => 10.3.0}/add-bnd-extra-config.xml | 0
.../auto-derive-dist-attachments.xml | 0
.../{.10.x.x => 10.3.0}/fail-bnd-on-api-leak.xml | 0
.../fix-changelog-validation.xml | 0
.../{.10.x.x => 10.3.0}/fix-flatten-clean.xml | 0
...date_com_google_errorprone_error_prone_core.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
.../_release-notes/{_10.x.x.adoc => _10.3.0.adoc} | 6 +++---
src/site/_release-notes/_10.x.x.adoc | 15 --------------
12 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/site/_release-notes.adoc b/src/changelog/10.3.0/.release-notes.adoc.ftl
similarity index 71%
copy from src/site/_release-notes.adoc
copy to src/changelog/10.3.0/.release-notes.adoc.ftl
index ac72a8e..b220984 100644
--- a/src/site/_release-notes.adoc
+++ b/src/changelog/10.3.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,22 +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.2.0.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.3.0/.release.xml b/src/changelog/10.3.0/.release.xml
new file mode 100644
index 0000000..77065b5
--- /dev/null
+++ b/src/changelog/10.3.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-25" version="10.3.0"/>
diff --git a/src/changelog/.10.x.x/add-bnd-extra-config.xml b/src/changelog/10.3.0/add-bnd-extra-config.xml
similarity index 100%
rename from src/changelog/.10.x.x/add-bnd-extra-config.xml
rename to src/changelog/10.3.0/add-bnd-extra-config.xml
diff --git a/src/changelog/.10.x.x/auto-derive-dist-attachments.xml b/src/changelog/10.3.0/auto-derive-dist-attachments.xml
similarity index 100%
rename from src/changelog/.10.x.x/auto-derive-dist-attachments.xml
rename to src/changelog/10.3.0/auto-derive-dist-attachments.xml
diff --git a/src/changelog/.10.x.x/fail-bnd-on-api-leak.xml b/src/changelog/10.3.0/fail-bnd-on-api-leak.xml
similarity index 100%
rename from src/changelog/.10.x.x/fail-bnd-on-api-leak.xml
rename to src/changelog/10.3.0/fail-bnd-on-api-leak.xml
diff --git a/src/changelog/.10.x.x/fix-changelog-validation.xml b/src/changelog/10.3.0/fix-changelog-validation.xml
similarity index 100%
rename from src/changelog/.10.x.x/fix-changelog-validation.xml
rename to src/changelog/10.3.0/fix-changelog-validation.xml
diff --git a/src/changelog/.10.x.x/fix-flatten-clean.xml b/src/changelog/10.3.0/fix-flatten-clean.xml
similarity index 100%
rename from src/changelog/.10.x.x/fix-flatten-clean.xml
rename to src/changelog/10.3.0/fix-flatten-clean.xml
diff --git a/src/changelog/.10.x.x/update_com_google_errorprone_error_prone_core.xml b/src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml
similarity index 100%
rename from src/changelog/.10.x.x/update_com_google_errorprone_error_prone_core.xml
rename to src/changelog/10.3.0/update_com_google_errorprone_error_prone_core.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index 2c96ee7..e3f1690 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
////
:project-github-url: https://github.com/apache/logging-parent
-:project-version: 10.3.0-SNAPSHOT
+:project-version: 10.3.0
:project-name: Logging Parent
:project-id: logging-parent
:java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index ac72a8e..15db8c0 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.3.0.adoc[]
include::_release-notes/_10.2.0.adoc[]
include::_release-notes/_10.1.1.adoc[]
include::_release-notes/_10.1.0.adoc[]
diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.3.0.adoc
similarity index 97%
copy from src/site/_release-notes/_10.x.x.adoc
copy to src/site/_release-notes/_10.3.0.adoc
index e4d3825..2cc6ba8 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.3.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-3-0]
+=== 10.3.0
+Release date:: 2023-10-25
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 e4d3825..8f67449 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -40,18 +40,3 @@
This minor release contains several small improvements.
-
-==== Added
-
-* Add support to extend the `bnd-maven-plugin` configuration with `bnd-extra-config` property (https://github.com/apache/logging-log4j2/issues/1895[apache/logging-log4j2#1895])
-
-==== Changed
-
-* `deploy-release-reusable.yaml` is improved to automatically derive deployed artifacts as attachments. This renders both `distribution-attachment-filepath-pattern` and `distribution-attachment-count` input arguments redundant for almost all cases.
-* Convert `bnd-maven-plugin` API leakage warnings to errors (https://github.com/apache/logging-log4j2/issues/1895[apache/logging-log4j2#1895])
-* Update `com.google.errorprone:error_prone_core` to version `2.23.0` (https://github.com/apache/logging-parent/pull/49[49])
-
-==== Fixed
-
-* Fix broken changelog entry validation
-* Attach `flatten:clean` to `clean` phase