merge main

deephaven · Jun 26, 2024 · b4ede0f · b4ede0f
2 parents 76814bc + 77b6c1c
commit b4ede0f
Show file tree

Hide file tree

Showing 153 changed files with 3,601 additions and 1,574 deletions.
diff --git a/Util/src/main/java/io/deephaven/util/datastructures/CachingSupplier.java b/Util/src/main/java/io/deephaven/util/datastructures/CachingSupplier.java
@@ -49,4 +49,14 @@ public OUTPUT_TYPE get() {
         }
         return cachedResult;
     }
+
+    public OUTPUT_TYPE getIfCached() {
+        if (hasCachedResult) { // force a volatile read
+            if (errorResult != null) {
+                throw errorResult;
+            }
+            return cachedResult;
+        }
+        return null;
+    }
 }
diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
@@ -126,10 +126,10 @@ class Classpaths {
     static final String HADOOP_VERSION = '3.4.0'
 
     static final String ICEBERG_GROUP = 'org.apache.iceberg'
-    static final String ICEBERG_VERSION = '1.5.0'
+    static final String ICEBERG_VERSION = '1.5.2'
 
     static final String AWSSDK_GROUP = 'software.amazon.awssdk'
-    static final String AWSSDK_VERSION = '2.23.19'
+    static final String AWSSDK_VERSION = '2.24.5'
 
     static final String TESTCONTAINER_GROUP = 'org.testcontainers'
     static final String TESTCONTAINER_VERSION = '1.19.4'