Release changelogs for version 10.1.1

apache · Oct 2, 2023 · 3c28aeb · 3c28aeb
1 parent 7893fb5
commit 3c28aeb
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 14 deletions.
diff --git a/src/changelog/10.1.1/.release-notes.adoc.ftl b/src/changelog/10.1.1/.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}</#if>
+
+This patch release contains minor fixes addressing issues blocking the release of `log4j-tools`, `log4j-kotlin`, etc.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.1.1/.release.xml 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/...og/.10.x.x/change_default_module_name.xml → ...log/10.1.1/change_default_module_name.xml b/...og/.10.x.x/change_default_module_name.xml → ...log/10.1.1/change_default_module_name.xml
diff --git a/src/changelog/.10.x.x/checksum_file.xml → src/changelog/10.1.1/checksum_file.xml b/src/changelog/.10.x.x/checksum_file.xml → src/changelog/10.1.1/checksum_file.xml
diff --git a/....10.x.x/fix_bnd_required_module_names.xml → .../10.1.1/fix_bnd_required_module_names.xml b/....10.x.x/fix_bnd_required_module_names.xml → .../10.1.1/fix_bnd_required_module_names.xml
diff --git a/src/changelog/.10.x.x/timestamp.xml → src/changelog/10.1.1/timestamp.xml b/src/changelog/.10.x.x/timestamp.xml → src/changelog/10.1.1/timestamp.xml
diff --git a/...ffplug_spotless_spotless_maven_plugin.xml → ...ffplug_spotless_spotless_maven_plugin.xml b/...ffplug_spotless_spotless_maven_plugin.xml → ...ffplug_spotless_spotless_maven_plugin.xml
diff --git 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
@@ -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.1.1.adoc b/src/site/_release-notes/_10.1.1.adoc
@@ -0,0 +1,56 @@
+////
+    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-1-1]
+=== 10.1.1
+
+Release date:: 2023-10-02
+
+This patch release contains minor fixes addressing issues blocking the release of `log4j-tools`, `log4j-kotlin`, etc.
+
+
+==== Added
+
+* Used `project.build.outputTimestamp` to timestamp generated distribution files
+
+==== 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
@@ -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