From 4931e4beed049e6f6cf368382663fe57ef5c531f Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Mon, 21 Sep 2026 14:43:50 -0400 Subject: [PATCH 1/2] [GEODE-10658] Add Javadoc 2.0.3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 069ca675838..30a81c9c38a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Apache Geode logo](https://geode.apache.org/img/Apache_Geode_logo.png)](http://geode.apache.org) -[![Build Status](https://github.com/apache/geode/actions/workflows/gradle.yml/badge.svg?branch=develop)](https://github.com/apache/geode/actions/workflows/gradle.yml?query=branch%3Adevelop) [![CodeQL](https://github.com/apache/geode/actions/workflows/codeql.yml/badge.svg?branch=develop)](https://github.com/apache/geode/actions/workflows/codeql.yml?query=branch%3Adevelop) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Maven Central](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fapache%2Fgeode%2Fgeode-core%2Fmaven-metadata.xml&query=concat%28%22v%22%2C%2F%2Fversion%5Bstarts-with%28text%28%29%2C%222.%22%29%5D%5Blast%28%29%5D%2C%22%20%7C%20v%22%2C%2F%2Fversion%5Bstarts-with%28text%28%29%2C%221.15%22%29%5D%5Blast%28%29%5D%29&label=maven-central)](https://central.sonatype.com/artifact/org.apache.geode/geode-core/versions) [![homebrew](https://img.shields.io/homebrew/v/apache-geode.svg)](https://formulae.brew.sh/formula/apache-geode) [![Docker Pulls](https://img.shields.io/docker/pulls/apache/geode.svg)](https://hub.docker.com/r/apache/geode/) [![Docker Pulls (legacy)](https://img.shields.io/docker/pulls/apachegeode/geode.svg?label=docker%20pulls%20%28legacy%29)](https://hub.docker.com/r/apachegeode/geode/) +[![Build Status](https://github.com/apache/geode/actions/workflows/gradle.yml/badge.svg?branch=develop)](https://github.com/apache/geode/actions/workflows/gradle.yml?query=branch%3Adevelop) [![CodeQL](https://github.com/apache/geode/actions/workflows/codeql.yml/badge.svg?branch=develop)](https://github.com/apache/geode/actions/workflows/codeql.yml?query=branch%3Adevelop) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Maven Central](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fapache%2Fgeode%2Fgeode-core%2Fmaven-metadata.xml&query=concat%28%22v%22%2C%2F%2Fversion%5Bstarts-with%28text%28%29%2C%222.%22%29%5D%5Blast%28%29%5D%2C%22%20%7C%20v%22%2C%2F%2Fversion%5Bstarts-with%28text%28%29%2C%221.15%22%29%5D%5Blast%28%29%5D%29&label=maven-central)](https://central.sonatype.com/artifact/org.apache.geode/geode-core/versions) [![Javadoc](https://javadoc.io/badge2/org.apache.geode/geode-core/javadoc.svg)](https://javadoc.io/doc/org.apache.geode/geode-core) [![homebrew](https://img.shields.io/homebrew/v/apache-geode.svg)](https://formulae.brew.sh/formula/apache-geode) [![Docker Pulls](https://img.shields.io/docker/pulls/apache/geode.svg)](https://hub.docker.com/r/apache/geode/) [![Docker Pulls (legacy)](https://img.shields.io/docker/pulls/apachegeode/geode.svg?label=docker%20pulls%20%28legacy%29)](https://hub.docker.com/r/apachegeode/geode/) From 23058fedbb2e94060e642344530baf6e4d0a222f Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Mon, 21 Sep 2026 17:28:56 -0400 Subject: [PATCH 2/2] [GEODE-10661] Remove Javadoc reference to undeclared webServerTomcat6 configuration --- geode-assembly/build.gradle | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index e1e557f0ab5..0861d1d996e 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -417,26 +417,6 @@ tasks.register('gfshDepsJar', Jar) { } } -// Extract legacy Tomcat 6 jars needed only to satisfy Javadoc for old session manager classes -// (LifecycleSupport, SerializablePrincipal) without altering runtime dependencies. -def legacyTomcatDir = "$buildDir/legacyTomcat" -tasks.register('extractLegacyTomcatForJavadoc') { - description = 'Extracts legacy Tomcat catalina jars for Javadoc symbol resolution.' - outputs.dir(legacyTomcatDir) - dependsOn configurations.webServerTomcat6 - doLast { - delete legacyTomcatDir - copy { - from { zipTree(configurations.webServerTomcat6.singleFile) } - // Include the full Tomcat 6 lib set so packages like org.apache.catalina.ha.session - // (SerializablePrincipal) and util.LifecycleSupport are present. We keep it scoped - // to Javadoc only via this extracted directory rather than adding runtime deps. - include '**/lib/*.jar' - into legacyTomcatDir - } - } -} - tasks.register('docs', Javadoc) { def docsDir = file("$buildDir/javadocs") // Removed -Xwerror to avoid treating HTML5 compatibility warnings as errors @@ -474,16 +454,11 @@ tasks.register('docs', Javadoc) { // Use javadocOnly configuration with transitive dependencies to get external libraries // This avoids cross-project configuration resolution while including necessary dependencies - // Include legacy Tomcat jars for symbol resolution of older session manager classes - dependsOn(tasks.named('extractLegacyTomcatForJavadoc')) - // Use a lazy FileCollection for legacy Tomcat jars so extraction runs before it is resolved - // Broaden legacy Tomcat inclusion (Option 2) to all jars in Tomcat6 lib so that - // org.apache.catalina.util.LifecycleSupport and org.apache.catalina.ha.session.SerializablePrincipal - // (present in clustering/ha related jars) are available to Javadoc without excluding sources. - def legacyCatalinaJars = files { fileTree(legacyTomcatDir).matching { include '*.jar' } } + // The javadocStubs output supplies the older session manager symbols + // (org.apache.catalina.util.LifecycleSupport, org.apache.catalina.ha.session.SerializablePrincipal) + // that are absent from the Tomcat version on the javadocOnly configuration. classpath = configurations.javadocOnly + files(docProjects.collect { proj -> proj.sourceSets.main.output }) + - legacyCatalinaJars + sourceSets.javadocStubs.output options.addStringOption('Xwerror','-quiet')