This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/11.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 070e3fb5ce67c57e6f5906dac59d21ff39420206
Author: Volkan Yazıcı <vol...@yazi.ci>
AuthorDate: Wed May 15 14:54:21 2024 +0200
Prepare for version `11.1.0` release
---
pom.xml | 2 +-
src/changelog/.11.x.x/update_actions_checkout.xml | 8 ----
.../.11.x.x/update_actions_upload_artifact.xml | 8 ----
.../.11.x.x/update_dependabot_fetch_metadata.xml | 8 ----
.../.11.x.x/update_github_codeql_action.xml | 8 ----
.../.11.x.x/update_ossf_scorecard_action.xml | 8 ----
src/changelog/11.1.0/.release-notes.adoc.ftl | 43 ++++++++++++++++++++++
src/changelog/11.1.0/.release.xml | 21 +++++++++++
.../remove_java_architecture_packaging.xml | 0
...te_com_github_spotbugs_spotbugs_annotations.xml | 0
...e_com_github_spotbugs_spotbugs_maven_plugin.xml | 0
...date_com_google_errorprone_error_prone_core.xml | 0
...om_h3xstream_findsecbugs_findsecbugs_plugin.xml | 0
...om_palantir_javaformat_palantir_java_format.xml | 0
.../update_org_apache_apache.xml | 0
..._logging_log4j_log4j_changelog_maven_plugin.xml | 0
src/changelog/{.11.x.x => 11.1.0}/zulu.xml | 0
17 files changed, 65 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7515836..bad20f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
<properties>
<!-- project version -->
- <revision>11.1.0-SNAPSHOT</revision>
+ <revision>11.1.0</revision>
<!-- `project.build.outputTimestamp` is required to be present for
reproducible builds.
We actually inherit one from the `org.apache:apache` parent.
diff --git a/src/changelog/.11.x.x/update_actions_checkout.xml
b/src/changelog/.11.x.x/update_actions_checkout.xml
deleted file mode 100644
index e51641e..0000000
--- a/src/changelog/.11.x.x/update_actions_checkout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="https://logging.apache.org/xml/ns";
- xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="updated">
- <issue id="176" link="https://github.com/apache/logging-parent/pull/176"/>
- <description format="asciidoc">Update `actions/checkout` to version
`4.1.5`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_actions_upload_artifact.xml
b/src/changelog/.11.x.x/update_actions_upload_artifact.xml
deleted file mode 100644
index 51fbce4..0000000
--- a/src/changelog/.11.x.x/update_actions_upload_artifact.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="https://logging.apache.org/xml/ns";
- xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="updated">
- <issue id="164" link="https://github.com/apache/logging-parent/pull/164"/>
- <description format="asciidoc">Update `actions/upload-artifact` to version
`4.3.3`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml
b/src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml
deleted file mode 100644
index 3cb088b..0000000
--- a/src/changelog/.11.x.x/update_dependabot_fetch_metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="https://logging.apache.org/xml/ns";
- xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="updated">
- <issue id="166" link="https://github.com/apache/logging-parent/pull/166"/>
- <description format="asciidoc">Update `dependabot/fetch-metadata` to version
`2.1.0`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_github_codeql_action.xml
b/src/changelog/.11.x.x/update_github_codeql_action.xml
deleted file mode 100644
index fbcd84f..0000000
--- a/src/changelog/.11.x.x/update_github_codeql_action.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="https://logging.apache.org/xml/ns";
- xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="updated">
- <issue id="179" link="https://github.com/apache/logging-parent/pull/179"/>
- <description format="asciidoc">Update `github/codeql-action` to version
`3.25.5`</description>
-</entry>
diff --git a/src/changelog/.11.x.x/update_ossf_scorecard_action.xml
b/src/changelog/.11.x.x/update_ossf_scorecard_action.xml
deleted file mode 100644
index a89c882..0000000
--- a/src/changelog/.11.x.x/update_ossf_scorecard_action.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="https://logging.apache.org/xml/ns";
- xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="updated">
- <issue id="178" link="https://github.com/apache/logging-parent/pull/178"/>
- <description format="asciidoc">Update `ossf/scorecard-action` to version
`2.3.3`</description>
-</entry>
diff --git a/src/changelog/11.1.0/.release-notes.adoc.ftl
b/src/changelog/11.1.0/.release-notes.adoc.ftl
new file mode 100644
index 0000000..35aeffb
--- /dev/null
+++ b/src/changelog/11.1.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 small improvements and some dependency updates.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/11.1.0/.release.xml
b/src/changelog/11.1.0/.release.xml
new file mode 100644
index 0000000..7ceb3a8
--- /dev/null
+++ b/src/changelog/11.1.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="https://logging.apache.org/xml/ns";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
+ date="2024-05-15" version="11.1.0"/>
diff --git a/src/changelog/.11.x.x/remove_java_architecture_packaging.xml
b/src/changelog/11.1.0/remove_java_architecture_packaging.xml
similarity index 100%
rename from src/changelog/.11.x.x/remove_java_architecture_packaging.xml
rename to src/changelog/11.1.0/remove_java_architecture_packaging.xml
diff --git
a/src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
b/src/changelog/11.1.0/update_com_github_spotbugs_spotbugs_annotations.xml
similarity index 100%
rename from
src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
rename to
src/changelog/11.1.0/update_com_github_spotbugs_spotbugs_annotations.xml
diff --git
a/src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml
b/src/changelog/11.1.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml
similarity index 100%
rename from
src/changelog/.11.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml
rename to
src/changelog/11.1.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml
diff --git
a/src/changelog/.11.x.x/update_com_google_errorprone_error_prone_core.xml
b/src/changelog/11.1.0/update_com_google_errorprone_error_prone_core.xml
similarity index 100%
rename from
src/changelog/.11.x.x/update_com_google_errorprone_error_prone_core.xml
rename to src/changelog/11.1.0/update_com_google_errorprone_error_prone_core.xml
diff --git
a/src/changelog/.11.x.x/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
b/src/changelog/11.1.0/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
similarity index 100%
rename from
src/changelog/.11.x.x/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
rename to
src/changelog/11.1.0/update_com_h3xstream_findsecbugs_findsecbugs_plugin.xml
diff --git
a/src/changelog/.11.x.x/update_com_palantir_javaformat_palantir_java_format.xml
b/src/changelog/11.1.0/update_com_palantir_javaformat_palantir_java_format.xml
similarity index 100%
rename from
src/changelog/.11.x.x/update_com_palantir_javaformat_palantir_java_format.xml
rename to
src/changelog/11.1.0/update_com_palantir_javaformat_palantir_java_format.xml
diff --git a/src/changelog/.11.x.x/update_org_apache_apache.xml
b/src/changelog/11.1.0/update_org_apache_apache.xml
similarity index 100%
rename from src/changelog/.11.x.x/update_org_apache_apache.xml
rename to src/changelog/11.1.0/update_org_apache_apache.xml
diff --git
a/src/changelog/.11.x.x/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
b/src/changelog/11.1.0/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
similarity index 100%
rename from
src/changelog/.11.x.x/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
rename to
src/changelog/11.1.0/update_org_apache_logging_log4j_log4j_changelog_maven_plugin.xml
diff --git a/src/changelog/.11.x.x/zulu.xml b/src/changelog/11.1.0/zulu.xml
similarity index 100%
rename from src/changelog/.11.x.x/zulu.xml
rename to src/changelog/11.1.0/zulu.xml
