Merge pull request #585 from jamesnetherton/upgrade-libraries-bom

Upgrade com.google.cloud:libraries-bom to 26.33.0
quarkiverse · Feb 28, 2024 · 67ad283 · 67ad283
2 parents b4931fc + b9a957c
commit 67ad283
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -18,8 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <google-cloud-sdk.version>26.29.0</google-cloud-sdk.version>
-        <arrow.version>15.0.0</arrow.version>
+        <google-cloud-sdk.version>26.33.0</google-cloud-sdk.version>
 
         <!-- Dependency convergence issues -->
         <opencensus.version>0.31.1</opencensus.version><!-- mess in google-pubsub and grpc deps; should be rather stable as OpenCensus has been sunsetted already - see https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/862 -->
@@ -88,28 +87,6 @@
                 <version>${conscrypt.version}</version>
             </dependency>
 
-            <!-- Force Apache Arrow to fix a Netty native issue -->
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-vector</artifactId>
-                <version>${arrow.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-format</artifactId>
-                <version>${arrow.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-memory-core</artifactId>
-                <version>${arrow.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-memory-netty</artifactId>
-                <version>${arrow.version}</version>
-            </dependency>
-
             <!-- Google Cloud Services Extensions -->
             <dependency>
                 <groupId>io.quarkiverse.googlecloudservices</groupId>

diff --git a/.../src/main/java/io/quarkiverse/googlecloudservices/common/deployment/CommonBuildSteps.java b/.../src/main/java/io/quarkiverse/googlecloudservices/common/deployment/CommonBuildSteps.java
@@ -38,7 +38,9 @@ public RunTimeConfigBuilderBuildItem defaultsConfig() {
     @BuildStep
     public NativeImageConfigBuildItem nativeImageConfiguration() {
         NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder()
-                .addRuntimeReinitializedClass("com.sun.management.internal.PlatformMBeanProviderImpl");
+                .addRuntimeReinitializedClass("com.sun.management.internal.PlatformMBeanProviderImpl")
+                // Required due to sun.misc.Unsafe usage in static initializers
+                .addRuntimeReinitializedClass("com.google.common.cache.Striped64");
         return builder.build();
     }
 }