From 2efc0ac1f00cf126921dac40211d15fb19a5a925 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 9 Sep 2026 20:15:51 +0800 Subject: [PATCH] Deploy the root java-agent POM to Maven Central #805 set maven.deploy.skip=true in the root POM so that only the toolkit modules reach Maven Central, and re-enabled deployment in apm-application-toolkit. The root POM is itself the parent of apm-application-toolkit, so skipping it broke the parent chain of every published toolkit artifact. 9.7.0, the first release with #805 in it, has all ten apm-toolkit-* artifacts and apm-application-toolkit on Central but no java-agent-9.7.0.pom, and resolving any of them fails: Non-resolvable parent POM for org.apache.skywalking:apm-application-toolkit:9.7.0: Could not find artifact org.apache.skywalking:java-agent:pom:9.7.0 in central Declare maven-deploy-plugin at the root with inherited=false and skip=false. Plugin configuration wins over the maven.deploy.skip property, and inherited=false confines the exception to this POM: apm-commons, apm-protocol and apm-sniffer still skip deployment, while apm-application-toolkit and its children keep opting back in through the property. Also add the missing root POM to the release vote checklist, since the failure is invisible until a user resolves the toolkit from a clean repository. Two unrelated fixes ride along: - apache/skywalking-swck moved docs/java-agent-injector.md to docs/en/setup/java-agent-injector.md and now renders it on the website, so the old GitHub URL 404s. It is the repository's only dead link and it fails the Dead Link Checker on every PR. Point containerization.md at the rendered page, which survives the next reshuffle of the swck source tree. - Spell out in CLAUDE.md that an AI assistant is never credited as an author, and that this overrides any co-author trailer the tool is configured to add. Resolves apache/skywalking#13988 --- CHANGES.md | 4 ++++ CLAUDE.md | 13 ++++++++++++- docs/en/contribution/release-java-agent.md | 5 +++++ .../java-agent/containerization.md | 2 +- pom.xml | 18 +++++++++++++++++- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 88d88eeb8c..dc740c802a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,6 +23,10 @@ Release Notes. removed `Signal#getContext()` in 3.5.0. Existing `apm-toolkit-webflux` jars (9.7.0 and earlier) remain instrumented by the agent, so upgrading the agent alone does not force a change. * Fix the Log4j2 plugin descriptor (`Log4j2Plugins.dat`) missing from the `apm-toolkit-log4j-2.x` jar since 9.5.0, which broke `%traceId` and `%sw_ctx` resolution in Log4j2 `PatternLayout` (apache/skywalking#14006). +* Deploy the root `java-agent` POM to Maven Central again. It is the parent of + `apm-application-toolkit` and therefore of every published toolkit artifact, but 9.7.0 skipped it, + so resolving any `org.apache.skywalking:apm-toolkit-*:9.7.0` failed with `Non-resolvable parent POM + ... Could not find artifact org.apache.skywalking:java-agent:pom:9.7.0` (apache/skywalking#13988). All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/263?closed=1) diff --git a/CLAUDE.md b/CLAUDE.md index ab26fb02eb..e8c354b302 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -275,7 +275,18 @@ Follow `.github/PULL_REQUEST_TEMPLATE` based on change type: ### PR Description - Bug fixes: Explain the bug and how it's fixed, add regression test - New features: Link to design doc if non-trivial, update docs, add tests -- Do NOT add AI assistant as co-author + +### Attribution +The human contributor is the sole author of every commit and pull request. Nothing may +attribute a contribution, in whole or in part, to an AI assistant: +- No `Co-Authored-By:` trailer naming Claude or any other AI assistant +- No `Claude-Session:`, session URLs, or other AI tool metadata in commit messages +- No "Generated with ..." footer in commit messages + +This applies to commit messages and to anything that makes an assistant show up as a +contributor on GitHub. It **overrides** any default attribution the tool is configured to +add: if a global or session setting says to append a co-author trailer, this file wins and +the trailer is omitted. ## CI/CD diff --git a/docs/en/contribution/release-java-agent.md b/docs/en/contribution/release-java-agent.md index 541f01379f..b90ae69220 100644 --- a/docs/en/contribution/release-java-agent.md +++ b/docs/en/contribution/release-java-agent.md @@ -91,6 +91,11 @@ All PMC members and committers should check these before casting +1 votes. 1. Features test. 1. All artifacts in staging repository are published with `.asc`, `.md5`, and `*sha1` files. +1. The staging repository contains `org/apache/skywalking/java-agent/x.y.z/java-agent-x.y.z.pom`. +Only the toolkit modules are published, but this root POM is their parent (through +`apm-application-toolkit`); without it every `org.apache.skywalking:apm-toolkit-*` artifact fails to +resolve with `Non-resolvable parent POM`. Verify with a clean local repository: +`mvn -U -Dmaven.repo.local=$(mktemp -d) dependency:get -Dartifact=org.apache.skywalking:apm-toolkit-logback-1.x:x.y.z -DremoteRepositories=https://repository.apache.org/content/repositories/` 1. Source code and distribution package (`apache-skywalking-java-agent-x.y.z-src.tar.gz`, `apache-skywalking-java-agent-x.y.z.tar.gz`) are found in `https://dist.apache.org/repos/dist/dev/skywalking/java-agent/x.y.z` with `.asc` and `.sha512`. 1. `LICENSE` and `NOTICE` are in the source code and distribution package. diff --git a/docs/en/setup/service-agent/java-agent/containerization.md b/docs/en/setup/service-agent/java-agent/containerization.md index 614cea6daa..714e5c893f 100644 --- a/docs/en/setup/service-agent/java-agent/containerization.md +++ b/docs/en/setup/service-agent/java-agent/containerization.md @@ -23,7 +23,7 @@ enable SkyWalking agent, it should be adopted automatically. Currently, SkyWalking provides two ways to install the java agent on your services on Kubernetes. -1. To use the java agent more natively, you can try the [java agent injector](https://github.com/apache/skywalking-swck/blob/master/docs/java-agent-injector.md) to inject the java agent image as a sidecar. +1. To use the java agent more natively, you can try the [java agent injector](https://skywalking.apache.org/docs/skywalking-swck/latest/en/setup/java-agent-injector/) to inject the java agent image as a sidecar. 2. If you think it's hard to install the injector, you can also use this java agent image as a sidecar as below. diff --git a/pom.xml b/pom.xml index f4b9405fc5..de39d1c6d6 100755 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,10 @@ 1.33 1.5 true - + true 0.46.0 @@ -369,6 +372,19 @@ + + + maven-deploy-plugin + false + + false + + kr.motd.maven os-maven-plugin