Addressing PR comments.

buildSrc/src/main/groovy/Classpaths.groovy

@@ -132,6 +132,9 @@ class Classpaths {
     static final String AWSSDK_GROUP = 'software.amazon.awssdk'
     static final String AWSSDK_VERSION = '2.23.19'
 
+    static final String TESTCONTAINER_GROUP = 'org.testcontainers'
+    static final String TESTCONTAINER_VERSION = '1.19.4'
+
     static boolean addDependency(Configuration conf, String group, String name, String version, Action<? super DefaultExternalModuleDependency> configure = Actions.doNothing()) {
         if (!conf.dependencies.find { it.name == name && it.group == group}) {
             DefaultExternalModuleDependency dep = dependency group, name, version
@@ -335,7 +338,6 @@ class Classpaths {
         Configuration config = p.configurations.getByName(configName)
         addDependency(config, p.getDependencies().platform(ICEBERG_GROUP + ":iceberg-bom:" + ICEBERG_VERSION))
 
-        addDependency(config, ICEBERG_GROUP, 'iceberg-bom', ICEBERG_VERSION)
         addDependency(config, ICEBERG_GROUP, 'iceberg-core', ICEBERG_VERSION)
         addDependency(config, ICEBERG_GROUP, 'iceberg-bundled-guava', ICEBERG_VERSION)
     }
@@ -350,9 +352,9 @@ class Classpaths {
 
     static void inheritTestContainers(Project p, String configName = JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME) {
         Configuration config = p.configurations.getByName(configName)
-        addDependency(config, 'org.testcontainers', 'testcontainers', '1.19.4')
-        addDependency(config, 'org.testcontainers', 'junit-jupiter', '1.19.4')
-        addDependency(config, 'org.testcontainers', 'localstack', '1.19.4')
-        addDependency(config, 'org.testcontainers', 'minio', '1.19.4')
+        addDependency(config, TESTCONTAINER_GROUP, 'testcontainers', TESTCONTAINER_VERSION)
+        addDependency(config, TESTCONTAINER_GROUP, 'junit-jupiter', TESTCONTAINER_VERSION)
+        addDependency(config, TESTCONTAINER_GROUP, 'localstack', TESTCONTAINER_VERSION)
+        addDependency(config, TESTCONTAINER_GROUP, 'minio', TESTCONTAINER_VERSION)
     }
 }

extensions/iceberg/build.gradle

@@ -16,21 +16,21 @@ dependencies {
     Classpaths.inheritAutoService(project)
     Classpaths.inheritImmutables(project)
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-
     Classpaths.inheritParquetHadoop(project)
 
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
     implementation project(':extensions-parquet-base')
     implementation project(':extensions-parquet-table')
 
     Classpaths.inheritIcebergCore(project)
     Classpaths.inheritIcebergHadoop(project)
 
+    Classpaths.inheritJUnitPlatform(project)
+    Classpaths.inheritAssertJ(project)
+
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
     Classpaths.inheritTestContainers(project)
 
     testRuntimeOnly project(':test-configs')

extensions/iceberg-aws/src/main/java/io/deephaven/iceberg/util/IcebergToolsAWS.java → extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/IcebergToolsS3.java

@@ -19,7 +19,8 @@
 /**
  * Tools for accessing tables in the Iceberg table format.
  */
-public class IcebergToolsAWS extends IcebergTools {
+@SuppressWarnings("unused")
+public class IcebergToolsS3 extends IcebergTools {
     private static final String S3_FILE_IO_CLASS = "org.apache.iceberg.aws.s3.S3FileIO";
 
     public static IcebergCatalogAdapter createS3Rest(

extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java

@@ -36,7 +36,6 @@
 
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -109,8 +108,6 @@ private static TableDefinition fromSchema(
      * @return The converted Deephaven type.
      */
     static io.deephaven.qst.type.Type<?> convertPrimitiveType(@NotNull final Type icebergType) {
-        final OffsetDateTime now = OffsetDateTime.now().plusSeconds(1);
-
         final Type.TypeID typeId = icebergType.typeId();
         switch (typeId) {
             case BOOLEAN:

py/embedded-server/java-runtime/build.gradle

@@ -32,7 +32,7 @@ dependencies {
 
     if (!hasProperty('excludeS3')) {
         runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-aws')
+        runtimeOnly project(':extensions-iceberg:s3')
     }
 }
 

server/jetty-app-custom/build.gradle

@@ -55,7 +55,7 @@ if (!hasProperty('excludeSql')) {
 if (!hasProperty('excludeS3')) {
     dependencies {
         runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-aws')
+        runtimeOnly project(':extensions-iceberg:s3')
     }
 }
 

server/jetty-app/build.gradle

@@ -54,7 +54,7 @@ if (!hasProperty('excludeSql')) {
 if (!hasProperty('excludeS3')) {
     dependencies {
         runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-aws')
+        runtimeOnly project(':extensions-iceberg:s3')
     }
 }
 

server/netty-app/build.gradle

@@ -54,7 +54,7 @@ if (!hasProperty('excludeSql')) {
 if (!hasProperty('excludeS3')) {
     dependencies {
         runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-aws')
+        runtimeOnly project(':extensions-iceberg:s3')
     }
 }
 

settings.gradle

@@ -270,8 +270,8 @@ project(':extensions-s3').projectDir = file('extensions/s3')
 include(':extensions-iceberg')
 project(':extensions-iceberg').projectDir = file('extensions/iceberg')
 
-include(':extensions-iceberg-aws')
-project(':extensions-iceberg-aws').projectDir = file('extensions/iceberg-aws')
+include(':extensions-iceberg:s3')
+project(':extensions-iceberg:s3').projectDir = file('extensions/iceberg/s3')
 
 include(':plugin')