Revert "TODOTICKET Upgrade to Hibernate ORM 6.2.0-SNAPSHOT"

This reverts commit f7df238.
hibernate · Jan 27, 2023 · 1f5c536 · 1f5c536
1 parent c9ac339
commit 1f5c536
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/mapper/orm-coordination-outbox-polling/pom.xml b/mapper/orm-coordination-outbox-polling/pom.xml
@@ -23,6 +23,20 @@
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-mapper-orm</artifactId>
         </dependency>
+        <!-- This dependency is only here to solve compilation warnings.
+             For some reason, if we rely on the transitive dependency from mapper-orm,
+             we end up with compilation warnings like this:
+                unknown enum constant XmlAccessType.FIELD
+             This seems related to the annotation processor,
+             but who knows what the exact reason is.
+         -->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <!-- DO NOT REMOVE and DO NOT MANAGE the version of this dependency. See the version property declaration. -->
+            <version>${version.jakarta.xml.bind}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>

diff --git a/...ava/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java b/...ava/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java
@@ -256,12 +256,12 @@ private UnsupportedOperationException parametersNoSupported() {
 	}
 
 	@Override
-	public <T> QueryImplementor<T> setTupleTransformer(TupleTransformer<T> transformer) {
+	public QueryImplementor<R> setTupleTransformer(TupleTransformer transformer) {
 		throw resultOrTupleTransformerNotImplemented();
 	}
 
 	@Override
-	public QueryImplementor<R> setResultListTransformer(ResultListTransformer<R> resultListTransformer) {
+	public QueryImplementor<R> setResultListTransformer(ResultListTransformer resultListTransformer) {
 		throw resultOrTupleTransformerNotImplemented();
 	}
 

diff --git a/pom.xml b/pom.xml
@@ -261,10 +261,9 @@
         <version.org.jboss.jandex>2.4.2.Final</version.org.jboss.jandex>
         <version.org.hibernate.commons.annotations>${version.org.hibernate.commons.annotations.orm6}</version.org.hibernate.commons.annotations>
         <version.net.bytebuddy>${version.net.bytebuddy.orm6}</version.net.bytebuddy>
-        <version.io.smallrye.jandex>3.0.0</version.io.smallrye.jandex>
 
         <!-- >>> ORM 6 / Jakarta Persistence -->
-        <version.org.hibernate.orm>6.2.0-SNAPSHOT</version.org.hibernate.orm>
+        <version.org.hibernate.orm>6.1.6.Final</version.org.hibernate.orm>
         <javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
         <documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
         <!-- These version must be kept in sync with the version of the dependency in Hibernate ORM 6.
@@ -274,10 +273,10 @@
              and to our own explicit dependencies in the relevant artifacts.
           -->
         <version.org.hibernate.commons.annotations.orm6>6.0.5.Final</version.org.hibernate.commons.annotations.orm6>
-        <version.jakarta.persistence>3.1.0</version.jakarta.persistence>
+        <version.jakarta.persistence>3.0.0</version.jakarta.persistence>
         <version.jakarta.enterprise>3.0.1</version.jakarta.enterprise>
         <version.jakarta.xml.bind>3.0.1</version.jakarta.xml.bind>
-        <version.net.bytebuddy.orm6>1.12.18</version.net.bytebuddy.orm6>
+        <version.net.bytebuddy.orm6>1.12.9</version.net.bytebuddy.orm6>
 
         <!-- >>> JSR 352 -->
         <version.jakarta.batch>2.1.1</version.jakarta.batch>
@@ -876,6 +875,14 @@
                 <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-core</artifactId>
                 <version>${version.org.hibernate.orm}</version>
+                <exclusions>
+                    <!-- hibernate-core already depends on jakarta.xml.bind-api,
+                         which depends on com.sun.activation, which bundles the activation API already -->
+                    <exclusion>
+                        <groupId>jakarta.activation</groupId>
+                        <artifactId>jakarta.activation-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.hibernate.orm</groupId>