Skip to content

Commit

Permalink
merge 0.2.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
rgoers committed Oct 31, 2024
2 parents a9bc6b0 + 074f4c6 commit bdd205e
Show file tree
Hide file tree
Showing 26 changed files with 87 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/generate-email.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pag

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

case $1 in
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/deploy-site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
whoami: ${{ github.ref_name }}-site-stg-out
subdir: content/log4j/transform
target-branch: ${{ github.ref_name }}-site-stg-out
install-required: true

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

export-version:
if: github.repository == 'apache/logging-log4j-transform' && startsWith(github.ref_name, 'release/')
Expand Down Expand Up @@ -93,3 +95,4 @@ jobs:
whoami: ${{ github.ref_name }}-site-stg-out
subdir: content/log4j/transform-${{ needs.export-version.outputs.version }}
target-branch: ${{ github.ref_name }}-site-stg-out
install-required: true
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,15 @@
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>

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

</properties>

<!-- `dependencyManagement` must only contain `log4j-transform` modules and nothing else!
Expand Down
43 changes: 43 additions & 0 deletions src/changelog/0.2.0/.release-notes.adoc.ftl
Original file line number Diff line number Diff line change
@@ -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 is the second release of the project.

<#include "../.changelog.adoc.ftl">
21 changes: 21 additions & 0 deletions src/changelog/0.2.0/.release.xml
Original file line number Diff line number Diff line change
@@ -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-10-27" version="0.2.0"/>
9 changes: 9 additions & 0 deletions src/changelog/0.2.0/134_skip_transformer.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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="fixed">
<issue id="134" link="https://github.com/apache/logging-log4j-transform/pull/134"/>
<description format="asciidoc">Instead of throwing an exception, change the transformer to log an
info or warn message when log4j-api is missing or is the wrong version.</description>
</entry>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit bdd205e

Please sign in to comment.