This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch fixCi in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 937dc32d28f3551050d8b8a8c0ad4ba5012bdfd7 Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Apr 30 14:24:54 2026 +0200 Switch CI to `gha/v0` and remove Develocity --- .github/workflows/build.yaml | 11 +++--- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-site.yaml | 6 ++-- .../workflows/develocity-publish-build-scans.yaml | 42 ---------------------- .gitignore | 1 - .mvn/develocity.xml | 30 ---------------- pom.xml | 2 -- 7 files changed, 8 insertions(+), 86 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index df49f55229..959923248e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,21 +30,18 @@ permissions: read-all jobs: build: - uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1 - secrets: - DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }} + uses: apache/logging-parent/.github/workflows/build-reusable.yaml@gha/v0 with: java-version: | 8 17 site-enabled: true reproducibility-check-enabled: false - develocity-enabled: ${{ ! startsWith(github.ref_name, 'release/') }} deploy-snapshot: needs: build if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x' - uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@gha/v0 # Secrets for deployments secrets: NEXUS_USERNAME: ${{ secrets.NEXUS_USER }} @@ -57,7 +54,7 @@ jobs: deploy-release: needs: build if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/') - uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@gha/v0 # Secrets for deployments secrets: GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} @@ -78,7 +75,7 @@ jobs: needs: [ deploy-snapshot, deploy-release ] if: ${{ always() && (needs.deploy-snapshot.result == 'success' || needs.deploy-release.result == 'success') }} name: "verify-reproducibility (${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.project-version || needs.deploy-snapshot.outputs.project-version }})" - uses: apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@gha/v0 with: nexus-url: ${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.nexus-url || 'https://repository.apache.org/content/groups/snapshots' }} # Encode the `runs-on` input as JSON array diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 6609a93e77..7aaf9ac660 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -30,7 +30,7 @@ permissions: read-all jobs: analyze: - uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@gha/v0 with: java-version: | 8 diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml index e65aab28ca..59aba57c8f 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-log4j2' && github.ref_name == '2.x' - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@gha/v0 # 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-log4j2' && github.ref_name == '2.x-site-pro' - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@gha/v0 # Secrets for committing the generated site secrets: GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} @@ -80,7 +80,7 @@ jobs: deploy-site-rel: needs: export-version - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1 + uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@gha/v0 # Secrets for committing the generated site secrets: GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} diff --git a/.github/workflows/develocity-publish-build-scans.yaml b/.github/workflows/develocity-publish-build-scans.yaml deleted file mode 100644 index 2a87945214..0000000000 --- a/.github/workflows/develocity-publish-build-scans.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: Develocity - Publish Maven Build Scans - -on: - workflow_run: - workflows: [ "build" ] - types: [ completed ] - -jobs: - - publish-build-scans: - runs-on: ubuntu-latest - permissions: - actions: write - pull-requests: write - steps: - - - name: Setup Build Scan link capture - uses: gradle/develocity-actions/setup-maven@4a2aed82eea165ba2d5c494fc2a8730d7fdff229 # 1.4 - with: - capture-build-scan-links: true - - - name: Publish Build Scans - uses: gradle/develocity-actions/maven-publish-build-scan@4a2aed82eea165ba2d5c494fc2a8730d7fdff229 # 1.4 - with: - develocity-url: 'https://develocity.apache.org' - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} diff --git a/.gitignore b/.gitignore index 2f5bcffaf8..a69249d593 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ .vscode /.metadata/ /.mvn/wrapper/maven-wrapper.jar -/.mvn/.develocity .flattened-pom.xml .project .settings diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml deleted file mode 100644 index caa112766a..0000000000 --- a/.mvn/develocity.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<develocity> - <projectId>logging-log4j2</projectId> - <server> - <url>https://develocity.apache.org</url> - </server> - <buildScan> - <capture> - <buildLogging>true</buildLogging> - <testLogging>true</testLogging> - </capture> - <obfuscation> - <ipAddresses>0.0.0.0</ipAddresses> - </obfuscation> - <publishing> - <onlyIf> - <![CDATA[env['CI'] != null]]> - </onlyIf> - </publishing> - <backgroundBuildScanUpload>false</backgroundBuildScanUpload> - </buildScan> - <buildCache> - <local> - <enabled>false</enabled> - </local> - <remote> - <enabled>false</enabled> - </remote> - </buildCache> -</develocity> diff --git a/pom.xml b/pom.xml index 87123ce437..4020b4b427 100644 --- a/pom.xml +++ b/pom.xml @@ -370,8 +370,6 @@ <log4j.docgen.pluginDescriptorsDir.phase1>${maven.multiModuleProjectDirectory}/target/plugin-descriptors/phase1</log4j.docgen.pluginDescriptorsDir.phase1> <log4j.docgen.pluginDescriptorsDir.phase2>${maven.multiModuleProjectDirectory}/target/plugin-descriptors/phase2</log4j.docgen.pluginDescriptorsDir.phase2> - <!-- Downgrade temporarily Maven Surefire, since it breaks tests statistics on `develocity.apache.org` --> - <version.maven-surefire>3.2.5</version.maven-surefire> </properties> <dependencyManagement>
