Merge branch '2.1.x'

Author: Kehrlann

.github/workflows/maven-central-release.yml

@@ -32,17 +32,13 @@ jobs:
         run: ./mvnw -pl mcp-test -am -Pjackson2 test
 
       # Deploy runs all previous maven goals, including test and verify
-      # Conformance tests are not published, and they break javadoc:aggregate: its forked
-      # compile lifecycle never produces mcp classes (compiled at prepare-package), so their
-      # dependency on mcp falls back to Maven Central, where the release does not exist yet.
       # Use the wrapper (Maven 3.9.x): with Maven 3.10, central-publishing 0.7.0 leaves
       # maven-metadata-local.xml files in the bundle, and Central rejects it.
       - name: Publish to Maven Central
         run: |
           ./mvnw --batch-mode \
             -Prelease \
             -Pjavadoc \
-            -pl '!conformance-tests,!conformance-tests/client-jdk-http-client,!conformance-tests/client-spring-http-client,!conformance-tests/server-servlet,!conformance-tests/server-servlet-modern' \
             clean deploy
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}

.github/workflows/publish-snapshot.yml

@@ -33,13 +33,6 @@ jobs:
         with:
           node-version: '20'
 
-      # Conformance tests are not published, and they break javadoc:aggregate: its forked
-      # compile lifecycle never produces mcp classes (compiled at prepare-package), so their
-      # dependency on mcp falls back to the local Maven repository, where the current
-      # snapshot may not exist (e.g. right after a version bump, on a Maven cache miss).
-      - name: Generate Java docs
-        run: ./mvnw -Pjavadoc -B -pl '!conformance-tests,!conformance-tests/client-jdk-http-client,!conformance-tests/client-spring-http-client,!conformance-tests/server-servlet,!conformance-tests/server-servlet-modern' javadoc:aggregate
-
       - name: Jackson 2 Integration Tests
         run: ./mvnw -pl mcp-test -am -Pjackson2 test
 
@@ -53,7 +46,6 @@ jobs:
             -Pjavadoc \
             -Prelease \
             --batch-mode \
-            -pl '!conformance-tests,!conformance-tests/client-jdk-http-client,!conformance-tests/client-spring-http-client,!conformance-tests/server-servlet,!conformance-tests/server-servlet-modern' \
             --update-snapshots deploy \
             -Dmaven.repository.credentialScope=id
 

pom.xml

@@ -311,13 +311,6 @@
 									<goal>jar</goal>
 								</goals>
 							</execution>
-							<execution>
-								<id>generate-aggregate-javadocs</id>
-								<phase>package</phase>
-								<goals>
-									<goal>aggregate</goal>
-								</goals>
-							</execution>
 						</executions>
 					</plugin>
 				</plugins>