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 2026/04/30 10:16:50 UTC
(logging-parent) 01/01: Try to fix CI
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-parent.git
commit e1c642003c6e8168af927d8fef8d4a31d435bb22
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Apr 30 12:16:39 2026 +0200
Try to fix CI
---
.asf.yaml | 51 ++++++++++---------
pom.xml | 17 -------
.../antora/modules/ROOT/examples/develocity.xml | 42 ----------------
src/site/antora/modules/ROOT/pages/features.adoc | 57 ----------------------
src/site/antora/modules/ROOT/pages/workflows.adoc | 1 -
5 files changed, 25 insertions(+), 143 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 31588c7..4fc5b8a 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -68,37 +68,36 @@ github:
features:
issues: true
- # Clear Protected Branches configuration: it is replaced by GitHub Rulesets
- protected_branches: { }
+ protected_branches:
- rulesets:
- # The `.asf.yaml` processor has a bug that prevents it from parsing existing rulesets.
- # So it can neither remove them nor modify them.
- # Hence, we bump the counter in the name at each change.
- # For details, see: https://github.com/apache/infrastructure-asfyaml/pull/93
- - name: "Branch protection (3)"
- type: branch
- branches:
- includes:
- - "~DEFAULT_BRANCH"
- - "refs/heads/gha/*"
+ main:
# All reviews must be addressed before merging
required_conversation_resolution: true
# Require checks to pass before merging
required_status_checks:
- # The GitHub Actions app
- # https://api.github.com/apps/github-actions
- - app_slug: 15368
- name: "build / build (ubuntu-latest)"
- # The GitHub Advanced Security app
- # https://api.github.com/apps/github-advanced-security
- - app_slug: 57789
- name: "CodeQL"
+ checks:
+ # The GitHub Actions app: 15368
+ - app_id: 15368
+ context: "build / build (ubuntu-latest)"
+ # The GitHub Advanced Security app: 57789
+ - app_id: 57789
+ context: "CodeQL"
+ # At least one positive review must be present
+ required_pull_request_reviews:
+ required_approving_review_count: 1
+
+ gha/v0:
+ # All reviews must be addressed before merging
+ required_conversation_resolution: true
+ # Require checks to pass before merging
+ required_status_checks:
+ checks:
+ # The GitHub Actions app: 15368
+ - app_id: 15368
+ context: "build / build (ubuntu-latest)"
+ # The GitHub Advanced Security app: 57789
+ - app_id: 57789
+ context: "CodeQL"
# At least one positive review must be present
required_pull_request_reviews:
required_approving_review_count: 1
- - name: "Tag protection"
- type: tag
- branches:
- includes:
- - "refs/tags/rel/*"
diff --git a/pom.xml b/pom.xml
index 8c3dca4..4c39ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,9 +231,6 @@
<spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
<spotless-maven-plugin.version>2.44.5</spotless-maven-plugin.version>
<xml-maven-plugin.version>1.1.0</xml-maven-plugin.version>
- <!-- Due to a missing `maven-metadata.xml`, Dependabot does not update this automatically -->
- <develocity-maven-plugin.version>2.1</develocity-maven-plugin.version>
- <develocity-user-data-extension.version>2.0.3</develocity-user-data-extension.version>
<!-- plugin dependencies versions -->
<error-prone.version>2.38.0</error-prone.version>
@@ -303,20 +300,6 @@
<version>${cyclonedx-maven-plugin.version}</version>
</plugin>
- <!-- Fake entry to be upgraded by Dependabot -->
- <plugin>
- <groupId>com.gradle</groupId>
- <artifactId>develocity-maven-extension</artifactId>
- <version>${develocity-maven-plugin.version}</version>
- </plugin>
-
- <!-- Fake entry to be upgraded by Dependabot -->
- <plugin>
- <groupId>com.gradle</groupId>
- <artifactId>common-custom-user-data-maven-extension</artifactId>
- <version>${develocity-user-data-extension.version}</version>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
diff --git a/src/site/antora/modules/ROOT/examples/develocity.xml b/src/site/antora/modules/ROOT/examples/develocity.xml
deleted file mode 100644
index 3886be6..0000000
--- a/src/site/antora/modules/ROOT/examples/develocity.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.
- -->
-<develocity>
- <projectId>logging-log4j2</projectId>
- <server>
- <url>https://develocity.apache.org</url>
- </server>
- <buildScan>
- <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/src/site/antora/modules/ROOT/pages/features.adoc b/src/site/antora/modules/ROOT/pages/features.adoc
index 7858091..221245e 100644
--- a/src/site/antora/modules/ROOT/pages/features.adoc
+++ b/src/site/antora/modules/ROOT/pages/features.adoc
@@ -64,60 +64,3 @@ See following guides for projects employing {project-name} to cut releases:
* xref:release-instructions-project.adoc[]
* xref:release-instructions-xml-schema.adoc[]
-[#develocity-configuration]
-=== Develocity configuration
-
-https://gradle.com/develocity/[Gradle Develocity] is a service that provides statistics and other improvements to the development experience.
-Due to an
-https://gradle.com/blog/apache-software-foundation-standardizes-on-gradle-develocity-to-improve-developer-productivity-experience/[agreement between the ASF and Gradle],
-it is available for all ASF projects as INFRA hosted https://develocity.apache.org/[`develocity.apache.org`] service.
-
-.Click for instructions to submit build scans to the `develocity.apache.org` server
-[%collapsible]
-====
-. Add a `.mvn/develocity.xml` configuration file to the repository.
-See
-https://docs.gradle.com/develocity/maven-extension/current/[Develocity Maven Extension User Manual]
-for detailed configuration options.
-+
-You can use the following example as template:
-+
-[source,xml]
-----
-include::example$develocity.xml[lines=1;18..-1]
-----
-+
-[NOTE]
-=====
-Do **not** add any `.mvn/extensions.xml` file to the repository.
-The file will be created by the `reusable-build` workflow.
-=====
-
-. Modify the build workflow that should publish build scans:
-+
---
-* Pass the `secrets.DEVELOCITY_ACCESS_KEY`, which is defined in all ASF repos as `DV_ACCESS_TOKEN` secret of the workflow.
-
-* Set the `develocity-enabled` parameter to `true`.
---
-+
-For example, you can use the snippet below:
-+
-[source,yaml,subs="+attributes"]
-----
-build:
- uses: apache/logging-parent/.github/workflows/build-reusable.yaml@{project-gha-version}
- secrets:
- DV_ACCESS_TOKEN: ${{ ! startsWith(github.refname, 'release/') && secrets.DEVELOCITY_ACCESS_KEY }}
- with:
- develocity-enabled: ${{ ! startsWith(github.refname, 'release/') }}
-----
-+
-[IMPORTANT]
-=====
-The Maven Develocity Extension is a **closed source** extension, which requires a commercial
-https://gradle.com/[Gradle Inc]
-license to work.
-To guarantee the reproducibility of our builds and the security of our software suplly chain, please disable the extension in our **release** builds.
-=====
-====
diff --git a/src/site/antora/modules/ROOT/pages/workflows.adoc b/src/site/antora/modules/ROOT/pages/workflows.adoc
index 0761bf0..cb55de7 100644
--- a/src/site/antora/modules/ROOT/pages/workflows.adoc
+++ b/src/site/antora/modules/ROOT/pages/workflows.adoc
@@ -34,7 +34,6 @@ The Logging Parent project provides the following reusable GitHub Actions workfl
This workflow:
* Compiles using the specified Java compiler version
-* Submits build scans to the Develocity server
[#build-examples]
=== Examples