From 03464b8a80ba3778ea1938f4e019079debbef4cd Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Wed, 7 Oct 2026 10:38:43 +0200 Subject: [PATCH 1/3] Switch default-branch metadata to Maven 3 (maven-sources#57) Make .asf.yaml identical to the current master (branch-swapped to maven-filtering-4.x) and repoint the README CI/badge/tree links, for the default-branch swap tracked in apache/maven-sources#57. No github.default_branch is added (INFRA sets the default as part of the renames); also drops a maven-filtering-3.x-only notifications.jira_options to match master. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01SJcgjSha5PNT8WFBMC1v5b --- .asf.yaml | 8 +++++++- README.md | 18 +++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 2796ef8d..a5867491 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -23,14 +23,20 @@ github: - build-management - maven-shared - maven + protected_branches: + master: { } + maven-filtering-4.x: { } + pull_requests: + del_branch_on_merge: true enabled_merge_buttons: squash: true merge: false rebase: true autolink_jira: - MSHARED + features: + issues: true notifications: commits: commits@maven.apache.org issues: issues@maven.apache.org pullrequests: issues@maven.apache.org - jira_options: link label comment diff --git a/README.md b/README.md index 6938633d..963d5511 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ Contributing to [Apache Maven Filtering](https://maven.apache.org/shared/maven-f [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license] [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-filtering.svg?label=Maven%20Central&filter=3*)](https://search.maven.org/artifact/org.apache.maven.shared/maven-filtering) [![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/apache/maven/shared/maven-filtering/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/shared/maven-filtering/README.md) -[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-3.x.svg)][build-3] -[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-3.x.svg)][test-results-3] +[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master.svg)][build-3] +[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master.svg)][test-results-3] -Maven 4: [master](https://github.com/apache/maven-filtering/tree/master) +Maven 4: [maven-filtering-4.x](https://github.com/apache/maven-filtering/tree/maven-filtering-4.x) [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-filtering.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.shared/maven-filtering) [![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/apache/maven/shared/maven-filtering/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/shared/maven-filtering/README.md) -[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master.svg)][build] -[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master.svg)][test-results] +[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-4.x.svg)][build] +[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-4.x.svg)][test-results] You have found a bug, or you have an idea for a cool new feature? Contributing @@ -86,7 +86,7 @@ Additional Resources [code-style]: https://maven.apache.org/developers/conventions/code.html [cla]: https://www.apache.org/licenses/#clas [maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index -[test-results]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master/lastCompletedBuild/testReport/ -[test-results-3]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-3.x/lastCompletedBuild/testReport/ -[build]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master/ -[build-3]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-3.x/ +[test-results]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-4.x/lastCompletedBuild/testReport/ +[test-results-3]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master/lastCompletedBuild/testReport/ +[build]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/maven-filtering-4.x/ +[build-3]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-filtering/job/master/ From 1277dd472b4646febd57330ab70b645bd4406d24 Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Wed, 7 Oct 2026 11:34:34 +0200 Subject: [PATCH 2/3] Carry over default-branch .github content (maven-sources#57) GitHub reads .github/ from the default branch, so moving the default to maven-filtering-3.x would silently drop the issue templates and the scheduled stale workflow that master provides. Add them on this branch. Line-specific .github config (dependabot, maven-verify CI) stays the Maven 3 line's, as that is what the new master should run. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01SJcgjSha5PNT8WFBMC1v5b --- .github/ISSUE_TEMPLATE/BUG.yml | 48 ++++++++++++++++++++++++++++++ .github/ISSUE_TEMPLATE/FEATURE.yml | 35 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 26 ++++++++++++++++ .github/workflows/stale.yml | 28 +++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/BUG.yml create mode 100644 .github/ISSUE_TEMPLATE/FEATURE.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/workflows/stale.yml diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml new file mode 100644 index 00000000..699181ff --- /dev/null +++ b/.github/ISSUE_TEMPLATE/BUG.yml @@ -0,0 +1,48 @@ +# +# 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. +# + +# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema + +name: Bug Report +description: File a bug report +labels: ["bug"] + +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report. + + Simple fixes in single PRs do not require issues. + + **Do you use the latest project version?** + + - type: input + id: version + attributes: + label: Affected version + validations: + required: true + + - type: textarea + id: message + attributes: + label: Bug description + validations: + required: true + + diff --git a/.github/ISSUE_TEMPLATE/FEATURE.yml b/.github/ISSUE_TEMPLATE/FEATURE.yml new file mode 100644 index 00000000..ddfd1a45 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/FEATURE.yml @@ -0,0 +1,35 @@ +# +# 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. +# + +# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema + +name: Feature request +description: File a proposal for new feature, improvement +labels: ["enhancement"] + +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this new feature, improvement proposal. + + - type: textarea + id: message + attributes: + label: New feature, improvement proposal + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..b27d6633 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,26 @@ +# +# 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. +# + +# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser + +blank_issues_enabled: false + +contact_links: + + - name: Project Mailing Lists + url: https://maven.apache.org/mailing-lists.html + about: Please ask a question or discuss here diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000..cc6a079b --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,28 @@ +# 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: Stale + +on: + schedule: + - cron: '38 1 * * *' + issue_comment: + types: [ 'created' ] + +jobs: + stale: + uses: 'apache/maven-gh-actions-shared/.github/workflows/stale.yml@v5' From 77c37a86079669dd210fec3c64d153836b2d9a1b Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Wed, 7 Oct 2026 11:44:16 +0200 Subject: [PATCH 3/3] Align repo-wide .github content with master (maven-sources#57) Take master's current pull_request_template.md (the -3.x branch carried an older variant) and the release-drafter workflow (whose branch filter must point at the new master). Line-specific .github config (dependabot, the release-drafter config, the maven-verify CI) stays the Maven 3 line's. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01SJcgjSha5PNT8WFBMC1v5b --- .github/pull_request_template.md | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 51e18bc1..63948e07 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,23 +1,11 @@ -Following this checklist to help us incorporate your -contribution quickly and easily: -- [ ] Your pull request should address just one issue, without pulling in other changes. -- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. -- [ ] Each commit in the pull request should have a meaningful subject line and body. - Note that commits might be squashed by a maintainer on merge. -- [ ] Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. - This may not always be possible but is a best-practice. -- [ ] Run `mvn verify` to make sure basic checks pass. - A more thorough check will be performed on your pull request automatically. -- [ ] You have run the integration tests successfully (`mvn -Prun-its verify`). + -If your pull request is about ~20 lines of code you don't need to sign an -[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure -please ask on the developers list. +--- To make clear that you license your contribution under -the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) -you have to acknowledge this by using the following check-box. +the [Apache License Version 2.0, January 2004](https://www.apache.org/licenses/LICENSE-2.0) +check one of the following: -- [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) -- [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). +- [ ] I hereby declare this contribution to be licensed under the [Apache License Version 2.0, January 2004](https://www.apache.org/licenses/LICENSE-2.0) +- [ ] I hereby declare that I have filed an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).