From ef0c4e74a012985218ed05353bf1fb4cc419f1c5 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Tue, 27 Oct 2026 13:27:39 -0500 Subject: [PATCH 1/9] chore: adopt ANS governance and maintainer rosters Signed-off-by: Connor Snitker --- .github/CODEOWNERS | 2 + .github/workflows/contribution-policy.yml | 18 +++ CODE_OF_CONDUCT.md | 136 +----------------- CONTRIBUTING.md | 161 ++-------------------- MAINTAINERS.md | 15 ++ README.md | 9 +- SECURITY.md | 26 ++-- 7 files changed, 67 insertions(+), 300 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/contribution-policy.yml create mode 100644 MAINTAINERS.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..826ff3d --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# Repository Maintainers; see /MAINTAINERS.md. +* @agentnameservice/sdk-java-maintainers diff --git a/.github/workflows/contribution-policy.yml b/.github/workflows/contribution-policy.yml new file mode 100644 index 0000000..5727157 --- /dev/null +++ b/.github/workflows/contribution-policy.yml @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: Apache-2.0 +# main is intentional for this first-party shared policy; changes require review +# in the protected organization configuration repository. +name: Check contribution metadata + +on: + pull_request: + types: [opened, edited, synchronize, reopened, labeled, unlabeled, ready_for_review] + merge_group: + +permissions: + contents: read + +jobs: + contribution: + uses: agentnameservice/.github/.github/workflows/contribution-policy.yml@main + with: + specification: ${{ github.event.repository.name == 'ans-registry' }} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 0a1d923..66d5093 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,133 +1,5 @@ +# Code of Conduct -# Contributor Covenant Code of Conduct - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity -and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the - overall community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or - advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email - address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -oss@godaddy.com. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series -of actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or -permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within -the community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.0, available at -[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. - -Community Impact Guidelines were inspired by -[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. - -For answers to common questions about this code of conduct, see the FAQ at -[https://www.contributor-covenant.org/faq][FAQ]. Translations are available -at [https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations +The [ANS Code of Conduct](https://github.com/agentnameservice/governance/blob/main/CODE_OF_CONDUCT.md) +applies to participation in this repository. It defines the reporting process, +contacts, and enforcement procedures for the project. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fa85c74..1bc5de2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,91 +1,29 @@ # Contributing -Everyone is welcome to contribute to GoDaddy's Open Source Software. -Contributing doesn’t just mean submitting pull requests. To get involved, -you can report or triage bugs, and participate in discussions on the -evolution of each project. +Follow the [ANS contribution guide](https://github.com/agentnameservice/governance/blob/main/CONTRIBUTING.md) +and [governance](https://github.com/agentnameservice/governance/blob/main/GOVERNANCE.md). +They define DCO sign-off, pull request review, issue references, and disclosure +of AI assistance. -No matter how you want to get involved, we ask that you first learn what’s -expected of anyone who participates in the project by reading the Contribution -Guidelines and our [Code of Conduct][coc]. +The [Code of Conduct](CODE_OF_CONDUCT.md) applies to all participation. +Report vulnerabilities privately using [SECURITY.md](SECURITY.md). +The repository's [Maintainers](MAINTAINERS.md) handle reviews and releases. -## Answering Questions +## Development -One of the most important and immediate ways you can support this project is -to answer questions on [Github][issues]. Whether you’re -helping a newcomer understand a feature or troubleshooting an edge case with a -seasoned developer, your knowledge and experience with a programming language -can go a long way to help others. - -## Reporting Bugs - -**Do not report potential security vulnerabilities here. Refer to -[SECURITY.md](./SECURITY.md) for more details about the process of reporting -security vulnerabilities.** - -Before submitting a ticket, please search our [Issue Tracker][issues] to make -sure it does not already exist and have a simple replication of the behavior. If -the issue is isolated to one of the dependencies of this project, please create -a Github issue in that project. All dependencies should be open source software -and can be found on Github. - -Submit a ticket for your issue, assuming one does not already exist: - -- Create it on the project's [issue Tracker][issues]. -- Clearly describe the issue by following the template layout - - Make sure to include steps to reproduce the bug. - - A reproducible (unit) test could be helpful in solving the bug. - - Describe the environment that (re)produced the problem. - -## Triaging bugs or contributing code - -If you're triaging a bug, first make sure that you can reproduce it. Once a bug -can be reproduced, reduce it to the smallest amount of code possible. Reasoning -about a sample or unit test that reproduces a bug in just a few lines of code -is easier than reasoning about a longer sample. - -From a practical perspective, contributions are as simple as: - -1. Fork and clone the repo, [see Github's instructions if you need help.][fork] -1. Create a branch for your PR with `git checkout -b pr/your-branch-name` -1. Make changes on the branch of your forked repository. -1. When committing, reference your issue (if present) and include a note about - the fix. -1. Please also add/update unit tests for your changes. -1. Push the changes to your fork and submit a pull request to the 'main - development branch' branch of the projects' repository. - -If you are interested in making a large change and feel unsure about its overall -effect, start with opening an Issue in the project's [Issue Tracker][issues] -with a high-level proposal and discuss it with the core contributors through -Github comments. After reaching a consensus with core -contributors about the change, discuss the best way to go about implementing it. - -> Tip: Keep your main branch pointing at the original repository and make -> pull requests from branches on your fork. To do this, run: -> -> ``` -> git remote add upstream https://github.com/agentnameservice/ans-sdk-java.git -> git fetch upstream -> git branch --set-upstream-to=upstream/main main -> ``` -> -> This will add the original repository as a "remote" called "upstream," Then -> fetch the git information from that remote, then set your local main -> branch to use the upstream main branch whenever you run git pull. Then you -> can make all of your pull request branches based on this main branch. -> Whenever you want to update your version of main, do a regular git pull. +See the [build and test instructions](README.md#building-from-source) in the README. ## Commit Messages This project uses [Conventional Commits](https://www.conventionalcommits.org/) to automate versioning and changelog generation. Commit messages must follow this format: -``` +```text [optional scope]: ``` Common types: + - `feat:` — A new feature (minor version bump) - `fix:` — A bug fix (patch version bump) - `docs:` — Documentation changes @@ -101,80 +39,3 @@ breaking changes. Commits that do not follow this format are ignored by the release automation and will not appear in the changelog or trigger a version bump. - -## Code Review - -Any open source project relies heavily on code review to improve software -quality. All significant changes, by all developers, must be reviewed before -they are committed to the repository. Code reviews are conducted on GitHub -through comments on pull requests or commits. The developer responsible for a -code change is also responsible for making all necessary review-related changes. - -Sometimes code reviews will take longer than you would hope for, especially for -larger features. Here are some accepted ways to speed up review times for your -patches: - -- Review other people’s changes. If you help out, others will more likely be - willing to do the same for you. -- Split your change into multiple smaller changes. The smaller your change, - the higher the probability that somebody will take a quick look at it. - -**Note that anyone is welcome to review and give feedback on a change, but only -people with commit access to the repository can approve it.** - -## Attribution of Changes - -When contributors submit a change to this project, after that change is -approved, other developers with commit access may commit it for the author. When -doing so, it is important to retain correct attribution of the contribution. -Generally speaking, Git handles attribution automatically. - -## Code Style and Documentation - -Ensure that your contribution follows the standards set by the project's style -guide with respect to patterns, naming, documentation and testing. - -## Developer Certificate of Origin - -This project follows the Linux Foundation contribution model. Every commit -must carry a `Signed-off-by:` trailer certifying the -[Developer Certificate of Origin](https://developercertificate.org) — your -assertion that you have the right to submit the change under the project's -license. Sign off each commit with: - -``` -git commit -s -``` - -Missing sign-offs on an existing branch can be fixed with -`git rebase --signoff origin/main` followed by a force-push. The `DCO` -status check — the org-wide [DCO app](https://github.com/apps/dco), the -same enforcement used across Linux Foundation projects — validates this -on every pull request; bot-authored commits (Dependabot, release-please) -and merge commits are exempt. - -## AI-Assisted Contributions - -AI-assisted contributions are welcome **with disclosure**, following the -[Linux kernel convention](https://docs.kernel.org/process/coding-assistants.html): - -- Disclose the tooling in the pull request's **AI assistance** section, - naming the tool and model, e.g. `Assisted-by: Claude Code (claude-fable-5)`. -- AI tools must never add `Signed-off-by:` lines. DCO certification belongs - to the human submitter, who remains fully responsible for the correctness - and licensing of the contribution. - -## Linking Issues - -Every pull request must reference an issue with a closing keyword (e.g. -`Fixes #123`). Open the issue first — issues are where triage and -prioritization happen. - -# Additional Resources - -- [General GitHub Documentation](https://help.github.com/) -- [GitHub Pull Request documentation](https://help.github.com/send-pull-requests/) - -[issues]: https://github.com/agentnameservice/ans-sdk-java/issues -[coc]: ./CODE_OF_CONDUCT.md -[fork]: https://help.github.com/en/articles/fork-a-repo diff --git a/MAINTAINERS.md b/MAINTAINERS.md new file mode 100644 index 0000000..5f7db0d --- /dev/null +++ b/MAINTAINERS.md @@ -0,0 +1,15 @@ +# Repository access roster + +## Maintainers + +| GitHub | +| --- | +| @jhateley-godaddy | +| @kperry-godaddy | + +## Reviewers + +| GitHub | +| --- | + +Update this file through a reviewed pull request. The organization automation reads the GitHub column in these two sections. diff --git a/README.md b/README.md index 70d4a51..5767ff1 100644 --- a/README.md +++ b/README.md @@ -612,9 +612,12 @@ client.resolve("agent.example.com"); // Latest version ## Contributing -We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines on -how to get involved, including commit message conventions, code review process, and more. +This repository follows [ANS governance](https://github.com/agentnameservice/governance/blob/main/GOVERNANCE.md). +See [CONTRIBUTING.md](CONTRIBUTING.md) for contribution guidance and +[MAINTAINERS.md](MAINTAINERS.md) for the repository's Maintainers. +The [Code of Conduct](CODE_OF_CONDUCT.md) applies to participation; +report vulnerabilities privately using [SECURITY.md](SECURITY.md). ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. \ No newline at end of file +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. diff --git a/SECURITY.md b/SECURITY.md index f42b125..4f634fe 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,19 +1,15 @@ -# Reporting Security Issues +# Security -We take security very seriously at GoDaddy. We appreciate your efforts to -responsibly disclose your findings, and will make every effort to acknowledge -your contributions. +Follow the [ANS security policy](https://github.com/agentnameservice/governance/blob/main/SECURITY.md) +for vulnerability handling, response targets, and coordinated disclosure. -## Where should I report security issues? +To report a vulnerability in this repository, use +[Report a vulnerability](https://github.com/agentnameservice/ans-sdk-java/security/advisories/new) +in its Security tab. Do not include vulnerability details or credentials in a +public issue, pull request, or discussion. -In order to give the community time to respond and upgrade, we strongly urge you -report all security issues privately. +## Supported versions -To report a security issue in one of our Open Source projects email us directly -at **oss@godaddy.com** and include the word "SECURITY" in the subject line. - -This mail is delivered to our Open Source Security team. - -After the initial reply to your report, the team will keep you informed of the -progress being made towards a fix and announcement, and may ask for additional -information or guidance. \ No newline at end of file +Security fixes follow the [project's supported-version policy](https://github.com/agentnameservice/governance/blob/main/SECURITY.md#supported-versions): +the latest minor release receives security fixes. Include the affected version +or commit in your report. From f005750782c92c2f7dcb9fbb99e850ca3229b732 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Tue, 27 Oct 2026 14:11:30 -0500 Subject: [PATCH 2/9] docs: enable TSC fallback reviews without project merge rights Signed-off-by: Connor Snitker --- .github/CODEOWNERS | 4 ++-- MAINTAINERS.md | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 826ff3d..ec83e98 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ -# Repository Maintainers; see /MAINTAINERS.md. -* @agentnameservice/sdk-java-maintainers +# Repository Maintainers and TSC fallback reviewers; see /MAINTAINERS.md. +* @agentnameservice/sdk-java-maintainers @agentnameservice/tsc diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 5f7db0d..98392ee 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -13,3 +13,8 @@ | --- | Update this file through a reviewed pull request. The organization automation reads the GitHub column in these two sections. + +TSC members also have project-wide review access through +[`@agentnameservice/tsc`](https://github.com/agentnameservice/governance/blob/main/TSC.md). +TSC membership alone does not appoint a repository Maintainer or grant merge +authority here. From e970b9b151ff11fa22a9b99a083afa11ebd6b539 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Tue, 27 Oct 2026 15:31:41 -0500 Subject: [PATCH 3/9] docs: defer governance integration until dependencies are ready Signed-off-by: Connor Snitker --- .github/CODEOWNERS | 4 ++-- .github/workflows/contribution-policy.yml | 18 ------------------ MAINTAINERS.md | 5 ----- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/contribution-policy.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ec83e98..826ff3d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ -# Repository Maintainers and TSC fallback reviewers; see /MAINTAINERS.md. -* @agentnameservice/sdk-java-maintainers @agentnameservice/tsc +# Repository Maintainers; see /MAINTAINERS.md. +* @agentnameservice/sdk-java-maintainers diff --git a/.github/workflows/contribution-policy.yml b/.github/workflows/contribution-policy.yml deleted file mode 100644 index 5727157..0000000 --- a/.github/workflows/contribution-policy.yml +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# main is intentional for this first-party shared policy; changes require review -# in the protected organization configuration repository. -name: Check contribution metadata - -on: - pull_request: - types: [opened, edited, synchronize, reopened, labeled, unlabeled, ready_for_review] - merge_group: - -permissions: - contents: read - -jobs: - contribution: - uses: agentnameservice/.github/.github/workflows/contribution-policy.yml@main - with: - specification: ${{ github.event.repository.name == 'ans-registry' }} diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 98392ee..5f7db0d 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -13,8 +13,3 @@ | --- | Update this file through a reviewed pull request. The organization automation reads the GitHub column in these two sections. - -TSC members also have project-wide review access through -[`@agentnameservice/tsc`](https://github.com/agentnameservice/governance/blob/main/TSC.md). -TSC membership alone does not appoint a repository Maintainer or grant merge -authority here. From cad84ecc8fef5ae4f81edd746fe1700a6eeff3f6 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Wed, 28 Oct 2026 12:30:23 -0500 Subject: [PATCH 4/9] docs: reference the organization team configuration Signed-off-by: Connor Snitker --- MAINTAINERS.md | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 5f7db0d..423f116 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,15 +1,6 @@ -# Repository access roster +# Maintainers -## Maintainers - -| GitHub | -| --- | -| @jhateley-godaddy | -| @kperry-godaddy | - -## Reviewers - -| GitHub | -| --- | - -Update this file through a reviewed pull request. The organization automation reads the GitHub column in these two sections. +The [sdk-java-maintainers team](https://github.com/orgs/agentnameservice/teams/sdk-java-maintainers) +maintains this repository. Current membership and GitHub access are recorded in +[the organization team configuration](https://github.com/agentnameservice/.github/blob/main/peribolos.yml). +Propose membership changes there through a reviewed pull request. From ddcc34e392c7b6078101b63ad33db23f12db4aa8 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Wed, 28 Oct 2026 13:56:14 -0500 Subject: [PATCH 5/9] chore: retain interim owner review access Signed-off-by: Connor Snitker --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 826ff3d..0f5bd1c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ -# Repository Maintainers; see /MAINTAINERS.md. -* @agentnameservice/sdk-java-maintainers +# Review routing; merge permissions are managed separately. +* @agentnameservice/sdk-java-maintainers @agentnameservice/tsc-owners From 810367498dcfe7813d21b5858273dfd3a4f5ba99 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Wed, 28 Oct 2026 15:02:49 -0500 Subject: [PATCH 6/9] chore: include TSC fallback reviewers Signed-off-by: Connor Snitker --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0f5bd1c..883b009 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ # Review routing; merge permissions are managed separately. -* @agentnameservice/sdk-java-maintainers @agentnameservice/tsc-owners +* @agentnameservice/sdk-java-maintainers @agentnameservice/tsc @agentnameservice/tsc-owners From 797fe982654d52d0c29b3b2dd0eb5026f4883aba Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Wed, 28 Oct 2026 17:25:00 -0500 Subject: [PATCH 7/9] chore: add repository reviewer teams Signed-off-by: Connor Snitker --- .github/CODEOWNERS | 2 +- MAINTAINERS.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 883b009..349249e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ # Review routing; merge permissions are managed separately. -* @agentnameservice/sdk-java-maintainers @agentnameservice/tsc @agentnameservice/tsc-owners +* @agentnameservice/sdk-java-maintainers @agentnameservice/sdk-java-reviewers @agentnameservice/tsc @agentnameservice/tsc-owners diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 423f116..ba650e4 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,6 +1,7 @@ # Maintainers The [sdk-java-maintainers team](https://github.com/orgs/agentnameservice/teams/sdk-java-maintainers) -maintains this repository. Current membership and GitHub access are recorded in +maintains this repository. The [sdk-java-reviewers team](https://github.com/orgs/agentnameservice/teams/sdk-java-reviewers) +provides reviews. Current membership and GitHub access are recorded in [the organization team configuration](https://github.com/agentnameservice/.github/blob/main/peribolos.yml). Propose membership changes there through a reviewed pull request. From 206da5602942ce207077525fa252801db1e10ab2 Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Sun, 1 Nov 2026 05:53:45 -0600 Subject: [PATCH 8/9] docs: use the shared contribution policy Signed-off-by: Connor Snitker --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1bc5de2..8cb769f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -Follow the [ANS contribution guide](https://github.com/agentnameservice/governance/blob/main/CONTRIBUTING.md) +Follow the [ANS contribution guide](https://github.com/agentnameservice/.github/blob/main/CONTRIBUTING.md) and [governance](https://github.com/agentnameservice/governance/blob/main/GOVERNANCE.md). They define DCO sign-off, pull request review, issue references, and disclosure of AI assistance. From a802eef2609f35c0f2485dbab87e6b7425f955dd Mon Sep 17 00:00:00 2001 From: Connor Snitker Date: Thu, 5 Nov 2026 10:38:40 -0600 Subject: [PATCH 9/9] chore: adopt prospective Apache contribution licensing Signed-off-by: Connor Snitker --- CONTRIBUTING.md | 14 +++ LICENSE | 222 ++++++++++++++++++++++++++++++++++++++++++----- LICENSES/MIT.txt | 21 +++++ NOTICE | 8 ++ README.md | 9 +- build.gradle.kts | 15 ++++ 6 files changed, 267 insertions(+), 22 deletions(-) create mode 100644 LICENSES/MIT.txt create mode 100644 NOTICE diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8cb769f..73a9a8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,20 @@ The [Code of Conduct](CODE_OF_CONDUCT.md) applies to all participation. Report vulnerabilities privately using [SECURITY.md](SECURITY.md). The repository's [Maintainers](MAINTAINERS.md) handle reviews and releases. +## Licensing new contributions + +This policy applies to new original contributions submitted after its adoption. +By submitting such a contribution for inclusion in ANS, you agree to license it +under the [Apache License, Version 2.0](LICENSE), including its copyright and +patent grants. Only submit material that you have the right to license on those +terms, and sign off each commit under the Developer Certificate of Origin below. + +Pre-existing contributions retain the licenses under which they were submitted. +In particular, earlier MIT-licensed contributions remain under +[LICENSES/MIT.txt](LICENSES/MIT.txt); this policy does not claim an Apache patent grant from +those contributors for their earlier work. Preserve existing copyright and +third-party license notices when modifying or incorporating material. + ## Development See the [build and test instructions](README.md#building-from-source) in the README. diff --git a/LICENSE b/LICENSE index 1f8386d..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -The MIT License (MIT) - -Copyright (c) 2026 GoDaddy Operating Company, LLC. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..1f8386d --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2026 GoDaddy Operating Company, LLC. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..799a4f4 --- /dev/null +++ b/NOTICE @@ -0,0 +1,8 @@ +Agent Name Service (ANS) + +This distribution includes legacy material licensed under the MIT License: + +Copyright (c) 2026 GoDaddy Operating Company, LLC. + +The original MIT copyright and permission notice is reproduced in LICENSES/MIT.txt. +Pre-existing contributions retain their original licensing terms. diff --git a/README.md b/README.md index 5767ff1..82d52e2 100644 --- a/README.md +++ b/README.md @@ -620,4 +620,11 @@ report vulnerabilities privately using [SECURITY.md](SECURITY.md). ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. +New original contributions use the [Apache License, Version 2.0](LICENSE), +under the [contribution policy](CONTRIBUTING.md#licensing-new-contributions). +Pre-existing MIT-licensed contributions retain their [MIT license](LICENSES/MIT.txt) +and copyright notices; see [NOTICE](NOTICE). + +Distributions containing both kinds of material must comply with the applicable +terms of both licenses (`Apache-2.0 AND MIT`). New contributions are not offered +under MIT as an alternative. Separately licensed material retains its own terms. diff --git a/build.gradle.kts b/build.gradle.kts index db415a5..d4ea600 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,6 +59,15 @@ subprojects { options.encoding = "UTF-8" } + tasks.withType().configureEach { + from(rootProject.files("LICENSE", "NOTICE")) { + into("META-INF") + } + from(rootProject.file("LICENSES")) { + into("META-INF/LICENSES") + } + } + // Run javadoc as part of check/build so doc errors surface locally and in CI, // not only when the release job generates the javadoc jar for Maven Central. tasks.named("check") { @@ -104,9 +113,15 @@ subprojects { url.set("https://github.com/godaddy/ans-sdk-java") licenses { + license { + name.set("Apache License, Version 2.0") + url.set("https://www.apache.org/licenses/LICENSE-2.0") + comments.set("Applies to new original contributions.") + } license { name.set("MIT License") url.set("https://opensource.org/licenses/MIT") + comments.set("Applies to legacy MIT-licensed material.") } }