diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d15a4e9a29c..f120f071652 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -41,8 +41,6 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    env:
-      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     permissions:
       actions: read
       contents: read
@@ -95,6 +93,8 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
     - run: ./gradlew dev installDist --no-daemon --no-build-cache
       if: matrix.language == 'java'
+      env:
+        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
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')