This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch updateInfra in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
commit 1cfe5511a3878db230f8b80b6b076eba3681f405 Author: Volkan Yazıcı <[email protected]> AuthorDate: Sun Apr 12 08:30:42 2026 +0200 Update `logging-parent` to version `12.1.1` and improve CI --- .github/dependabot.yaml | 19 +++++++++++---- .github/pull_request_template.md | 7 +++--- .github/workflows/build.yaml | 6 ++--- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-site.yaml | 7 +++--- .github/workflows/merge-dependabot.yaml | 42 --------------------------------- 6 files changed, 25 insertions(+), 58 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 2badbe1..9865655 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -28,8 +28,11 @@ updates: - package-ecosystem: maven directory: "/" schedule: - interval: daily - open-pull-requests-limit: 10 + interval: monthly + groups: + dependencies: + patterns: [ "*" ] + target-branch: "main" registries: - maven-central ignore: @@ -43,9 +46,17 @@ updates: - package-ecosystem: github-actions directory: "/" schedule: - interval: weekly + interval: monthly + groups: + dependencies: + patterns: [ "*" ] + target-branch: "main" - package-ecosystem: npm directory: "/" schedule: - interval: daily + interval: monthly + groups: + dependencies: + patterns: [ "*" ] + target-branch: "main" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a2f5032..2960ccf 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,7 @@ -[A clear and concise description of what the pull request is for along with a reference to the associated issue IDs, if they exist.] +**INSERT HERE** a clear and concise description of what the pull request is for along with a reference to the associated issue IDs, if they exist. ## Checklist * `./mvnw verify` succeeds (if it fails due to code formatting issues reported by Spotless, simply run `spotless:apply`, and retry) -* Changelog entry file in `src/changelog/.0.x.x` folder -* Tests for the changes are provided -* [Commits are signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) (optional, but highly recommended) +* Non-trivial changes contain an entry file in the `src/changelog/.0.x.x` directory +* Tests are provided diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2a36fdf..d8b4240 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,14 +38,14 @@ jobs: build: if: github.actor != 'dependabot[bot]' - uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0 + uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1 with: site-enabled: true deploy-snapshot: needs: build if: github.repository == 'apache/logging-log4j-tools' && github.ref_name == 'main' - uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.0 + uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.1 # Secrets for deployments secrets: NEXUS_USERNAME: ${{ secrets.NEXUS_USER }} @@ -54,7 +54,7 @@ jobs: deploy-release: needs: build if: github.repository == 'apache/logging-log4j-tools' && startsWith(github.ref_name, 'release/') - uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.0 + uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.1 # Secrets for deployments secrets: GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 72c2542..d2393d6 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -31,7 +31,7 @@ permissions: read-all jobs: analyze: - uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.0.0 + uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1 # Permissions required to publish Security Alerts permissions: actions: read diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml index 652f361..bd01476 100644 --- a/.github/workflows/deploy-site.yaml +++ b/.github/workflows/deploy-site.yaml @@ -33,7 +33,7 @@ jobs: deploy-site-stg: if: github.repository == 'apache/logging-log4j-tools' && github.ref_name == 'main' - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.0 + uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1 # Secrets for committing the generated site secrets: GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} @@ -51,7 +51,7 @@ jobs: deploy-site-pro: if: github.repository == 'apache/logging-log4j-tools' && github.ref_name == 'main-site-pro' - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.0 + uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1 # Secrets for committing the generated site secrets: GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} @@ -61,7 +61,6 @@ jobs: with: asf-yaml-content: | publish: - profile: ~ whoami: ${{ github.ref_name }}-out subdir: content/log4j/tools install-required: true @@ -81,7 +80,7 @@ jobs: deploy-site-rel: needs: export-version - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.0 + uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1 # Secrets for committing the generated site secrets: GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml deleted file mode 100644 index fc334ed..0000000 --- a/.github/workflows/merge-dependabot.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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. -# - -name: merge-dependabot - -on: - pull_request_target: - paths-ignore: - - "**.adoc" - - "**.md" - - "**.txt" - -permissions: read-all - -jobs: - - build: - if: github.repository == 'apache/logging-log4j-tools' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]' - uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.0 - - merge-dependabot: - needs: build - uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.1.0 - permissions: - contents: write # to push changelog commits - pull-requests: write # to close the PR - secrets: - GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} # to sign commits
