Merge pull request #16584 from zakkak/enable-all-security-services-re…

…moved-in-21.1 Don't pass --enable-all-security-services to GraalVM >= 21.1
quarkusio · Apr 16, 2021 · 09f5734 · 09f5734
2 parents a9a1dc7 + c882d22
commit 09f5734
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java
@@ -13,6 +13,7 @@ static final class Version implements Comparable<Version> {
         static final Version UNVERSIONED = new Version("Undefined", -1, -1, Distribution.ORACLE);
         static final Version VERSION_20_3 = new Version("GraalVM 20.3", 20, 3, Distribution.ORACLE);
         static final Version VERSION_21_0 = new Version("GraalVM 21.0", 21, 0, Distribution.ORACLE);
+        static final Version VERSION_21_1 = new Version("GraalVM 21.1", 21, 1, Distribution.ORACLE);
 
         static final Version MINIMUM = VERSION_20_3;
         static final Version CURRENT = VERSION_21_0;
@@ -49,6 +50,10 @@ boolean isNewerThan(Version version) {
             return this.compareTo(version) > 0;
         }
 
+        boolean isOlderThan(Version version) {
+            return this.compareTo(version) < 0;
+        }
+
         @Override
         public int compareTo(Version o) {
             if (major > o.major) {

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
@@ -656,7 +656,8 @@ public NativeImageInvokerInfo build() {
                 if (!protocols.isEmpty()) {
                     nativeImageArgs.add("-H:EnableURLProtocols=" + String.join(",", protocols));
                 }
-                if (enableAllSecurityServices) {
+                if (enableAllSecurityServices && graalVMVersion.isOlderThan(GraalVM.Version.VERSION_21_1)) {
+                    // This option was removed in GraalVM 21.1 https://github.com/oracle/graal/pull/3258
                     nativeImageArgs.add("--enable-all-security-services");
                 }
                 if (inlineBeforeAnalysis) {