Skip to content

Commit e9e2fa2

Browse files
committed
Prepare release notes for 12.1.0
1 parent 63dbd70 commit e9e2fa2

22 files changed

+82
-6
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<properties>
146146

147147
<!-- project version -->
148-
<revision>12.1.0-SNAPSHOT</revision>
148+
<revision>12.1.0</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.
@@ -154,7 +154,7 @@
154154
2. This value is employed in various places while creating the distribution
155155
To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
156156
Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
157-
<project.build.outputTimestamp>2025-02-07T19:59:33Z</project.build.outputTimestamp>
157+
<project.build.outputTimestamp>2025-04-01T15:07:19Z</project.build.outputTimestamp>
158158

159159
<!-- target Java 8 -->
160160
<maven.compiler.source>8</maven.compiler.source>
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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 minor release adds CodeQL checks for GitHub Actions.
42+
It also fixes a breaking change in Error Prone that prevented projects from migrating to version `12.0.0`.
43+
44+
<#include "../.changelog.adoc.ftl">

src/changelog/12.1.0/.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-04-01" version="12.1.0"/>

src/changelog/.12.x.x/codeql_for_gha.xml renamed to src/changelog/12.1.0/codeql_for_gha.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
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="added">
66
<description format="asciidoc">Add "GitHub Actions" to the list of languages analyzed by CodeQL.</description>
77
</entry>

src/changelog/.12.x.x/fix_deployment.xml renamed to src/changelog/12.1.0/fix_deployment.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
55
type="fixed">
66
<issue id="360" link="https://github.com/apache/logging-parent/pull/360"/>
7-
<description format="asciidoc">Use the `maven.deploy.skip` Maven property in `nexus-staging-maven-plugin`.
8-
This effectively fixes the skipping of test artifacts' deployments.</description>
7+
<description format="asciidoc">
8+
Use the `maven.deploy.skip` Maven property in `nexus-staging-maven-plugin`.
9+
This effectively fixes the skipping of test artifacts' deployments.
10+
</description>
911
</entry>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
5+
type="fixed">
6+
<description format="asciidoc">
7+
Fix Error Prone arguments breaking `maven-compiler-plugin:compile`.
8+
</description>
9+
</entry>

src/changelog/.12.x.x/fix_url_inheritance.xml renamed to src/changelog/12.1.0/fix_url_inheritance.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
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
<description format="asciidoc">Fix inheritance of `url` elements in children POMs.</description>
77
</entry>

0 commit comments

Comments
 (0)