Skip to content

Commit bdd205e

Browse files
committed
merge 0.2.0 release
2 parents a9bc6b0 + 074f4c6 commit bdd205e

26 files changed

+87
-2
lines changed

.github/generate-email.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pag
5454

5555
dump_release_notes() {
5656
awk "f{print} /^Release date::/{f=1}" "$RELEASE_NOTES_FILE" \
57-
| sed -r -e 's|'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]|#\2|g
58-
s|https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]|\5|g'
57+
| sed -r -e 's!'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]!#\2!g
58+
s!https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]!\5!g'
5959
}
6060

6161
case $1 in

.github/workflows/deploy-site.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
whoami: ${{ github.ref_name }}-site-stg-out
4848
subdir: content/log4j/transform
4949
target-branch: ${{ github.ref_name }}-site-stg-out
50+
install-required: true
5051

5152
deploy-site-pro:
5253
if: github.repository == 'apache/logging-log4j-transform' && github.ref_name == 'main-site-pro'
@@ -64,6 +65,7 @@ jobs:
6465
whoami: ${{ github.ref_name }}-out
6566
subdir: content/log4j/transform
6667
target-branch: ${{ github.ref_name }}-out
68+
install-required: true
6769

6870
export-version:
6971
if: github.repository == 'apache/logging-log4j-transform' && startsWith(github.ref_name, 'release/')
@@ -93,3 +95,4 @@ jobs:
9395
whoami: ${{ github.ref_name }}-site-stg-out
9496
subdir: content/log4j/transform-${{ needs.export-version.outputs.version }}
9597
target-branch: ${{ github.ref_name }}-site-stg-out
98+
install-required: true

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@
110110
<maven.site.skip>true</maven.site.skip>
111111
<maven.site.deploy.skip>true</maven.site.deploy.skip>
112112

113+
<!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
114+
We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.
115+
Though inheriting this property has two undesired consequences:
116+
1. `artifact:compare` dumps an `ERROR` log stating that this `property should not be inherited but defined` (apache/logging-parent#50)
117+
2. This value is employed in various places while creating the distribution
118+
To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
119+
Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
120+
<project.build.outputTimestamp>2024-10-27T05:39:02Z</project.build.outputTimestamp>
121+
113122
</properties>
114123

115124
<!-- `dependencyManagement` must only contain `log4j-transform` modules and nothing else!
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 is the second release of the project.
42+
43+
<#include "../.changelog.adoc.ftl">

src/changelog/0.2.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="2024-10-27" version="0.2.0"/>
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+
<issue id="134" link="https://github.com/apache/logging-log4j-transform/pull/134"/>
7+
<description format="asciidoc">Instead of throwing an exception, change the transformer to log an
8+
info or warn message when log4j-api is missing or is the wrong version.</description>
9+
</entry>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)