This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release/10.6.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/release/10.6.0 by this push:
new caa9879 Release changelog for version `10.6.0`
caa9879 is described below
commit caa98791577a87a687f6369de785c470abdb781f
Author: ASF Logging Services RM <[email protected]>
AuthorDate: Thu Jan 11 10:06:25 2024 +0000
Release changelog for version `10.6.0`
---
.../10.6.0/.release-notes.adoc.ftl} | 16 ++++------------
src/changelog/10.6.0/.release.xml | 21 +++++++++++++++++++++
src/changelog/{.10.x.x => 10.6.0}/add_jspecify.xml | 0
.../{.10.x.x => 10.6.0}/ban_wildcard_imports.xml | 0
.../change_dependabot_workflow.xml | 0
.../disable_jpms_multi_release.xml | 0
.../remove-module-info-pre-compile.xml | 0
...pdate_com_google_errorprone_error_prone_core.xml | 0
.../update_github_codeql_action.xml | 0
.../update_org_apache_rat_apache_rat_plugin.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
.../_release-notes/{_10.x.x.adoc => _10.6.0.adoc} | 14 +++++++++++---
src/site/_release-notes/_10.x.x.adoc | 9 ---------
14 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/changelog/10.6.0/.release-notes.adoc.ftl
similarity index 83%
copy from src/site/_release-notes/_10.x.x.adoc
copy to src/changelog/10.6.0/.release-notes.adoc.ftl
index ebd81eb..b220984 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/changelog/10.6.0/.release-notes.adoc.ftl
@@ -33,19 +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 minor release contains several small improvements.
-
-==== Changed
-
-* Merge Dependabot PRs instead of closing them.
(https://github.com/apache/logging-parent/pull/82[82])
-
-==== Updated
-
-* Update `com.google.errorprone:error_prone_core` to version `2.24.1`
(https://github.com/apache/logging-parent/pull/89[89])
-* Update `github/codeql-action` to version `3.23.0`
(https://github.com/apache/logging-parent/pull/91[91])
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.6.0/.release.xml
b/src/changelog/10.6.0/.release.xml
new file mode 100644
index 0000000..5afd6ae
--- /dev/null
+++ b/src/changelog/10.6.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.3.xsd";
+ date="2024-01-11" version="10.6.0"/>
diff --git a/src/changelog/.10.x.x/add_jspecify.xml
b/src/changelog/10.6.0/add_jspecify.xml
similarity index 100%
rename from src/changelog/.10.x.x/add_jspecify.xml
rename to src/changelog/10.6.0/add_jspecify.xml
diff --git a/src/changelog/.10.x.x/ban_wildcard_imports.xml
b/src/changelog/10.6.0/ban_wildcard_imports.xml
similarity index 100%
rename from src/changelog/.10.x.x/ban_wildcard_imports.xml
rename to src/changelog/10.6.0/ban_wildcard_imports.xml
diff --git a/src/changelog/.10.x.x/change_dependabot_workflow.xml
b/src/changelog/10.6.0/change_dependabot_workflow.xml
similarity index 100%
rename from src/changelog/.10.x.x/change_dependabot_workflow.xml
rename to src/changelog/10.6.0/change_dependabot_workflow.xml
diff --git a/src/changelog/.10.x.x/disable_jpms_multi_release.xml
b/src/changelog/10.6.0/disable_jpms_multi_release.xml
similarity index 100%
rename from src/changelog/.10.x.x/disable_jpms_multi_release.xml
rename to src/changelog/10.6.0/disable_jpms_multi_release.xml
diff --git a/src/changelog/.10.x.x/remove-module-info-pre-compile.xml
b/src/changelog/10.6.0/remove-module-info-pre-compile.xml
similarity index 100%
rename from src/changelog/.10.x.x/remove-module-info-pre-compile.xml
rename to src/changelog/10.6.0/remove-module-info-pre-compile.xml
diff --git
a/src/changelog/.10.x.x/update_com_google_errorprone_error_prone_core.xml
b/src/changelog/10.6.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.6.0/update_com_google_errorprone_error_prone_core.xml
diff --git a/src/changelog/.10.x.x/update_github_codeql_action.xml
b/src/changelog/10.6.0/update_github_codeql_action.xml
similarity index 100%
rename from src/changelog/.10.x.x/update_github_codeql_action.xml
rename to src/changelog/10.6.0/update_github_codeql_action.xml
diff --git a/src/changelog/.10.x.x/update_org_apache_rat_apache_rat_plugin.xml
b/src/changelog/10.6.0/update_org_apache_rat_apache_rat_plugin.xml
similarity index 100%
rename from src/changelog/.10.x.x/update_org_apache_rat_apache_rat_plugin.xml
rename to src/changelog/10.6.0/update_org_apache_rat_apache_rat_plugin.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index 10c7a73..fce9676 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.6.0-SNAPSHOT
+:project-version: 10.6.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 07ff819..33d2420 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.6.0.adoc[]
include::_release-notes/_10.5.0.adoc[]
include::_release-notes/_10.4.0.adoc[]
include::_release-notes/_10.3.0.adoc[]
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.6.0.adoc
similarity index 76%
copy from src/site/_release-notes/_10.x.x.adoc
copy to src/site/_release-notes/_10.6.0.adoc
index ebd81eb..73ac69c 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.6.0.adoc
@@ -33,19 +33,27 @@
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-6-0]
+=== 10.6.0
+Release date:: 2024-01-11
This minor release contains several small improvements.
+==== Added
+
+* Add JSpecify to dependency management.
(https://github.com/apache/logging-parent/pull/88[88])
+* Add enforcer rule to ban wildcard imports. All imports must be expanded to
provide better comparison of branches.
(https://github.com/apache/logging-parent/pull/63[63])
+
==== Changed
* Merge Dependabot PRs instead of closing them.
(https://github.com/apache/logging-parent/pull/82[82])
+* Disable
https://bnd.bndtools.org/instructions/jpms-multi-release.html[`-jpms-multi-release`]
BND option. (https://github.com/apache/logging-parent/pull/93[93])
+* Clean up residual `module-info.class` before compilation.
(https://github.com/apache/logging-parent/pull/90[90])
==== Updated
* Update `com.google.errorprone:error_prone_core` to version `2.24.1`
(https://github.com/apache/logging-parent/pull/89[89])
* Update `github/codeql-action` to version `3.23.0`
(https://github.com/apache/logging-parent/pull/91[91])
+* Update `org.apache.rat:apache-rat-plugin` to version `0.16`
(https://github.com/apache/logging-parent/pull/92[92])
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index ebd81eb..8f67449 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -40,12 +40,3 @@
This minor release contains several small improvements.
-
-==== Changed
-
-* Merge Dependabot PRs instead of closing them.
(https://github.com/apache/logging-parent/pull/82[82])
-
-==== Updated
-
-* Update `com.google.errorprone:error_prone_core` to version `2.24.1`
(https://github.com/apache/logging-parent/pull/89[89])
-* Update `github/codeql-action` to version `3.23.0`
(https://github.com/apache/logging-parent/pull/91[91])
