clean up build.gradle and fix weird javadoc issues with dependencies.

Signed-off-by: Marc Handalian <marc.handalian@gmail.com>

Author: mch2

sandbox/libs/analytics-framework/build.gradle

@@ -6,8 +6,6 @@
  * compatible open source license.
  */
 
-def calciteVersion = '1.41.0'
-
 opensearchplugin {
   description = 'DataFusion native execution engine plugin for the query engine.'
   classname = 'org.opensearch.be.datafusion.DataFusionPlugin'
@@ -16,81 +14,9 @@ opensearchplugin {
 
 dependencies {
   // Shared types and SPI interfaces (EngineBridge, EngineCapabilities, AnalyticsBackEndPlugin, etc.)
+  // Also provides calcite-core transitively via api.
   api project(':sandbox:libs:analytics-framework')
-  // Query executor plugin (provides transitive access to server interfaces including QueryBackEndPlugin)
-  testImplementation project(':sandbox:plugins:analytics-engine')
-  // Arrow Flight streaming transport (for BufferAllocator, VectorSchemaRoot)
-  api project(':plugins:arrow-flight-rpc')
-
-  // Arrow memory implementation needed at test runtime for RootAllocator
-  testRuntimeOnly "org.apache.arrow:arrow-memory-unsafe:${versions.arrow}"
-
-  // Isthmus: SQL -> Substrait conversion (test only — for building Substrait plans)
-  testImplementation('io.substrait:isthmus:0.78.0') {
-    exclude group: 'org.apache.calcite'
-    exclude group: 'org.apache.calcite.avatica'
-  }
-  testImplementation('io.substrait:core:0.78.0') {
-    exclude group: 'org.apache.calcite'
-    exclude group: 'org.apache.calcite.avatica'
-  }
-  testImplementation "com.google.protobuf:protobuf-java:${versions.protobuf}"
-
-  // Calcite (needed by Isthmus for catalog/type resolution)
-  testImplementation "org.apache.calcite:calcite-core:${calciteVersion}"
-  testImplementation "org.apache.calcite:calcite-linq4j:${calciteVersion}"
-  testImplementation "org.apache.calcite.avatica:avatica-core:1.27.0"
-  testRuntimeOnly "org.apache.calcite:calcite-server:${calciteVersion}"
-
-  // Jackson (needed by Isthmus/Substrait for extension YAML parsing)
-  testImplementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
-  testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-  testImplementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${versions.jackson}"
-  testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
-
-  // Runtime dependencies for Calcite/Isthmus
-  testRuntimeOnly "org.codehaus.janino:janino:3.1.12"
-  testRuntimeOnly "org.codehaus.janino:commons-compiler:3.1.12"
-  testRuntimeOnly 'org.jooq:joou-java-6:0.9.4'
-  testRuntimeOnly "org.apache.commons:commons-math3:3.6.1"
-  testRuntimeOnly "com.jayway.jsonpath:json-path:2.9.0"
-  testRuntimeOnly "org.locationtech.jts:jts-core:${versions.jts}"
-  testRuntimeOnly "org.yaml:snakeyaml:${versions.snakeyaml}"
-  testRuntimeOnly "commons-codec:commons-codec:${versions.commonscodec}"
-  testRuntimeOnly "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}"
-  testRuntimeOnly 'com.esri.geometry:esri-geometry-api:2.2.4'
 }
 
+// TODO: Remove once back-end is built out with test suite
 testingConventions.enabled = false
-thirdPartyAudit.enabled = false
-
-// Suppress -Werror and annotation warnings from Calcite/Arrow dependency jars
-tasks.withType(JavaCompile).configureEach {
-  doFirst {
-    options.compilerArgs.removeAll(['-Werror'])
-    options.compilerArgs.removeIf { it.startsWith('-Xlint') || it.startsWith('-Xdoclint') }
-    options.compilerArgs << '-Xlint:none'
-  }
-}
-
-configurations.all {
-  resolutionStrategy {
-    force 'com.google.guava:guava:33.4.0-jre'
-    force 'com.google.guava:failureaccess:1.0.2'
-    force 'com.google.errorprone:error_prone_annotations:2.36.0'
-    force 'org.checkerframework:checker-qual:3.43.0'
-    force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
-    force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-    force "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}"
-    force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
-    force "org.slf4j:slf4j-api:${versions.slf4j}"
-    force "org.locationtech.jts:jts-core:${versions.jts}"
-    force "org.yaml:snakeyaml:${versions.snakeyaml}"
-    force "commons-codec:commons-codec:${versions.commonscodec}"
-    force "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}"
-    force "commons-logging:commons-logging:1.2"
-    force "org.apache.commons:commons-lang3:3.13.0"
-    force "org.apache.httpcomponents.client5:httpclient5:5.5"
-    force "org.apache.httpcomponents.core5:httpcore5-h2:${versions.httpcore5}"
-  }
-}

sandbox/plugins/analytics-backend-datafusion/build.gradle

@@ -14,8 +14,6 @@
 
 apply plugin: 'opensearch.internal-cluster-test'
 
-def calciteVersion = '1.41.0'
-
 // SQL Unified Query API version (aligned with OpenSearch build version)
 def sqlUnifiedQueryVersion = '3.6.0.0-SNAPSHOT'
 
@@ -31,30 +29,23 @@ repositories {
   }
 }
 
-// Custom configuration for guava — Calcite's API leaks guava types but OpenSearch
-// forbids guava on compile classpaths. This bypasses the check while keeping guava
-// available for compilation. At runtime it comes transitively from calcite-core.
+// Guava comes transitively from calcite-core and unified-query — forbidden on
+// compile classpaths by OpenSearch. Main sources don't need it; test sources do
+// (Calcite API exposes ImmutableList, Predicate). Bypass via custom config.
 configurations {
-  calciteCompile
+  calciteTestCompile
   compileClasspath { exclude group: 'com.google.guava' }
   testCompileClasspath { exclude group: 'com.google.guava' }
 }
-sourceSets.main.compileClasspath += configurations.calciteCompile
-sourceSets.test.compileClasspath += configurations.calciteCompile
+sourceSets.test.compileClasspath += configurations.calciteTestCompile
 
 dependencies {
   // Shared types and SPI interfaces (QueryPlanExecutor, EngineBridge, EngineCapabilities, etc.)
+  // Also provides calcite-core transitively via api.
   api project(':sandbox:libs:analytics-framework')
 
-  // Calcite for OpenSearchSchemaBuilder
-  implementation "org.apache.calcite:calcite-core:${calciteVersion}"
-
-  // --- PPL test plugin dependencies ---
-
-  // Guava — Calcite's API exposes guava types (ImmutableList, Predicate).
-  // Added via custom config to bypass the forbidden-dependency check on compile classpaths.
-  // At runtime, guava is pulled transitively from calcite-core.
-  calciteCompile "com.google.guava:guava:${versions.guava}"
+  // Guava for test compilation — Calcite API exposes guava types
+  calciteTestCompile "com.google.guava:guava:${versions.guava}"
 
   // Calcite code generation (optional in calcite-core POM, needed at runtime for Enumerable pipeline)
   testRuntimeOnly "org.codehaus.janino:janino:3.1.12"
@@ -64,27 +55,22 @@ dependencies {
   testImplementation("org.opensearch.query:unified-query-api:${sqlUnifiedQueryVersion}") {
     exclude group: 'org.opensearch'
   }
-  testImplementation("org.opensearch.query:unified-query-ppl:${sqlUnifiedQueryVersion}") {
-    exclude group: 'org.opensearch'
-  }
-  testImplementation("org.opensearch.query:unified-query-common:${sqlUnifiedQueryVersion}") {
-    exclude group: 'org.opensearch'
-    exclude group: 'com.github.babbel'
-  }
   testImplementation("org.opensearch.query:unified-query-core:${sqlUnifiedQueryVersion}") {
     exclude group: 'org.opensearch'
   }
-  testImplementation("org.opensearch.query:unified-query-protocol:${sqlUnifiedQueryVersion}") {
+  testImplementation("org.opensearch.query:unified-query-ppl:${sqlUnifiedQueryVersion}") {
     exclude group: 'org.opensearch'
-    exclude group: 'com.github.babbel'
   }
 
   // Arrow Flight streaming transport for ITs
   internalClusterTestImplementation project(':plugins:arrow-flight-rpc')
+
+  // Calcite bytecode references @Immutable from immutables — resolve at test compile time
+  testCompileOnly 'org.immutables:value-annotations:2.8.8'
 }
 
 configurations.all {
-  // Globally exclude okhttp-aws-signer — transitive from unified-query-common,
+  // okhttp-aws-signer is a transitive dep of unified-query-common (via unified-query-core),
   // only published on JitPack, not needed for PPL parsing/planning
   exclude group: 'com.github.babbel', module: 'okhttp-aws-signer'
 
@@ -118,18 +104,6 @@ configurations.all {
   }
 }
 
-// Calcite pulls hundreds of optional transitive classes (guava, jackson, etc.)
-thirdPartyAudit.enabled = false
-
-// Suppress -Werror and annotation warnings from Calcite/Arrow dependency jars
-tasks.withType(JavaCompile).configureEach {
-  doFirst {
-    options.compilerArgs.removeAll(['-Werror'])
-    options.compilerArgs.removeIf { it.startsWith('-Xlint') || it.startsWith('-Xdoclint') }
-    options.compilerArgs << '-Xlint:none'
-  }
-}
-
 // Arrow/Flight requires these JVM flags
 internalClusterTest {
   jvmArgs '--add-opens=java.base/java.nio=ALL-UNNAMED'
@@ -142,8 +116,3 @@ internalClusterTest {
   systemProperty 'io.netty.tryReflectionSetAccessible', 'true'
   jvmArgs += ["--add-opens", "java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"]
 }
-
-tasks.named("dependencyLicenses").configure {
-  mapping from: /calcite-.*/, to: 'calcite'
-  mapping from: /jackson-.*/, to: 'jackson'
-}