Release changelog for version 10.6.0

apache · Jan 11, 2024 · caa9879 · caa9879
1 parent 03830b6
commit caa9879
Show file tree

Hide file tree

Showing 14 changed files with 125 additions and 11 deletions.
diff --git a/src/changelog/10.6.0/.release-notes.adoc.ftl b/src/changelog/10.6.0/.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 minor release contains several small improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.6.0/.release.xml 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 → src/changelog/10.6.0/add_jspecify.xml b/src/changelog/.10.x.x/add_jspecify.xml → src/changelog/10.6.0/add_jspecify.xml
diff --git a/...hangelog/.10.x.x/ban_wildcard_imports.xml → ...changelog/10.6.0/ban_wildcard_imports.xml b/...hangelog/.10.x.x/ban_wildcard_imports.xml → ...changelog/10.6.0/ban_wildcard_imports.xml
diff --git a/...og/.10.x.x/change_dependabot_workflow.xml → ...log/10.6.0/change_dependabot_workflow.xml b/...og/.10.x.x/change_dependabot_workflow.xml → ...log/10.6.0/change_dependabot_workflow.xml
diff --git a/...og/.10.x.x/disable_jpms_multi_release.xml → ...log/10.6.0/disable_jpms_multi_release.xml b/...og/.10.x.x/disable_jpms_multi_release.xml → ...log/10.6.0/disable_jpms_multi_release.xml
diff --git a/...10.x.x/remove-module-info-pre-compile.xml → ...10.6.0/remove-module-info-pre-compile.xml b/...10.x.x/remove-module-info-pre-compile.xml → ...10.6.0/remove-module-info-pre-compile.xml
diff --git a/...om_google_errorprone_error_prone_core.xml → ...om_google_errorprone_error_prone_core.xml b/...om_google_errorprone_error_prone_core.xml → ...om_google_errorprone_error_prone_core.xml
diff --git a/...g/.10.x.x/update_github_codeql_action.xml → ...og/10.6.0/update_github_codeql_action.xml b/...g/.10.x.x/update_github_codeql_action.xml → ...og/10.6.0/update_github_codeql_action.xml
diff --git a/...date_org_apache_rat_apache_rat_plugin.xml → ...date_org_apache_rat_apache_rat_plugin.xml b/...date_org_apache_rat_apache_rat_plugin.xml → ...date_org_apache_rat_apache_rat_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.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
@@ -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.6.0.adoc b/src/site/_release-notes/_10.6.0.adoc
@@ -0,0 +1,59 @@
+////
+    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-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
@@ -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])