Skip to content

Commit 8f12e09

Browse files
committed
Prepare release notes for version 12.1.1
1 parent 27d5c80 commit 8f12e09

39 files changed

+82
-26
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<properties>
146146

147147
<!-- project version -->
148-
<revision>12.1.1-SNAPSHOT</revision>
148+
<revision>12.1.1</revision>
149149

150150
<!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
151151
We actually inherit one from the `org.apache:apache` parent.

src/changelog/.12.x.x/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/.12.x.x/update_fast_xml_parser.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/changelog/10.0.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.1.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.1.1/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.2.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.3.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.4.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.5.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/10.6.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/11.0.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/11.1.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/11.2.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/11.3.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/12.0.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>

src/changelog/12.1.0/.release-notes.adoc.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
3434
////
3535

36-
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
3737
== ${release.version}
3838

3939
<#if release.date?has_content>Release date:: ${release.date}</#if>
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
////
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
////
17+
18+
////
19+
██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
20+
██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
21+
██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
22+
██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
23+
███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
24+
25+
IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
26+
27+
Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
28+
Auto-generation happens during `generate-sources` phase of Maven.
29+
Hence, you must always
30+
31+
1. Find and edit the associated `.release-notes.adoc.ftl`
32+
2. Run `./mvnw generate-sources`
33+
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
34+
////
35+
36+
[${'#release-notes-' + (release.version?replace("[^a-zA-Z0-9]", "-", "r"))}]
37+
== ${release.version}
38+
39+
<#if release.date?has_content>Release date:: ${release.date}</#if>
40+
41+
This patch release addresses a blocker issue with the creation of a release distribution and enhances the reliability of our caching and reproducibility mechanisms.
42+
43+
<#include "../.changelog.adoc.ftl">

src/changelog/12.1.1/.release.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to you under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
<release xmlns="https://logging.apache.org/xml/ns"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
21+
date="2025-06-10" version="12.1.1"/>

src/changelog/.12.x.x/distribution-attachments.xml renamed to src/changelog/12.1.1/distribution-attachments.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
5-
type="changed">
5+
type="fixed">
66
<issue id="400" link="https://github.com/apache/logging-parent/issues/400"/>
77
<description format="asciidoc">Fix staging of binary distribution archive.</description>
88
</entry>

src/changelog/.12.x.x/improve-nodejs-cache.xml renamed to src/changelog/12.1.1/improve-nodejs-cache.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
5-
type="changed">
5+
type="fixed">
66
<issue id="366" link="https://github.com/apache/logging-parent/issues/366"/>
77
<issue id="408" link="https://github.com/apache/logging-parent/pull/408"/>
88
<description format="asciidoc">Improve Node.js caching using `package-lock.json`.</description>

0 commit comments

Comments
 (0)