AWT: JNI registrations depend on GraalVM version

quarkusio · Apr 11, 2023 · 764dacb · 764dacb
1 parent b42efd0
commit 764dacb
Show file tree

Hide file tree

Showing 4 changed files with 207 additions and 187 deletions.
diff --git a/core/builder/src/main/java/io/quarkus/builder/Json.java b/core/builder/src/main/java/io/quarkus/builder/Json.java
@@ -52,7 +52,6 @@ public static JsonArrayBuilder array() {
     }
 
     /**
-     *
      * @param ignoreEmptyBuilders
      * @return the new JSON array builder
      * @see JsonBuilder#ignoreEmptyBuilders
@@ -62,15 +61,13 @@ static JsonArrayBuilder array(boolean ignoreEmptyBuilders) {
     }
 
     /**
-     *
      * @return the new JSON object builder, empty builders are not ignored
      */
     public static JsonObjectBuilder object() {
         return new JsonObjectBuilder(false);
     }
 
     /**
-     *
      * @param ignoreEmptyBuilders
      * @return the new JSON object builder
      * @see JsonBuilder#ignoreEmptyBuilders
@@ -84,7 +81,6 @@ abstract static class JsonBuilder<T> {
         protected boolean ignoreEmptyBuilders = false;
 
         /**
-         *
          * @param ignoreEmptyBuilders If set to true all empty builders added to this builder will be ignored during
          *        {@link #build()}
          */
@@ -93,13 +89,11 @@ abstract static class JsonBuilder<T> {
         }
 
         /**
-         *
          * @return <code>true</code> if there are no elements/properties, <code>false</code> otherwise
          */
         abstract boolean isEmpty();
 
         /**
-         *
          * @return a string representation
          * @throws IOException
          */
@@ -108,7 +102,6 @@ abstract static class JsonBuilder<T> {
         abstract void appendTo(Appendable appendable) throws IOException;
 
         /**
-         *
          * @param value
          * @return <code>true</code> if the value is null or an empty builder and {@link #ignoreEmptyBuilders} is set to
          *         <code>true</code>, <code>false</code>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java
@@ -21,21 +21,24 @@ public abstract class NativeImageBuildRunner {
 
     private static final Logger log = Logger.getLogger(NativeImageBuildRunner.class);
 
+    private static GraalVM.Version graalVMVersion = null;
+
     public GraalVM.Version getGraalVMVersion() {
-        final GraalVM.Version graalVMVersion;
-        try {
-            String[] versionCommand = getGraalVMVersionCommand(Collections.singletonList("--version"));
-            log.debugf(String.join(" ", versionCommand).replace("$", "\\$"));
-            Process versionProcess = new ProcessBuilder(versionCommand)
-                    .redirectErrorStream(true)
-                    .start();
-            versionProcess.waitFor();
-            try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(versionProcess.getInputStream(), StandardCharsets.UTF_8))) {
-                graalVMVersion = GraalVM.Version.of(reader.lines());
+        if (graalVMVersion == null) {
+            try {
+                final String[] versionCommand = getGraalVMVersionCommand(Collections.singletonList("--version"));
+                log.debugf(String.join(" ", versionCommand).replace("$", "\\$"));
+                final Process versionProcess = new ProcessBuilder(versionCommand)
+                        .redirectErrorStream(true)
+                        .start();
+                versionProcess.waitFor();
+                try (BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(versionProcess.getInputStream(), StandardCharsets.UTF_8))) {
+                    graalVMVersion = GraalVM.Version.of(reader.lines());
+                }
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to get GraalVM version", e);
             }
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to get GraalVM version", e);
         }
         return graalVMVersion;
     }

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
@@ -275,21 +275,23 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, LocalesBuildTimeCon
                 }
             }
 
-            // See https://github.com/oracle/graal/issues/4921
-            try (DirectoryStream<Path> sharedLibs = Files.newDirectoryStream(outputDir, "*.{so,dll}")) {
-                sharedLibs.forEach(src -> {
-                    Path dst = null;
-                    try {
-                        dst = Path.of(outputTargetBuildItem.getOutputDirectory().toAbsolutePath().toString(),
-                                src.getFileName().toString());
-                        log.debugf("Copying a shared lib from %s to %s.", src, dst);
-                        Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING);
-                    } catch (IOException e) {
-                        log.errorf("Could not copy shared lib from %s to %s. Continuing. Error: %s", src, dst, e);
-                    }
-                });
-            } catch (IOException e) {
-                log.errorf("Could not list files in directory %s. Continuing. Error: %s", outputDir, e);
+            if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_0_0) >= 0) {
+                // See https://github.com/oracle/graal/issues/4921
+                try (DirectoryStream<Path> sharedLibs = Files.newDirectoryStream(outputDir, "*.{so,dll}")) {
+                    sharedLibs.forEach(src -> {
+                        Path dst = null;
+                        try {
+                            dst = Path.of(outputTargetBuildItem.getOutputDirectory().toAbsolutePath().toString(),
+                                    src.getFileName().toString());
+                            log.debugf("Copying a shared lib from %s to %s.", src, dst);
+                            Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING);
+                        } catch (IOException e) {
+                            log.errorf("Could not copy shared lib from %s to %s. Continuing. Error: %s", src, dst, e);
+                        }
+                    });
+                } catch (IOException e) {
+                    log.errorf("Could not list files in directory %s. Continuing. Error: %s", outputDir, e);
+                }
             }
 
             System.setProperty("native.image.path", finalExecutablePath.toAbsolutePath().toString());