This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.1.1 in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 3c28aeba7d19be40b512df2be8e81d80f9a7cd11 Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Oct 2 10:52:55 2023 +0200 Release changelogs for version `10.1.1` --- .../10.1.1/.release-notes.adoc.ftl} | 21 +++++---------------- src/changelog/10.1.1/.release.xml | 21 +++++++++++++++++++++ .../change_default_module_name.xml | 0 src/changelog/{.10.x.x => 10.1.1}/checksum_file.xml | 0 .../fix_bnd_required_module_names.xml | 0 src/changelog/{.10.x.x => 10.1.1}/timestamp.xml | 0 ..._com_diffplug_spotless_spotless_maven_plugin.xml | 0 src/site/_constants.adoc | 2 +- src/site/_release-notes.adoc | 2 +- .../_release-notes/{_10.x.x.adoc => _10.1.1.adoc} | 10 ++++++---- src/site/_release-notes/_10.x.x.adoc | 12 ------------ 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/changelog/10.1.1/.release-notes.adoc.ftl similarity index 85% copy from src/site/_release-notes/_10.x.x.adoc copy to src/changelog/10.1.1/.release-notes.adoc.ftl index 94e18d8..247be1e 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/changelog/10.1.1/.release-notes.adoc.ftl @@ -33,22 +33,11 @@ 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc` //// -[#release-notes-10-x-x] -=== 10.x.x +[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}] +=== ${release.version} +<#if release.date?has_content>Release date:: ${release.date}</#if> +This patch release contains minor fixes addressing issues blocking the release of `log4j-tools`, `log4j-kotlin`, etc. -This minor release contains several small improvements. - - -==== Added - -* Used `project.build.outputTimestamp` to timestamp generated distribution files - -==== Changed - -* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.40.0` - -==== Fixed - -* Fixed checksum (i.e., `*.sha512`) file format +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/10.1.1/.release.xml b/src/changelog/10.1.1/.release.xml new file mode 100644 index 0000000..ae2110d --- /dev/null +++ b/src/changelog/10.1.1/.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.0.xsd"; + date="2023-10-02" version="10.1.1"/> diff --git a/src/changelog/.10.x.x/change_default_module_name.xml b/src/changelog/10.1.1/change_default_module_name.xml similarity index 100% rename from src/changelog/.10.x.x/change_default_module_name.xml rename to src/changelog/10.1.1/change_default_module_name.xml diff --git a/src/changelog/.10.x.x/checksum_file.xml b/src/changelog/10.1.1/checksum_file.xml similarity index 100% rename from src/changelog/.10.x.x/checksum_file.xml rename to src/changelog/10.1.1/checksum_file.xml diff --git a/src/changelog/.10.x.x/fix_bnd_required_module_names.xml b/src/changelog/10.1.1/fix_bnd_required_module_names.xml similarity index 100% rename from src/changelog/.10.x.x/fix_bnd_required_module_names.xml rename to src/changelog/10.1.1/fix_bnd_required_module_names.xml diff --git a/src/changelog/.10.x.x/timestamp.xml b/src/changelog/10.1.1/timestamp.xml similarity index 100% rename from src/changelog/.10.x.x/timestamp.xml rename to src/changelog/10.1.1/timestamp.xml diff --git a/src/changelog/.10.x.x/update_com_diffplug_spotless_spotless_maven_plugin.xml b/src/changelog/10.1.1/update_com_diffplug_spotless_spotless_maven_plugin.xml similarity index 100% rename from src/changelog/.10.x.x/update_com_diffplug_spotless_spotless_maven_plugin.xml rename to src/changelog/10.1.1/update_com_diffplug_spotless_spotless_maven_plugin.xml diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc index 88f1fe8..ab6fa85 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.2.0-SNAPSHOT +:project-version: 10.1.1 :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 cfa1794..145697d 100644 --- a/src/site/_release-notes.adoc +++ b/src/site/_release-notes.adoc @@ -36,6 +36,6 @@ [#release-notes] == Release Notes -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[] diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.1.1.adoc similarity index 86% copy from src/site/_release-notes/_10.x.x.adoc copy to src/site/_release-notes/_10.1.1.adoc index 94e18d8..e67e23b 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.1.1.adoc @@ -33,12 +33,12 @@ 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-1-1] +=== 10.1.1 +Release date:: 2023-10-02 - -This minor release contains several small improvements. +This patch release contains minor fixes addressing issues blocking the release of `log4j-tools`, `log4j-kotlin`, etc. ==== Added @@ -47,8 +47,10 @@ This minor release contains several small improvements. ==== Changed +* Changes the default OSGi and module name to use full stops `.` instead of non-alphanumeric characters * Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.40.0` ==== Fixed * Fixed checksum (i.e., `*.sha512`) file format +* Fix BND module name detection on multi-release JARs diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index 94e18d8..8f67449 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -40,15 +40,3 @@ This minor release contains several small improvements. - -==== Added - -* Used `project.build.outputTimestamp` to timestamp generated distribution files - -==== Changed - -* Update `com.diffplug.spotless:spotless-maven-plugin` to version `2.40.0` - -==== Fixed - -* Fixed checksum (i.e., `*.sha512`) file format
