From 33ea19d16e8b16e470617989577e00d26cb74638 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Wed, 15 Jan 2020 23:43:30 +0100 Subject: [PATCH 1/6] Support both GraalVM 19.2.1 and 19.3.1 --- bom/runtime/pom.xml | 6 ++--- build-parent/pom.xml | 2 +- .../quarkus/deployment/pkg/NativeConfig.java | 2 +- .../pkg/steps/NativeImageBuildStep.java | 7 +++--- .../steps/NativeImageAutoFeatureStep.java | 24 ++++++++++++++++++- core/runtime/pom.xml | 2 +- core/test-extension/runtime/pom.xml | 2 +- extensions/agroal/runtime/pom.xml | 2 +- .../amazon-lambda-http/deployment/pom.xml | 2 +- extensions/amazon-lambda-http/runtime/pom.xml | 2 +- extensions/artemis-core/runtime/pom.xml | 2 +- .../azure-functions-http/deployment/pom.xml | 2 +- .../azure-functions-http/runtime/pom.xml | 2 +- extensions/caffeine/runtime/pom.xml | 2 +- .../elasticsearch-rest-client/runtime/pom.xml | 2 +- .../elytron-security-common/runtime/pom.xml | 2 +- .../runtime/pom.xml | 2 +- extensions/elytron-security/runtime/pom.xml | 2 +- extensions/flyway/runtime/pom.xml | 2 +- extensions/hibernate-orm/runtime/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../hibernate-validator/runtime/pom.xml | 2 +- extensions/infinispan-client/runtime/pom.xml | 2 +- .../infinispan-embedded/runtime/pom.xml | 2 +- extensions/jaeger/runtime/pom.xml | 2 +- extensions/jaxb/runtime/pom.xml | 2 +- extensions/jdbc/jdbc-derby/runtime/pom.xml | 2 +- extensions/jdbc/jdbc-h2/runtime/pom.xml | 2 +- extensions/jdbc/jdbc-mariadb/runtime/pom.xml | 2 +- extensions/jdbc/jdbc-mssql/runtime/pom.xml | 2 +- extensions/jdbc/jdbc-mysql/runtime/pom.xml | 2 +- .../jdbc/jdbc-postgresql/runtime/pom.xml | 2 +- extensions/jgit/runtime/pom.xml | 2 +- extensions/jsch/runtime/pom.xml | 2 +- extensions/kafka-client/runtime/pom.xml | 2 +- extensions/kafka-streams/runtime/pom.xml | 2 +- extensions/kubernetes-client/runtime/pom.xml | 2 +- extensions/logging-gelf/runtime/pom.xml | 2 +- extensions/mongodb-client/runtime/pom.xml | 2 +- extensions/narayana-jta/runtime/pom.xml | 2 +- extensions/narayana-stm/runtime/pom.xml | 2 +- extensions/neo4j/runtime/pom.xml | 2 +- extensions/netty/runtime/pom.xml | 2 +- extensions/quartz/runtime/pom.xml | 2 +- extensions/rest-client/runtime/pom.xml | 2 +- extensions/resteasy-common/deployment/pom.xml | 2 +- extensions/resteasy-common/runtime/pom.xml | 2 +- extensions/resteasy/deployment/pom.xml | 2 +- extensions/security/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../smallrye-fault-tolerance/runtime/pom.xml | 2 +- .../smallrye-opentracing/runtime/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../undertow-websockets/runtime/pom.xml | 2 +- extensions/undertow/runtime/pom.xml | 2 +- extensions/vertx-core/runtime/pom.xml | 2 +- extensions/vertx/runtime/pom.xml | 2 +- 59 files changed, 86 insertions(+), 63 deletions(-) diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 11a857d40cc45..b1bde30df7674 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -74,7 +74,7 @@ 3.5.2 1.7.1 - 19.3.0.2 + 19.2.1 1.0.0.Final 2.10.2 1.0.0.Final @@ -841,7 +841,7 @@ ${jboss-logmanager.version} - org.graalvm.nativeimage + com.oracle.substratevm svm @@ -1653,7 +1653,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm ${graal-sdk.version} provided diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 1696e01832d63..d966123941e14 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -32,7 +32,7 @@ - 19.3.0.2 + 19.2.1 4.1.1 0.0.9 3.8.4 diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java index 3858195aa5b71..f1aa185da8574 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java @@ -132,7 +132,7 @@ public class NativeConfig { /** * The docker image to use to do the image build */ - @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.3.0.2-java8") + @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.2.1") public String builderImage; /** diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 8777a8ff9a319..4d365cd7e7699 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -322,12 +322,13 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa private void checkGraalVMVersion(String version) { log.info("Running Quarkus native-image plugin on " + version); - final List obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2."); + final List obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2.0"); final boolean vmVersionIsObsolete = version.contains(" 19.3.0 ") || obsoleteGraalVmVersions.stream().anyMatch(v -> version.contains(" " + v)); if (vmVersionIsObsolete) { - throw new IllegalStateException( - "Out of date build of GraalVM detected: " + version + ". Please upgrade to GraalVM 19.3.0.2"); + throw new IllegalStateException("Unsupported version of GraalVM detected: " + version + "." + + " Quarkus currently offers a stable support of GraalVM 19.2.1 and a preview support of GraalVM 19.3.1." + + " Please upgrade GraalVM to one of these versions."); } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java index 776aeb77a2860..004f70ef28c06 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java @@ -43,6 +43,7 @@ import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.deployment.builditem.nativeimage.UnsafeAccessedFieldBuildItem; +import io.quarkus.gizmo.AssignableResultHandle; import io.quarkus.gizmo.CatchBlockCreator; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.ClassOutput; @@ -66,6 +67,8 @@ public class NativeImageAutoFeatureStep { static final String BEFORE_ANALYSIS_ACCESS = Feature.BeforeAnalysisAccess.class.getName(); static final String DYNAMIC_PROXY_REGISTRY = "com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry"; static final String LOCALIZATION_FEATURE = "com.oracle.svm.core.jdk.LocalizationFeature"; + // TODO: Delete the following line when Quarkus no longer supports GraalVM 19.2.1. + static final String LOCALIZATION_SUPPORT = "com.oracle.svm.core.jdk.LocalizationSupport"; @BuildStep List registerPackageResources( @@ -205,7 +208,26 @@ public void write(String s, byte[] bytes) { } if (!resourceBundles.isEmpty()) { - ResultHandle locClass = overallCatch.loadClass(LOCALIZATION_FEATURE); + /* + * Start of a temporary workaround to support both GraalVM 19.2.1 and 19.3.1 at the same time. + * TODO: Delete this workaround when Quarkus no longer supports GraalVM 19.2.1. + */ + AssignableResultHandle locClass = overallCatch.createVariable(Class.class); + TryBlock workaroundTryBlock = overallCatch.tryBlock(); + workaroundTryBlock.assign(locClass, workaroundTryBlock.loadClass(LOCALIZATION_FEATURE)); + // The following line is required to throw an exception and make sure we load the 19.2.1 class when needed. + workaroundTryBlock.invokeVirtualMethod( + ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), locClass, + workaroundTryBlock.load("addBundleToCache"), + workaroundTryBlock.marshalAsArray(Class.class, workaroundTryBlock.loadClass(String.class))); + CatchBlockCreator workaroundCatchBlock = workaroundTryBlock.addCatch(Throwable.class); + workaroundCatchBlock.assign(locClass, workaroundCatchBlock.loadClass(LOCALIZATION_SUPPORT)); + /* + * End of the temporary workaround. + */ + + // TODO: Uncomment the following line when the temporary workaround above is deleted. + //ResultHandle locClass = overallCatch.loadClass(LOCALIZATION_FEATURE); ResultHandle params = overallCatch.marshalAsArray(Class.class, overallCatch.loadClass(String.class)); ResultHandle registerMethod = overallCatch.invokeVirtualMethod( diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index d749efc30781d..8337866bb83ff 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -70,7 +70,7 @@ graal-sdk - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/core/test-extension/runtime/pom.xml b/core/test-extension/runtime/pom.xml index 195aa6ed065e5..208261cf59b6e 100644 --- a/core/test-extension/runtime/pom.xml +++ b/core/test-extension/runtime/pom.xml @@ -31,7 +31,7 @@ quarkus-arc - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/agroal/runtime/pom.xml b/extensions/agroal/runtime/pom.xml index 1f464a463eda3..8ac3373d62ce9 100644 --- a/extensions/agroal/runtime/pom.xml +++ b/extensions/agroal/runtime/pom.xml @@ -27,7 +27,7 @@ quarkus-narayana-jta - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/amazon-lambda-http/deployment/pom.xml b/extensions/amazon-lambda-http/deployment/pom.xml index 94476ebeb81b6..511d6393b3c67 100644 --- a/extensions/amazon-lambda-http/deployment/pom.xml +++ b/extensions/amazon-lambda-http/deployment/pom.xml @@ -32,7 +32,7 @@ quarkus-amazon-lambda-http - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/amazon-lambda-http/runtime/pom.xml b/extensions/amazon-lambda-http/runtime/pom.xml index 6cc3acf55e907..9dc609d58a669 100644 --- a/extensions/amazon-lambda-http/runtime/pom.xml +++ b/extensions/amazon-lambda-http/runtime/pom.xml @@ -33,7 +33,7 @@ aws-serverless-java-container-core - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/artemis-core/runtime/pom.xml b/extensions/artemis-core/runtime/pom.xml index c08161d8bcaa6..2ce771b64827b 100644 --- a/extensions/artemis-core/runtime/pom.xml +++ b/extensions/artemis-core/runtime/pom.xml @@ -65,7 +65,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/azure-functions-http/deployment/pom.xml b/extensions/azure-functions-http/deployment/pom.xml index b80d6dc35f14c..bf6846299c1ce 100644 --- a/extensions/azure-functions-http/deployment/pom.xml +++ b/extensions/azure-functions-http/deployment/pom.xml @@ -23,7 +23,7 @@ quarkus-vertx-http-deployment - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/azure-functions-http/runtime/pom.xml b/extensions/azure-functions-http/runtime/pom.xml index 353b363fdeae2..da4ad843166eb 100644 --- a/extensions/azure-functions-http/runtime/pom.xml +++ b/extensions/azure-functions-http/runtime/pom.xml @@ -24,7 +24,7 @@ quarkus-core - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/caffeine/runtime/pom.xml b/extensions/caffeine/runtime/pom.xml index aa917db6e66a0..2246644b68522 100644 --- a/extensions/caffeine/runtime/pom.xml +++ b/extensions/caffeine/runtime/pom.xml @@ -18,7 +18,7 @@ caffeine - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/elasticsearch-rest-client/runtime/pom.xml b/extensions/elasticsearch-rest-client/runtime/pom.xml index c12933c484ba6..3f269656070bf 100644 --- a/extensions/elasticsearch-rest-client/runtime/pom.xml +++ b/extensions/elasticsearch-rest-client/runtime/pom.xml @@ -43,7 +43,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/elytron-security-common/runtime/pom.xml b/extensions/elytron-security-common/runtime/pom.xml index 6337720a62ac9..dff337ab6810f 100644 --- a/extensions/elytron-security-common/runtime/pom.xml +++ b/extensions/elytron-security-common/runtime/pom.xml @@ -18,7 +18,7 @@ quarkus-core - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/elytron-security-properties-file/runtime/pom.xml b/extensions/elytron-security-properties-file/runtime/pom.xml index 6017955d47d95..0cbc3141c4543 100644 --- a/extensions/elytron-security-properties-file/runtime/pom.xml +++ b/extensions/elytron-security-properties-file/runtime/pom.xml @@ -27,7 +27,7 @@ quarkus-elytron-security - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/elytron-security/runtime/pom.xml b/extensions/elytron-security/runtime/pom.xml index 82908be7f47d0..f52ae5e738f24 100644 --- a/extensions/elytron-security/runtime/pom.xml +++ b/extensions/elytron-security/runtime/pom.xml @@ -27,7 +27,7 @@ quarkus-vertx-http - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/flyway/runtime/pom.xml b/extensions/flyway/runtime/pom.xml index 651367e3da86a..4ce1b1c881d6d 100644 --- a/extensions/flyway/runtime/pom.xml +++ b/extensions/flyway/runtime/pom.xml @@ -30,7 +30,7 @@ quarkus-narayana-jta - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml index 3719a1bc5425e..2b704d7ba25ec 100644 --- a/extensions/hibernate-orm/runtime/pom.xml +++ b/extensions/hibernate-orm/runtime/pom.xml @@ -91,7 +91,7 @@ jakarta.transaction-api - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/hibernate-search-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-elasticsearch/runtime/pom.xml index 9118d971db2d7..56449247de528 100644 --- a/extensions/hibernate-search-elasticsearch/runtime/pom.xml +++ b/extensions/hibernate-search-elasticsearch/runtime/pom.xml @@ -35,7 +35,7 @@ hibernate-search-mapper-orm - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/hibernate-validator/runtime/pom.xml b/extensions/hibernate-validator/runtime/pom.xml index d19c75c3ef356..7183ba22ea317 100644 --- a/extensions/hibernate-validator/runtime/pom.xml +++ b/extensions/hibernate-validator/runtime/pom.xml @@ -58,7 +58,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml index 231597bd62bb7..0cc55e17b2603 100644 --- a/extensions/infinispan-client/runtime/pom.xml +++ b/extensions/infinispan-client/runtime/pom.xml @@ -93,7 +93,7 @@ protostream-processor - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/infinispan-embedded/runtime/pom.xml b/extensions/infinispan-embedded/runtime/pom.xml index c923679a6f8fc..ea450674da85d 100644 --- a/extensions/infinispan-embedded/runtime/pom.xml +++ b/extensions/infinispan-embedded/runtime/pom.xml @@ -57,7 +57,7 @@ jakarta.transaction-api - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jaeger/runtime/pom.xml b/extensions/jaeger/runtime/pom.xml index 5925e55b73e00..552f9fc3751f7 100644 --- a/extensions/jaeger/runtime/pom.xml +++ b/extensions/jaeger/runtime/pom.xml @@ -27,7 +27,7 @@ jaeger-thrift - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jaxb/runtime/pom.xml b/extensions/jaxb/runtime/pom.xml index 7e4aa5bab9d3e..3d91533a1042d 100644 --- a/extensions/jaxb/runtime/pom.xml +++ b/extensions/jaxb/runtime/pom.xml @@ -15,7 +15,7 @@ XML serialization support - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jdbc/jdbc-derby/runtime/pom.xml b/extensions/jdbc/jdbc-derby/runtime/pom.xml index 29909c78e29f6..bab7a00fb7012 100644 --- a/extensions/jdbc/jdbc-derby/runtime/pom.xml +++ b/extensions/jdbc/jdbc-derby/runtime/pom.xml @@ -22,7 +22,7 @@ derbyclient - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jdbc/jdbc-h2/runtime/pom.xml b/extensions/jdbc/jdbc-h2/runtime/pom.xml index d15aeb177e264..ef7f584445901 100644 --- a/extensions/jdbc/jdbc-h2/runtime/pom.xml +++ b/extensions/jdbc/jdbc-h2/runtime/pom.xml @@ -28,7 +28,7 @@ --> - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jdbc/jdbc-mariadb/runtime/pom.xml b/extensions/jdbc/jdbc-mariadb/runtime/pom.xml index 550d0382e5d55..9e37c30953be4 100644 --- a/extensions/jdbc/jdbc-mariadb/runtime/pom.xml +++ b/extensions/jdbc/jdbc-mariadb/runtime/pom.xml @@ -18,7 +18,7 @@ mariadb-java-client - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jdbc/jdbc-mssql/runtime/pom.xml b/extensions/jdbc/jdbc-mssql/runtime/pom.xml index 1bdebd9b64dea..59239e66d20ba 100644 --- a/extensions/jdbc/jdbc-mssql/runtime/pom.xml +++ b/extensions/jdbc/jdbc-mssql/runtime/pom.xml @@ -66,7 +66,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jdbc/jdbc-mysql/runtime/pom.xml b/extensions/jdbc/jdbc-mysql/runtime/pom.xml index 019f1e3be1161..6f01b9ed12158 100644 --- a/extensions/jdbc/jdbc-mysql/runtime/pom.xml +++ b/extensions/jdbc/jdbc-mysql/runtime/pom.xml @@ -22,7 +22,7 @@ mysql-connector-java - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml index 208186fd9646b..30660ebf35a2a 100644 --- a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml +++ b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml @@ -18,7 +18,7 @@ postgresql - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jgit/runtime/pom.xml b/extensions/jgit/runtime/pom.xml index aa16e954a1d42..9ae1132e76bc6 100644 --- a/extensions/jgit/runtime/pom.xml +++ b/extensions/jgit/runtime/pom.xml @@ -15,7 +15,7 @@ Access your Git repositories - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/jsch/runtime/pom.xml b/extensions/jsch/runtime/pom.xml index a25f26e47fe8c..2b6bf18b4ed13 100644 --- a/extensions/jsch/runtime/pom.xml +++ b/extensions/jsch/runtime/pom.xml @@ -16,7 +16,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/kafka-client/runtime/pom.xml b/extensions/kafka-client/runtime/pom.xml index ed5db7fabd3df..382b3ecc0dbd8 100644 --- a/extensions/kafka-client/runtime/pom.xml +++ b/extensions/kafka-client/runtime/pom.xml @@ -40,7 +40,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/kafka-streams/runtime/pom.xml b/extensions/kafka-streams/runtime/pom.xml index 04836450a7c8d..2be409ef18ac1 100644 --- a/extensions/kafka-streams/runtime/pom.xml +++ b/extensions/kafka-streams/runtime/pom.xml @@ -31,7 +31,7 @@ kafka-streams - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/kubernetes-client/runtime/pom.xml b/extensions/kubernetes-client/runtime/pom.xml index 9a352b5b456f6..1d175d63e4d33 100644 --- a/extensions/kubernetes-client/runtime/pom.xml +++ b/extensions/kubernetes-client/runtime/pom.xml @@ -23,7 +23,7 @@ quarkus-jackson - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/logging-gelf/runtime/pom.xml b/extensions/logging-gelf/runtime/pom.xml index c275db7c06231..0e3be8d0bdae6 100644 --- a/extensions/logging-gelf/runtime/pom.xml +++ b/extensions/logging-gelf/runtime/pom.xml @@ -20,7 +20,7 @@ logstash-gelf - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/mongodb-client/runtime/pom.xml b/extensions/mongodb-client/runtime/pom.xml index 8012cc7446360..5324fc3b2013d 100644 --- a/extensions/mongodb-client/runtime/pom.xml +++ b/extensions/mongodb-client/runtime/pom.xml @@ -45,7 +45,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml index 78b06a9212007..cfe45f6a03c73 100644 --- a/extensions/narayana-jta/runtime/pom.xml +++ b/extensions/narayana-jta/runtime/pom.xml @@ -45,7 +45,7 @@ smallrye-reactive-converter-api - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/narayana-stm/runtime/pom.xml b/extensions/narayana-stm/runtime/pom.xml index dfb3dfb03c57f..86d9825403c82 100644 --- a/extensions/narayana-stm/runtime/pom.xml +++ b/extensions/narayana-stm/runtime/pom.xml @@ -23,7 +23,7 @@ quarkus-core - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/neo4j/runtime/pom.xml b/extensions/neo4j/runtime/pom.xml index 579406480e685..7f824f086e30f 100644 --- a/extensions/neo4j/runtime/pom.xml +++ b/extensions/neo4j/runtime/pom.xml @@ -27,7 +27,7 @@ true - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/netty/runtime/pom.xml b/extensions/netty/runtime/pom.xml index 034b97477a8bc..e84ebb0050580 100644 --- a/extensions/netty/runtime/pom.xml +++ b/extensions/netty/runtime/pom.xml @@ -36,7 +36,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/quartz/runtime/pom.xml b/extensions/quartz/runtime/pom.xml index b558869c18f4c..ae65931098b48 100644 --- a/extensions/quartz/runtime/pom.xml +++ b/extensions/quartz/runtime/pom.xml @@ -24,7 +24,7 @@ quarkus-scheduler - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/rest-client/runtime/pom.xml b/extensions/rest-client/runtime/pom.xml index 2686ff5db481f..e7cd65dde329e 100644 --- a/extensions/rest-client/runtime/pom.xml +++ b/extensions/rest-client/runtime/pom.xml @@ -58,7 +58,7 @@ commons-logging-jboss-logging - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/resteasy-common/deployment/pom.xml b/extensions/resteasy-common/deployment/pom.xml index fc9ea9c2961eb..7f04f1644cfac 100644 --- a/extensions/resteasy-common/deployment/pom.xml +++ b/extensions/resteasy-common/deployment/pom.xml @@ -31,7 +31,7 @@ quarkus-arc-deployment - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/resteasy-common/runtime/pom.xml b/extensions/resteasy-common/runtime/pom.xml index 6d553d8f62029..12fdcd0bda0ce 100644 --- a/extensions/resteasy-common/runtime/pom.xml +++ b/extensions/resteasy-common/runtime/pom.xml @@ -15,7 +15,7 @@ REST framework implementing JAX-RS and more - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/resteasy/deployment/pom.xml b/extensions/resteasy/deployment/pom.xml index ccb5aa8354c4f..0c1f1e66a00da 100644 --- a/extensions/resteasy/deployment/pom.xml +++ b/extensions/resteasy/deployment/pom.xml @@ -39,7 +39,7 @@ quarkus-security-spi - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/security/runtime/pom.xml b/extensions/security/runtime/pom.xml index 2b2a2dee44ce1..40136711a0b3e 100644 --- a/extensions/security/runtime/pom.xml +++ b/extensions/security/runtime/pom.xml @@ -23,7 +23,7 @@ jakarta.interceptor-api - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/smallrye-fault-tolerance/deployment/pom.xml b/extensions/smallrye-fault-tolerance/deployment/pom.xml index 4927005c5d9f6..c96bd88afac5c 100644 --- a/extensions/smallrye-fault-tolerance/deployment/pom.xml +++ b/extensions/smallrye-fault-tolerance/deployment/pom.xml @@ -31,7 +31,7 @@ quarkus-smallrye-fault-tolerance - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/smallrye-fault-tolerance/runtime/pom.xml b/extensions/smallrye-fault-tolerance/runtime/pom.xml index 53da9a7c4edd1..8284aa06e61a6 100644 --- a/extensions/smallrye-fault-tolerance/runtime/pom.xml +++ b/extensions/smallrye-fault-tolerance/runtime/pom.xml @@ -50,7 +50,7 @@ commons-logging-jboss-logging - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/smallrye-opentracing/runtime/pom.xml b/extensions/smallrye-opentracing/runtime/pom.xml index e3b9f8f823e94..3b4b099c8491b 100644 --- a/extensions/smallrye-opentracing/runtime/pom.xml +++ b/extensions/smallrye-opentracing/runtime/pom.xml @@ -57,7 +57,7 @@ jakarta.servlet-api - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml b/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml index 6ff8897875253..5ce1596f590f0 100644 --- a/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml @@ -54,7 +54,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml index 2499bff2d963f..4144091a790e7 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml @@ -66,7 +66,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml index f47ec2dc9b344..fc6ca58cc3dc4 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml @@ -50,7 +50,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/undertow-websockets/runtime/pom.xml b/extensions/undertow-websockets/runtime/pom.xml index 67e66d5deb9e6..e4e727a4a4330 100644 --- a/extensions/undertow-websockets/runtime/pom.xml +++ b/extensions/undertow-websockets/runtime/pom.xml @@ -16,7 +16,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/undertow/runtime/pom.xml b/extensions/undertow/runtime/pom.xml index b4bf23076f96b..6465349bedb6c 100644 --- a/extensions/undertow/runtime/pom.xml +++ b/extensions/undertow/runtime/pom.xml @@ -37,7 +37,7 @@ jakarta.enterprise.cdi-api - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/vertx-core/runtime/pom.xml b/extensions/vertx-core/runtime/pom.xml index ea903f40e0974..ceaf0211ebc63 100644 --- a/extensions/vertx-core/runtime/pom.xml +++ b/extensions/vertx-core/runtime/pom.xml @@ -42,7 +42,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm diff --git a/extensions/vertx/runtime/pom.xml b/extensions/vertx/runtime/pom.xml index 0b7164bb5495a..b86c2cb88766d 100644 --- a/extensions/vertx/runtime/pom.xml +++ b/extensions/vertx/runtime/pom.xml @@ -57,7 +57,7 @@ - org.graalvm.nativeimage + com.oracle.substratevm svm From 27af95ccbf1643dfd5ecbb36c18ec3d36747eeef Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Thu, 16 Jan 2020 01:53:35 +0100 Subject: [PATCH 2/6] Fix quarkus-integration-test-infinispan-embedded in native mode --- integration-tests/infinispan-embedded/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/infinispan-embedded/pom.xml b/integration-tests/infinispan-embedded/pom.xml index 61d1046f266e5..062440a70d3a1 100644 --- a/integration-tests/infinispan-embedded/pom.xml +++ b/integration-tests/infinispan-embedded/pom.xml @@ -141,7 +141,7 @@ false - -H:ResourceConfigurationFiles=${project.basedir}/src/main/resources/resources-config.json + -H:ResourceConfigurationFiles=resources-config.json ${graalvmHome} From 9b74e0e327cbdcd7fd87b54a265602c57d5904e9 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Thu, 16 Jan 2020 02:11:43 +0100 Subject: [PATCH 3/6] Disable quarkus-integration-test-jsch in native mode temporarily --- .../jsch/src/test/java/io/quarkus/it/jsch/JSchTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/jsch/src/test/java/io/quarkus/it/jsch/JSchTest.java b/integration-tests/jsch/src/test/java/io/quarkus/it/jsch/JSchTest.java index f6cc8e2432ec0..2d54975af02fb 100644 --- a/integration-tests/jsch/src/test/java/io/quarkus/it/jsch/JSchTest.java +++ b/integration-tests/jsch/src/test/java/io/quarkus/it/jsch/JSchTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import io.quarkus.test.junit.DisabledOnNativeImage; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest @@ -37,6 +38,7 @@ public void setupSSHDServer() throws Exception { } @Test + @DisabledOnNativeImage("This test fails with GraalVM 19.2.1 but is successful with GraalVM 19.3.1") void shouldConnect() { given().queryParam("host", sshd.getHost()) .queryParam("port", sshd.getPort()) From 5cbefa6ffcd9fec6a5677ee1b6ab481db9214466 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Thu, 16 Jan 2020 02:11:43 +0100 Subject: [PATCH 4/6] Remove useless project.version in quarkus-narayana-stm-deployment --- extensions/narayana-stm/deployment/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/narayana-stm/deployment/pom.xml b/extensions/narayana-stm/deployment/pom.xml index 134fe3cf1705c..316384f4f324c 100644 --- a/extensions/narayana-stm/deployment/pom.xml +++ b/extensions/narayana-stm/deployment/pom.xml @@ -25,7 +25,6 @@ io.quarkus quarkus-narayana-stm - ${project.version} From dea977da7c72e6e18f79cf709199ff411ebe9205 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Thu, 16 Jan 2020 12:01:40 +0100 Subject: [PATCH 5/6] Disable JNI by default with GraalVM 19.2.1 --- .../src/main/java/io/quarkus/deployment/pkg/NativeConfig.java | 2 +- .../io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java | 2 +- .../src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java | 2 +- .../maven/src/main/java/io/quarkus/maven/NativeImageMojo.java | 2 +- .../create-extension-templates/integration-test-pom.xml | 1 + integration-tests/amazon-lambda-http-resteasy/pom.xml | 1 + integration-tests/amazon-lambda-http/pom.xml | 1 + integration-tests/amazon-lambda/pom.xml | 1 + integration-tests/elytron-security-jdbc/pom.xml | 1 + integration-tests/flyway/pom.xml | 1 + integration-tests/hibernate-orm-panache/pom.xml | 1 + integration-tests/hibernate-search-elasticsearch/pom.xml | 1 + integration-tests/hibernate-validator/pom.xml | 1 + integration-tests/infinispan-cache-jpa/pom.xml | 1 + integration-tests/infinispan-embedded/pom.xml | 1 + integration-tests/jpa-derby/pom.xml | 1 + integration-tests/jpa-h2/pom.xml | 1 + integration-tests/jpa-mariadb/pom.xml | 1 + integration-tests/jpa-mssql/pom.xml | 1 + integration-tests/jpa-mysql/pom.xml | 1 + integration-tests/jpa-postgresql/pom.xml | 1 + integration-tests/jpa-without-entity/pom.xml | 1 + .../create-extension-pom-itest/integration-tests/itest/pom.xml | 1 + integration-tests/vault-app/pom.xml | 1 + integration-tests/vertx-graphql/pom.xml | 1 + integration-tests/vertx-http/pom.xml | 1 + 26 files changed, 26 insertions(+), 4 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java index f1aa185da8574..df72dd3f5401a 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java @@ -38,7 +38,7 @@ public class NativeConfig { /** * If JNI should be enabled */ - @ConfigItem(defaultValue = "true") + @ConfigItem(defaultValue = "false") public boolean enableJni; /** diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 4d365cd7e7699..2630ad2c7832a 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -266,7 +266,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa if (!nativeConfig.enableIsolates) { command.add("-H:-SpawnIsolates"); } - if (nativeConfig.enableJni) { + if (nativeConfig.enableJni || (graalVMVersion.isPresent() && !graalVMVersion.get().contains(" 19.2."))) { command.add("-H:+JNI"); } else { command.add("-H:-JNI"); diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java index aec8226e8054d..0c34eb843cfe0 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java @@ -46,7 +46,7 @@ public class QuarkusNative extends QuarkusTask { private boolean enableServer = false; - private boolean enableJni = true; + private boolean enableJni = false; private boolean autoServiceLoaderRegistration = false; diff --git a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java index 910da7031d796..f69dab9920482 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java @@ -100,7 +100,7 @@ public class NativeImageMojo extends AbstractMojo { @Parameter(defaultValue = "false") private Boolean enableServer; - @Parameter(defaultValue = "true") + @Parameter(defaultValue = "false") private Boolean enableJni; @Parameter(defaultValue = "false") diff --git a/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml index 3e81c40e855ec..25505bd88e682 100644 --- a/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml +++ b/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml @@ -105,6 +105,7 @@ false false ${graalvmHome} + true true false diff --git a/integration-tests/amazon-lambda-http-resteasy/pom.xml b/integration-tests/amazon-lambda-http-resteasy/pom.xml index 2a4e80fe432e2..3bc814a137126 100644 --- a/integration-tests/amazon-lambda-http-resteasy/pom.xml +++ b/integration-tests/amazon-lambda-http-resteasy/pom.xml @@ -101,6 +101,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/amazon-lambda-http/pom.xml b/integration-tests/amazon-lambda-http/pom.xml index c864171a4a51a..9a08589d66344 100644 --- a/integration-tests/amazon-lambda-http/pom.xml +++ b/integration-tests/amazon-lambda-http/pom.xml @@ -109,6 +109,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/amazon-lambda/pom.xml b/integration-tests/amazon-lambda/pom.xml index 6ff4481343577..9282acbe209aa 100644 --- a/integration-tests/amazon-lambda/pom.xml +++ b/integration-tests/amazon-lambda/pom.xml @@ -98,6 +98,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/elytron-security-jdbc/pom.xml b/integration-tests/elytron-security-jdbc/pom.xml index 62026c71fdbe6..7b8a78e0aa3fa 100644 --- a/integration-tests/elytron-security-jdbc/pom.xml +++ b/integration-tests/elytron-security-jdbc/pom.xml @@ -105,6 +105,7 @@ false false ${graalvmHome} + true true false diff --git a/integration-tests/flyway/pom.xml b/integration-tests/flyway/pom.xml index 43ba95c789fcb..e5afb1450d043 100644 --- a/integration-tests/flyway/pom.xml +++ b/integration-tests/flyway/pom.xml @@ -120,6 +120,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/hibernate-orm-panache/pom.xml b/integration-tests/hibernate-orm-panache/pom.xml index 59a7b99a44149..572f19c9d6447 100644 --- a/integration-tests/hibernate-orm-panache/pom.xml +++ b/integration-tests/hibernate-orm-panache/pom.xml @@ -137,6 +137,7 @@ false false ${graalvmHome} + false diff --git a/integration-tests/hibernate-search-elasticsearch/pom.xml b/integration-tests/hibernate-search-elasticsearch/pom.xml index bf3e55f93a6f7..c607395b7cd09 100644 --- a/integration-tests/hibernate-search-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-elasticsearch/pom.xml @@ -185,6 +185,7 @@ false false ${graalvmHome} + false false diff --git a/integration-tests/hibernate-validator/pom.xml b/integration-tests/hibernate-validator/pom.xml index be2e6674ed488..780f306fd868e 100644 --- a/integration-tests/hibernate-validator/pom.xml +++ b/integration-tests/hibernate-validator/pom.xml @@ -122,6 +122,7 @@ false false ${graalvmHome} + false diff --git a/integration-tests/infinispan-cache-jpa/pom.xml b/integration-tests/infinispan-cache-jpa/pom.xml index f6098d8fb0e50..1b4cd3ab0f320 100644 --- a/integration-tests/infinispan-cache-jpa/pom.xml +++ b/integration-tests/infinispan-cache-jpa/pom.xml @@ -121,6 +121,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/infinispan-embedded/pom.xml b/integration-tests/infinispan-embedded/pom.xml index 062440a70d3a1..bfdec55fc2961 100644 --- a/integration-tests/infinispan-embedded/pom.xml +++ b/integration-tests/infinispan-embedded/pom.xml @@ -144,6 +144,7 @@ -H:ResourceConfigurationFiles=resources-config.json ${graalvmHome} + true diff --git a/integration-tests/jpa-derby/pom.xml b/integration-tests/jpa-derby/pom.xml index 08776dd2d570d..10f426d0137f8 100644 --- a/integration-tests/jpa-derby/pom.xml +++ b/integration-tests/jpa-derby/pom.xml @@ -112,6 +112,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/jpa-h2/pom.xml b/integration-tests/jpa-h2/pom.xml index df11bc035b75d..23eaf40c1d472 100644 --- a/integration-tests/jpa-h2/pom.xml +++ b/integration-tests/jpa-h2/pom.xml @@ -112,6 +112,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/jpa-mariadb/pom.xml b/integration-tests/jpa-mariadb/pom.xml index bff44413ef8d3..8c3eb78e8778f 100644 --- a/integration-tests/jpa-mariadb/pom.xml +++ b/integration-tests/jpa-mariadb/pom.xml @@ -148,6 +148,7 @@ false false ${graalvmHome} + false false diff --git a/integration-tests/jpa-mssql/pom.xml b/integration-tests/jpa-mssql/pom.xml index 32c2a8870138d..6c9e42aeb732c 100644 --- a/integration-tests/jpa-mssql/pom.xml +++ b/integration-tests/jpa-mssql/pom.xml @@ -156,6 +156,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/jpa-mysql/pom.xml b/integration-tests/jpa-mysql/pom.xml index a1c69bdcb57ad..6a3bc77cdad19 100644 --- a/integration-tests/jpa-mysql/pom.xml +++ b/integration-tests/jpa-mysql/pom.xml @@ -148,6 +148,7 @@ false false ${graalvmHome} + false false diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml index 5ce6c7a13db6d..f9a9a9ab2d07e 100644 --- a/integration-tests/jpa-postgresql/pom.xml +++ b/integration-tests/jpa-postgresql/pom.xml @@ -143,6 +143,7 @@ false false ${graalvmHome} + false diff --git a/integration-tests/jpa-without-entity/pom.xml b/integration-tests/jpa-without-entity/pom.xml index 3e40b635a3e51..daaaacf861b4c 100644 --- a/integration-tests/jpa-without-entity/pom.xml +++ b/integration-tests/jpa-without-entity/pom.xml @@ -105,6 +105,7 @@ true true ${graalvmHome} + false false diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml index e5fb5b277fb17..1ccd2892cbcb3 100644 --- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml +++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml @@ -99,6 +99,7 @@ false false ${graalvmHome} + true true false diff --git a/integration-tests/vault-app/pom.xml b/integration-tests/vault-app/pom.xml index 70462be04f5b4..82630cec2c03c 100644 --- a/integration-tests/vault-app/pom.xml +++ b/integration-tests/vault-app/pom.xml @@ -171,6 +171,7 @@ false false ${graalvmHome} + false diff --git a/integration-tests/vertx-graphql/pom.xml b/integration-tests/vertx-graphql/pom.xml index 2c543f814e8f0..3ed19f8eb6563 100644 --- a/integration-tests/vertx-graphql/pom.xml +++ b/integration-tests/vertx-graphql/pom.xml @@ -91,6 +91,7 @@ false false ${graalvmHome} + true true false diff --git a/integration-tests/vertx-http/pom.xml b/integration-tests/vertx-http/pom.xml index 151c17b42100a..eef1a2e2f7c98 100644 --- a/integration-tests/vertx-http/pom.xml +++ b/integration-tests/vertx-http/pom.xml @@ -103,6 +103,7 @@ -H:EnableURLProtocols=http,https ${graalvmHome} + true true From 2d68b721bcc3ccba976221c5cc2f32dc02374429 Mon Sep 17 00:00:00 2001 From: Gwenneg Lepage Date: Thu, 16 Jan 2020 18:05:40 +0100 Subject: [PATCH 6/6] Fix H2 native DeletedElementException --- .../main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java index f3ec0284016e5..c288359903828 100644 --- a/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java +++ b/extensions/jdbc/jdbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graal/Engine.java @@ -3,6 +3,7 @@ import org.h2.engine.ConnectionInfo; import org.h2.engine.Session; +import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; @@ -10,6 +11,11 @@ @Substitute public final class Engine { + @Substitute + public static org.h2.engine.Engine getInstance() { + return SubstrateUtil.cast(new Engine(), org.h2.engine.Engine.class); + } + @Substitute public Session createSession(ConnectionInfo ci) { throw new UnsupportedOperationException(