remove use of svm

mpeddada1 · mpeddada1 · commit afc4d04939a9 · 2022-05-11T17:04:41.000-04:00
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
@@ -348,15 +348,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Native Image dependencies-->
-    <dependency>
-      <groupId>org.graalvm.nativeimage</groupId>
-      <artifactId>svm</artifactId>
-      <version>${graalvm.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Native Image dependencies-->
-
   </dependencies>
 
   <profiles>
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/nativeimage/SpannerFeature.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/nativeimage/SpannerFeature.java
@@ -17,14 +17,9 @@
 package com.google.cloud.spanner.nativeimage;
 
 import com.google.api.gax.nativeimage.NativeImageUtils;
-import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.configure.ResourcesRegistry;
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 /** Registers Spanner library classes for reflection. */
-@AutomaticFeature
 final class SpannerFeature implements Feature {
 
   private static final String SPANNER_CLASS = "com.google.spanner.v1.SpannerGrpc";
@@ -90,20 +85,6 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
           access, "com.google.spanner.admin.instance.v1.Instance");
       NativeImageUtils.registerClassForReflection(
           access, "com.google.spanner.admin.database.v1.RestoreInfo");
-
-      // Resources
-      ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-      resourcesRegistry.addResources(
-          ConfigurationCondition.alwaysTrue(),
-          "\\Qcom/google/cloud/spanner/connection/ClientSideStatements.json\\E");
-      resourcesRegistry.addResources(
-          ConfigurationCondition.alwaysTrue(),
-          "\\Qcom/google/cloud/spanner/connection/PG_ClientSideStatements.json\\E");
-      resourcesRegistry.addResources(
-          "\\Qcom/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json\\E");
-      resourcesRegistry.addResources(
-          ConfigurationCondition.alwaysTrue(),
-          "\\Qcom/google/cloud/spanner/connection/ITSqlScriptTest_TestQueryOptions.sql\\E");
     }
   }
 
diff --git a/google-cloud-spanner/src/test/resources/META-INF/native-image/native-image.properties b/google-cloud-spanner/src/test/resources/META-INF/native-image/native-image.properties
@@ -0,0 +1 @@
+Args = --features=com.google.cloud.spanner.nativeimage.SpannerFeature
diff --git a/google-cloud-spanner/src/test/resources/META-INF/native-image/resource-config.json b/google-cloud-spanner/src/test/resources/META-INF/native-image/resource-config.json
@@ -0,0 +1,8 @@
+{
+  "resources": [
+    {"pattern": "\\Qcom/google/cloud/spanner/connection/ClientSideStatements.json\\E"},
+    {"pattern": "\\Qcom/google/cloud/spanner/connection/PG_ClientSideStatements.json\\E"},
+    {"pattern": "\\Qcom/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json\\E"},
+    {"pattern": "\\Qcom/google/cloud/spanner/connection/ITSqlScriptTest_TestQueryOptions.sql\\E"}
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Args = --features=com.google.cloud.spanner.nativeimage.SpannerFeature`