Merge pull request #14908 from zakkak/graal-master-flyway-fix

Fix Flyway extension in relation with GraalVM master
quarkusio · Feb 10, 2021 · 32e834f · 32e834f
2 parents a930499 + 26bd50c
commit 32e834f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java
@@ -53,6 +53,7 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.flyway.runtime.FlywayBuildTimeConfig;
 import io.quarkus.flyway.runtime.FlywayContainerProducer;
@@ -276,4 +277,12 @@ private FileSystem initFileSystem(final URI uri) throws IOException {
         return FileSystems.newFileSystem(uri, env);
     }
 
+    /**
+     * Reinitialize {@code InsertRowLock} to avoid using a cached seed when invoking {@code getNextRandomString}
+     */
+    @BuildStep
+    public RuntimeReinitializedClassBuildItem reinitInsertRowLock() {
+        return new RuntimeReinitializedClassBuildItem(
+                "org.flywaydb.core.internal.database.InsertRowLock");
+    }
 }
diff --git a/...y/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java b/...y/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java
@@ -42,4 +42,9 @@ public boolean isAndroidAvailable() {
         return false;
     }
 
+    @Substitute
+    public boolean isLog4J2Available() {
+        return false;
+    }
+
 }