You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/09/08 09:39:57 UTC
[logging-parent] branch main updated (9413122 -> c29b0b4)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
from 9413122 Temporarily disable `enforce-no-snapshots` to enable verification by other repositories
new 21f7432 Update release notes
new 1996cb1 Rename `.yml` files to `.yaml`
new 29e4564 Fix license headers in `*.ftl` files
new c29b0b4 Merge branch 'release/10.0.0'
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yml => .asf.yaml | 0
.github/{dependabot.yml => dependabot.yaml} | 0
.../{build-reusable.yml => build-reusable.yaml} | 0
.github/workflows/{build.yml => build.yaml} | 6 +++---
...ease-reusable.yml => deploy-release-reusable.yaml} | 0
...hot-reusable.yml => deploy-snapshot-reusable.yaml} | 0
README.adoc | 8 ++++----
pom.xml | 19 ++++++++++---------
src/changelog/.10.x.x/.release-notes.md.ftl | 2 +-
src/changelog/.index.md.ftl | 2 +-
src/changelog/10.0.0/.release-notes.md.ftl | 6 +++---
11 files changed, 22 insertions(+), 21 deletions(-)
rename .asf.yml => .asf.yaml (100%)
rename .github/{dependabot.yml => dependabot.yaml} (100%)
rename .github/workflows/{build-reusable.yml => build-reusable.yaml} (100%)
rename .github/workflows/{build.yml => build.yaml} (97%)
rename .github/workflows/{deploy-release-reusable.yml => deploy-release-reusable.yaml} (100%)
rename .github/workflows/{deploy-snapshot-reusable.yml => deploy-snapshot-reusable.yaml} (100%)
[logging-parent] 01/04: Update release notes
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 21f7432db7995cb38685578c107f5a094ce644fd
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 8 09:42:53 2023 +0200
Update release notes
---
src/changelog/10.0.0/.release-notes.md.ftl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/changelog/10.0.0/.release-notes.md.ftl b/src/changelog/10.0.0/.release-notes.md.ftl
index 7a809a3..75333c2 100644
--- a/src/changelog/10.0.0/.release-notes.md.ftl
+++ b/src/changelog/10.0.0/.release-notes.md.ftl
@@ -21,7 +21,7 @@ This minor release contains various improvements that we expect to relieve the l
This is of particular importance while managing and cutting releases from multiple repositories.
See `README.adoc` for the complete list of features and their usage.
-See [this `logging-log4j-tools` GitHub Actions workflow run](https://github.com/apache/logging-log4j-tools/actions/runs/6070379396) demonstrating a successful release cut using a SNAPSHOT version of this `logging-parent` release.
-All preparations (release notes, distribution ZIP, vote & announcement emails, etc.) are staged to both Nexus and SVN and waiting the release manager to proceed.
+See [this `log4j-tools` GitHub Actions workflow run](https://github.com/apache/logging-log4j-tools/actions/runs/6118975687) demonstrating a successful release cut using a SNAPSHOT version of this `logging-parent` release.
+All preparations (release notes, source and binary distributions, vote & announcement emails, etc.) are staged to both Nexus and SVN and waiting the release manager to proceed.
<#include "../.changelog.md.ftl">
[logging-parent] 02/04: Rename `.yml` files to `.yaml`
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 1996cb17ec41cd0ffee19e1be943f5eb06af9dfb
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 8 09:50:34 2023 +0200
Rename `.yml` files to `.yaml`
`.yaml` is the officially recommended YAML extension.
`.asf.yml` is not supported by the INFRA.
---
.asf.yml => .asf.yaml | 0
.github/{dependabot.yml => dependabot.yaml} | 0
.../{build-reusable.yml => build-reusable.yaml} | 0
.github/workflows/{build.yml => build.yaml} | 6 +++---
...ease-reusable.yml => deploy-release-reusable.yaml} | 0
...hot-reusable.yml => deploy-snapshot-reusable.yaml} | 0
README.adoc | 8 ++++----
pom.xml | 19 ++++++++++---------
8 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/.asf.yml b/.asf.yaml
similarity index 100%
rename from .asf.yml
rename to .asf.yaml
diff --git a/.github/dependabot.yml b/.github/dependabot.yaml
similarity index 100%
rename from .github/dependabot.yml
rename to .github/dependabot.yaml
diff --git a/.github/workflows/build-reusable.yml b/.github/workflows/build-reusable.yaml
similarity index 100%
rename from .github/workflows/build-reusable.yml
rename to .github/workflows/build-reusable.yaml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yaml
similarity index 97%
rename from .github/workflows/build.yml
rename to .github/workflows/build.yaml
index c3d2b05..47badab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ permissions: read-all
jobs:
build:
- uses: apache/logging-parent/.github/workflows/build-reusable.yml@main
+ uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
# Write permissions to allow merge of `dependabot` PRs
permissions:
contents: write
@@ -47,13 +47,13 @@ jobs:
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-parent' && github.ref == 'refs/heads/main'
- uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yml@main
+ uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
secrets: inherit
deploy-release:
needs: build
if: github.repository == 'apache/logging-parent' && startsWith(github.ref, 'refs/heads/release/')
- uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yml@main
+ uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
secrets: inherit
# Write permissions to allow the Maven `revision` property update, changelog release, etc.
permissions:
diff --git a/.github/workflows/deploy-release-reusable.yml b/.github/workflows/deploy-release-reusable.yaml
similarity index 100%
rename from .github/workflows/deploy-release-reusable.yml
rename to .github/workflows/deploy-release-reusable.yaml
diff --git a/.github/workflows/deploy-snapshot-reusable.yml b/.github/workflows/deploy-snapshot-reusable.yaml
similarity index 100%
rename from .github/workflows/deploy-snapshot-reusable.yml
rename to .github/workflows/deploy-snapshot-reusable.yaml
diff --git a/README.adoc b/README.adoc
index 666f1d8..fc9bde9 100644
--- a/README.adoc
+++ b/README.adoc
@@ -36,7 +36,7 @@ You can use this project as follows:
.. xref:src/changelog/.1.x.x/.release-notes.md.ftl[] (adapt the folder name to match your project; `.2.x.x`, `.3.x.x`, etc.)
.. xref:src/changelog/.changelog.md.ftl[]
.. xref:src/changelog/.index.md.ftl[]
-.. xref:.github/workflows/build.yml[]
+.. xref:.github/workflows/build.yaml[]
.. xref:.github/generate-email.sh[]
.. xref:LICENSE.txt[]
.. xref:NOTICE.txt[]
@@ -61,15 +61,15 @@ The provided parent POM features the following conveniences:
The provided reusable GitHub Actions workflows feature the following conveniences:
-xref:.github/workflows/build-reusable.yml[`build-reusable.yml`]::
+xref:.github/workflows/build-reusable.yaml[`build-reusable.yml`]::
* Compiles against Java 8 bytecode using the specified Java compiler version
* Verifies reproducibility
* Automatically merges verified `dependabot` PRs
-xref:.github/workflows/deploy-snapshot-reusable.yml[`deploy-snapshot-reusable.yml`]::
+xref:.github/workflows/deploy-snapshot-reusable.yaml[`deploy-snapshot-reusable.yml`]::
* Deploys SNAPSHOT artifacts
-xref:.github/workflows/deploy-release-reusable.yml[`deploy-release-reusable.yml`]::
+xref:.github/workflows/deploy-release-reusable.yaml[`deploy-release-reusable.yml`]::
* Deploys release artifacts
* Generates the release notes
* Generates the distribution ZIP containing Git-tracked sources, release notes, binary attachments, `NOTICE.txt`, etc.
diff --git a/pom.xml b/pom.xml
index b4383db..462e032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<pluginManagement>
<plugins>
- <!-- `artifact:compare` is used in `.github/workflows/build-reusable.yml` -->
+ <!-- `artifact:compare` is used in `.github/workflows/build-reusable.yaml` -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-artifact-plugin</artifactId>
@@ -399,10 +399,11 @@
</formats>
<yaml>
<includes>
- <include>.asf.yml</include>
+ <include>.asf.yaml</include>
+ <include>.github/**/*.yaml</include>
<include>.github/**/*.yml</include>
- <include>src/**/*.yml</include>
<include>src/**/*.yaml</include>
+ <include>src/**/*.yml</include>
</includes>
<licenseHeader>
<!-- https://www.apache.org/legal/src-headers.html#headers -->
@@ -486,7 +487,7 @@
</profile>
<!-- `changelog-export` profile to export changelogs.
- It is manually enabled by `.github/workflows/deploy-release-reusable.yml` to generate release notes. -->
+ It is manually enabled by `.github/workflows/deploy-release-reusable.yaml` to generate release notes. -->
<profile>
<id>changelog-export</id>
<build>
@@ -516,7 +517,7 @@
</profile>
<!-- `changelog-release` profile to move `src/changelog/.?.x.x` contents to their associated release directory.
- It is manually enabled by `.github/workflows/deploy-release-reusable.yml` to generate release notes. -->
+ It is manually enabled by `.github/workflows/deploy-release-reusable.yaml` to generate release notes. -->
<profile>
<id>changelog-release</id>
<build>
@@ -541,7 +542,7 @@
4. Auxiliary support files (`README.adoc`, `LICENSE.txt`, etc.)
This profile must be executed after a successful `package` phase, since we need JARs.
- This profile is manually enabled by `.github/workflows/deploy-release-reusable.yml` while releasing. -->
+ This profile is manually enabled by `.github/workflows/deploy-release-reusable.yaml` while releasing. -->
<profile>
<id>distribution</id>
@@ -574,7 +575,7 @@
</plugin>
<!-- Enforce properties required by the BSH creating the distribution.
- These properties must match the ones in `.github/workflows/deploy-release-reusable.yml`! -->
+ These properties must match the ones in `.github/workflows/deploy-release-reusable.yaml`! -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -720,7 +721,7 @@
</profile>
<!-- `deploy` profile activating deployment-specific configuration.
- It is manually enabled by `.github/workflows/deploy-{snapshot,release}-reusable.yml` while releasing. -->
+ It is manually enabled by `.github/workflows/deploy-{snapshot,release}-reusable.yaml` while releasing. -->
<profile>
<id>deploy</id>
@@ -759,7 +760,7 @@
</profile>
<!-- `release` profile activating release-specific deployment configuration.
- It is manually enabled by `.github/workflows/deploy-release-reusable.yml` while releasing. -->
+ It is manually enabled by `.github/workflows/deploy-release-reusable.yaml` while releasing. -->
<profile>
<id>release</id>
[logging-parent] 03/04: Fix license headers in `*.ftl` files
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 29e4564729222574ca50dff60d1de150cc541538
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 8 11:39:35 2023 +0200
Fix license headers in `*.ftl` files
---
src/changelog/.10.x.x/.release-notes.md.ftl | 2 +-
src/changelog/.index.md.ftl | 2 +-
src/changelog/10.0.0/.release-notes.md.ftl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/changelog/.10.x.x/.release-notes.md.ftl b/src/changelog/.10.x.x/.release-notes.md.ftl
index 7a809a3..731da92 100644
--- a/src/changelog/.10.x.x/.release-notes.md.ftl
+++ b/src/changelog/.10.x.x/.release-notes.md.ftl
@@ -1,4 +1,4 @@
-<!--
+<#--
~ 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.
diff --git a/src/changelog/.index.md.ftl b/src/changelog/.index.md.ftl
index 26e037e..693f1f8 100644
--- a/src/changelog/.index.md.ftl
+++ b/src/changelog/.index.md.ftl
@@ -1,4 +1,4 @@
-<!--
+<#--
~ 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.
diff --git a/src/changelog/10.0.0/.release-notes.md.ftl b/src/changelog/10.0.0/.release-notes.md.ftl
index 75333c2..24aaff6 100644
--- a/src/changelog/10.0.0/.release-notes.md.ftl
+++ b/src/changelog/10.0.0/.release-notes.md.ftl
@@ -1,4 +1,4 @@
-<!--
+<#--
~ 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.
[logging-parent] 04/04: Merge branch 'release/10.0.0'
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit c29b0b4a89a687854dd5a46bc3f932dfe000bac5
Merge: 9413122 29e4564
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 8 11:40:15 2023 +0200
Merge branch 'release/10.0.0'
.asf.yml => .asf.yaml | 0
.github/{dependabot.yml => dependabot.yaml} | 0
.../{build-reusable.yml => build-reusable.yaml} | 0
.github/workflows/{build.yml => build.yaml} | 6 +++---
...ease-reusable.yml => deploy-release-reusable.yaml} | 0
...hot-reusable.yml => deploy-snapshot-reusable.yaml} | 0
README.adoc | 8 ++++----
pom.xml | 19 ++++++++++---------
src/changelog/.10.x.x/.release-notes.md.ftl | 2 +-
src/changelog/.index.md.ftl | 2 +-
src/changelog/10.0.0/.release-notes.md.ftl | 6 +++---
11 files changed, 22 insertions(+), 21 deletions(-)