Upgrade H2 to 2.2.220

(cherry picked from commit aa83e46)
quarkusio · Aug 10, 2023 · 8022a3f · 8022a3f
1 parent 63c7aa5
commit 8022a3f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -128,7 +128,7 @@
         <httpasync.version>4.1.5</httpasync.version>
         <cronutils.version>9.2.1</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
-        <h2.version>2.1.214</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
+        <h2.version>2.2.220</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
         <postgresql-jdbc.version>42.6.0</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.1.4</mariadb-jdbc.version>
         <mysql-jdbc.version>8.0.30</mysql-jdbc.version>

diff --git a/...te-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/config/DialectVersions.java b/...te-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/config/DialectVersions.java
@@ -22,7 +22,7 @@ public static final class Defaults {
         public static final String ORACLE = "12";
 
         // This must be aligned on the H2 version in the Quarkus BOM
-        public static final String H2 = "2.1.210";
+        public static final String H2 = "2.2.220";
 
         private Defaults() {
         }

diff --git a/.../jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java b/.../jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
@@ -1,5 +1,7 @@
 package io.quarkus.jdbc.h2.deployment;
 
+import java.util.Set;
+
 import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
@@ -12,10 +14,12 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.RemovedResourceBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageEnableModule;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.jdbc.h2.runtime.H2AgroalConnectionConfigurer;
+import io.quarkus.maven.dependency.ArtifactKey;
 
 public class JDBCH2Processor {
 
@@ -62,4 +66,10 @@ NativeImageEnableModule registerNetModuleForNative() {
         //Compiling H2 to native requires activating the jdk.net module of the JDK
         return new NativeImageEnableModule("jdk.net");
     }
+
+    @BuildStep
+    void excludeNativeImageDirectives(BuildProducer<RemovedResourceBuildItem> removedResources) {
+        removedResources.produce(new RemovedResourceBuildItem(ArtifactKey.fromString("com.h2database:h2"),
+                Set.of("META-INF/native-image/reflect-config.json")));
+    }
 }
diff --git a/...dbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graalvm/DeleteFullTextLucene.java b/...dbc-h2/runtime/src/main/java/io/quarkus/jdbc/h2/runtime/graalvm/DeleteFullTextLucene.java
@@ -0,0 +1,10 @@
+package io.quarkus.jdbc.h2.runtime.graalvm;
+
+import com.oracle.svm.core.annotate.Delete;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@Delete
+@TargetClass(className = "org.h2.fulltext.FullTextLucene")
+public final class DeleteFullTextLucene {
+
+}