Upgrade to Hibernate ORM 7

bom/application/pom.xml

@@ -95,12 +95,12 @@
         <commons-codec.version>1.18.0</commons-codec.version>
         <classmate.version>1.7.0</classmate.version>
         <!-- See root POM for hibernate-orm.version, hibernate-reactive.version, hibernate-validator.version,
-             hibernate-search.version, antlr.version, bytebuddy.version, hibernate-commons-annotations.version -->
+             hibernate-search.version, antlr.version, bytebuddy.version -->
         <narayana.version>7.2.2.Final</narayana.version>
         <narayana-lra.version>1.0.0.Final</narayana-lra.version>
         <agroal.version>2.7.1</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-opensource-components.version>8.18.2</elasticsearch-opensource-components.version>
+        <elasticsearch-opensource-components.version>9.0.2</elasticsearch-opensource-components.version>
         <rxjava.version>2.2.21</rxjava.version>
         <wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
         <wildfly.openssl-linux.version>2.2.2.SP01</wildfly.openssl-linux.version>
@@ -1284,6 +1284,16 @@
                 <artifactId>quarkus-hibernate-orm-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-orm-derby</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-orm-derby-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-hibernate-envers</artifactId>
@@ -5474,13 +5484,6 @@
                 <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-core</artifactId>
                 <version>${hibernate-orm.version}</version>
-                <exclusions>
-                    <!-- We don't want Jandex at runtime -->
-                    <exclusion>
-                        <groupId>io.smallrye</groupId>
-                        <artifactId>jandex</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.hibernate.orm</groupId>
@@ -5492,6 +5495,11 @@
                 <artifactId>hibernate-envers</artifactId>
                 <version>${hibernate-orm.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-processor</artifactId>
+                <version>${hibernate-orm.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-jpamodelgen</artifactId>
@@ -5506,9 +5514,9 @@
                 <version>${hibernate-orm.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.hibernate.common</groupId>
-                <artifactId>hibernate-commons-annotations</artifactId>
-                <version>${hibernate-commons-annotations.version}</version>
+                <groupId>org.hibernate.models</groupId>
+                <artifactId>hibernate-models</artifactId>
+                <version>${hibernate-models.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate.orm</groupId>
@@ -5545,6 +5553,10 @@
                         <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.hibernate.models</groupId>
+                        <artifactId>hibernate-models-jandex</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -5569,6 +5581,10 @@
                         <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.hibernate.models</groupId>
+                        <artifactId>hibernate-models-jandex</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -5678,11 +5694,11 @@
                 <groupId>co.elastic.clients</groupId>
                 <artifactId>elasticsearch-java</artifactId>
                 <version>${elasticsearch-opensource-components.version}</version>
-                <!-- exclude log4j2 to get its version from log4j2-jboss-logmanager -->
+                <!-- exclude commons-logging to get its version from commons-logging-jboss-logmanager -->
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.logging.log4j</groupId>
-                        <artifactId>log4j-core</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>

build-parent/pom.xml

@@ -73,12 +73,12 @@
         <volume.access.modifier>:Z</volume.access.modifier>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>8.18.2</elasticsearch-server.version>
+        <elasticsearch-server.version>9.0.2</elasticsearch-server.version>
         <elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
         <logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
         <kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>
         <elasticsearch.protocol>http</elasticsearch.protocol>
-        <opensearch-server.version>2.16.0</opensearch-server.version>
+        <opensearch-server.version>3.0.0</opensearch-server.version>
         <opensearch.image>docker.io/opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
         <opensearch.protocol>http</opensearch.protocol>
         <junit-pioneer.version>2.2.0</junit-pioneer.version>

devtools/bom-descriptor-json/pom.xml

@@ -850,6 +850,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-orm-derby</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-hibernate-orm-panache</artifactId>

docs/pom.xml

@@ -859,6 +859,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-derby-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>

docs/src/main/asciidoc/hibernate-orm.adoc

@@ -515,14 +515,17 @@ HibernateCriteriaBuilder hibernateCriteriaBuilder;
 Metamodel metamodel;
 
 @Inject
-Cache cache;
+jakarta.persistence.Cache cache;
 
 @Inject
 org.hibernate.Cache cache;
 
 @Inject
 jakarta.persistence.PersistenceUnitUtil persistenceUnitUtil;
 
+@Inject
+jakarta.persistence.SchemaManager schemaManager;
+
 @Inject
 org.hibernate.relational.SchemaManager schemaManager;
 ----
@@ -1692,8 +1695,8 @@ section of the Hibernate Validator guide for more details.
 == Static metamodel and Jakarta Data
 
 Both static metamodel and Jakarta Data capabilities of Hibernate ORM are available in Quarkus
-through the `hibernate-jpamodelgen` annotation processor. Since it is an annotation processor,
-you must configure the annotation processor in your build tool:
+through the `hibernate-processor` annotation processor. Since it is an annotation processor,
+you must configure it accordingly in your build tool:
 
 [source,xml,role="primary asciidoc-tabs-target-sync-cli asciidoc-tabs-target-sync-maven"]
 .pom.xml
@@ -1704,7 +1707,7 @@ you must configure the annotation processor in your build tool:
         <annotationProcessorPaths>
             <path>
                 <groupId>org.hibernate.orm</groupId>
-                <artifactId>hibernate-jpamodelgen</artifactId>
+                <artifactId>hibernate-processor</artifactId>
                 <!-- Note, no artifact version is required, it's managed by Quarkus.  -->
             </path>
             <!-- other processors that may be required by your app -->
@@ -1718,9 +1721,9 @@ you must configure the annotation processor in your build tool:
 .build.gradle
 ----
 // Enforce the version management of your annotation processor dependencies,
-// so that there's no need to define an explicit version of the hibernate-jpamodelgen
+// so that there's no need to define an explicit version of the hibernate-processor
 annotationProcessor enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-annotationProcessor 'org.hibernate.orm:hibernate-jpamodelgen'
+annotationProcessor 'org.hibernate.orm:hibernate-processor'
 ----
 
 === Static metamodel
@@ -1757,7 +1760,7 @@ For a more detailed overview of static metamodel, please refer to the link:{jaka
 
 === Jakarta Data
 
-Jakarta Data requires, besides having the `hibernate-jpamodelgen` annotation processor in place, one extra dependency to be added:
+Jakarta Data requires, besides having the `hibernate-processor` annotation processor in place, one extra dependency to be added:
 
 [source,xml,role="primary asciidoc-tabs-target-sync-cli asciidoc-tabs-target-sync-maven"]
 .pom.xml

docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc

@@ -631,7 +631,7 @@ quarkus.datasource.db-kind=postgresql <1>
 
 quarkus.hibernate-orm.sql-load-script=import.sql <2>
 
-quarkus.hibernate-search-orm.elasticsearch.version=8 <3>
+quarkus.hibernate-search-orm.elasticsearch.version=9 <3>
 quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync <4>
 
 %prod.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost/quarkus_test
@@ -820,7 +820,7 @@ as shown below.
 
 [source,properties]
 ----
-quarkus.hibernate-search-orm.elasticsearch.version=opensearch:2.16
+quarkus.hibernate-search-orm.elasticsearch.version=opensearch:3.0
 ----
 
 All other configuration options and APIs are exactly the same as with Elasticsearch.
@@ -850,7 +850,7 @@ quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
 
 quarkus.hibernate-search-orm.elasticsearch.hosts=es1.mycompany.com:9200
-quarkus.hibernate-search-orm.elasticsearch.version=8
+quarkus.hibernate-search-orm.elasticsearch.version=9
 ----
 
 Using a map based approach, it is also possible to configure named persistence units:
@@ -870,10 +870,10 @@ quarkus.hibernate-orm."inventory".datasource=inventory <4>
 quarkus.hibernate-orm."inventory".packages=org.acme.model.inventory
 
 quarkus.hibernate-search-orm."users".elasticsearch.hosts=es1.mycompany.com:9200 <5>
-quarkus.hibernate-search-orm."users".elasticsearch.version=8
+quarkus.hibernate-search-orm."users".elasticsearch.version=9
 
 quarkus.hibernate-search-orm."inventory".elasticsearch.hosts=es2.mycompany.com:9200 <6>
-quarkus.hibernate-search-orm."inventory".elasticsearch.version=8
+quarkus.hibernate-search-orm."inventory".elasticsearch.version=9
 ----
 <1> Define a datasource named `users`.
 <2> Define a datasource named `inventory`.

docs/src/main/asciidoc/hibernate-search-standalone-elasticsearch.adoc

@@ -560,7 +560,7 @@ Edit `src/main/resources/application.properties` and inject the following config
 [source,properties]
 ----
 quarkus.hibernate-search-standalone.mapping.structure=document <1>
-quarkus.hibernate-search-standalone.elasticsearch.version=8 <2>
+quarkus.hibernate-search-standalone.elasticsearch.version=9 <2>
 quarkus.hibernate-search-standalone.indexing.plan.synchronization.strategy=sync <3>
 
 %prod.quarkus.hibernate-search-standalone.elasticsearch.hosts=localhost:9200 <4>
@@ -738,7 +738,7 @@ as shown below.
 
 [source,properties]
 ----
-quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:2.16
+quarkus.hibernate-search-standalone.elasticsearch.version=opensearch:3.0
 ----
 
 All other configuration options and APIs are exactly the same as with Elasticsearch.

extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchConfig.java

@@ -53,13 +53,13 @@ public interface ElasticsearchConfig {
     /**
      * The maximum number of connections to all the Elasticsearch servers.
      */
-    @WithDefault("20")
+    @WithDefault("40")
     int maxConnections();
 
     /**
      * The maximum number of connections per Elasticsearch server.
      */
-    @WithDefault("10")
+    @WithDefault("20")
     int maxConnectionsPerRoute();
 
     /**

extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java

@@ -29,15 +29,21 @@ public final class HibernateEnversProcessor {
     List<AdditionalJpaModelBuildItem> addJpaModelClasses() {
         return Arrays.asList(
                 new AdditionalJpaModelBuildItem("org.hibernate.envers.DefaultRevisionEntity"),
-                new AdditionalJpaModelBuildItem("org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity"));
+                new AdditionalJpaModelBuildItem("org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity"),
+                new AdditionalJpaModelBuildItem("org.hibernate.envers.RevisionMapping"),
+                new AdditionalJpaModelBuildItem("org.hibernate.envers.TrackingModifiedEntitiesRevisionMapping"));
     }
 
     @BuildStep
     public void registerEnversReflections(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             HibernateEnversBuildTimeConfig buildTimeConfig) {
+        // This is necessary because these classes are added to the model conditionally at static init,
+        // so they don't get processed by HibernateOrmProcessor and in particular don't get reflection enabled.
         reflectiveClass.produce(ReflectiveClassBuildItem.builder(
                 "org.hibernate.envers.DefaultRevisionEntity",
-                "org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity")
+                "org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity",
+                "org.hibernate.envers.RevisionMapping",
+                "org.hibernate.envers.TrackingModifiedEntitiesRevisionMapping")
                 .reason(getClass().getName())
                 .methods().build());
 

extensions/hibernate-orm-derby/deployment/pom.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-orm-derby-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-orm-derby-deployment</artifactId>
+    <name>Quarkus - Hibernate ORM - Derby - Deployment</name>
+    <description>This extensions is added by Quarkus automatically when quarkus-hibernate-orm and quarkus-jdbc-derby are on the classpath</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-derby</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <path>
+                                    <groupId>io.quarkus</groupId>
+                                    <artifactId>quarkus-extension-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </path>
+                            </annotationProcessorPaths>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>