From b57f4a6b12fdbe8607f10401b4f3337a914e771a Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Tue, 6 Sep 2022 23:36:12 +0100 Subject: [PATCH] HHH-15484 Switch GraalVM native-image dependencies to org.graalvm.sdk:graal-sdk --- hibernate-graalvm/hibernate-graalvm.gradle | 2 +- .../hibernate/graalvm/internal/GraalVMStaticAutofeature.java | 2 -- .../org/hibernate/graalvm/internal/QueryParsingSupport.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hibernate-graalvm/hibernate-graalvm.gradle b/hibernate-graalvm/hibernate-graalvm.gradle index b92adda75f..628488a6c6 100644 --- a/hibernate-graalvm/hibernate-graalvm.gradle +++ b/hibernate-graalvm/hibernate-graalvm.gradle @@ -12,7 +12,7 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { //No need for transitive dependencies: this is all just metadata to be used as companion jar. compileOnly project( ':hibernate-core' ) - compileOnly "org.graalvm.nativeimage:svm:22.0.0.2" + compileOnly "org.graalvm.sdk:graal-sdk:22.2.0" testImplementation project( ':hibernate-core' ) } diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java index 34fb70f6ed..8ccfcfb60f 100644 --- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java +++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/GraalVMStaticAutofeature.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import org.hibernate.internal.util.ReflectHelper; -import com.oracle.svm.core.annotate.AutomaticFeature; import org.graalvm.nativeimage.hosted.Feature; import org.graalvm.nativeimage.hosted.RuntimeReflection; @@ -34,7 +33,6 @@ import org.graalvm.nativeimage.hosted.RuntimeReflection; *

* @author Sanne Grinovero */ -@AutomaticFeature public class GraalVMStaticAutofeature implements Feature { public void beforeAnalysis(Feature.BeforeAnalysisAccess before) { diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java index 106d3b4b21..cea8baed6d 100644 --- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java +++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/QueryParsingSupport.java @@ -14,7 +14,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.hibernate.internal.build.AllowSysOut; import org.hibernate.internal.util.ReflectHelper; -import com.oracle.svm.core.annotate.AutomaticFeature; import org.graalvm.nativeimage.hosted.Feature; import org.graalvm.nativeimage.hosted.RuntimeReflection; @@ -33,7 +32,6 @@ import org.graalvm.nativeimage.hosted.RuntimeReflection; * * @author Sanne Grinovero */ -@AutomaticFeature public final class QueryParsingSupport implements Feature { private final AtomicBoolean triggered = new AtomicBoolean( false);