From e2088f42fe373bec2f974a240c4635234004b8f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Fri, 1 Dec 2023 15:58:06 +0100
Subject: [PATCH] Fix some wonky dependency exclusions in Hibernate
 ORM/Reactive/Search extensions

1. It makes no sense to exclude a transitive dependency if its version
   is managed and we re-declare that dependency ourselves two lines
   below.
2. jakarta.xml.bind-api and jakarta.activation-api are not banned at
   all, are actually transitive dependencies of hibernate-core and
   hibernate-jpamodelgen, and have their version managed in our BOM.
   So there's no need to exclude these transitive dependencies
   or to declare them when we don't use them directly.
3. jakarta.activation-api is a dependency of jakarta.xml.bind-api,
   so there's no point excluding jakarta.activation-api if the same
   module is going to depend on jakarta.xml.bind-api.
4. org.jboss:jandex (old artifact) is no longer a dependency of Hibernate ORM,
   so we don't need to exclude it.
5. io.smallrye:jandex (new artifact) is never required as a runtime dependency
   of Hibernate ORM, so it should be excluded directly in the BOM.
---
 bom/application/pom.xml                       | 15 ++------------
 extensions/hibernate-envers/runtime/pom.xml   | 14 -------------
 extensions/hibernate-orm/runtime/pom.xml      | 20 -------------------
 .../runtime/pom.xml                           |  6 ------
 .../hibernate-orm-panache/runtime/pom.xml     | 12 -----------
 .../runtime/pom.xml                           | 10 +++-------
 .../runtime/pom.xml                           | 12 -----------
 7 files changed, 5 insertions(+), 84 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 1f823f0183616..acda5b5e1160c 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -5010,8 +5010,9 @@
                 <artifactId>hibernate-core</artifactId>
                 <version>${hibernate-orm.version}</version>
                 <exclusions>
+                    <!-- We don't want Jandex at runtime -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                 </exclusions>
@@ -5074,10 +5075,6 @@
                 <version>${hibernate-search.version}</version>
                 <exclusions>
                     <!-- We don't want Jandex at runtime -->
-                    <exclusion>
-                        <groupId>org.jboss</groupId>
-                        <artifactId>jandex</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
@@ -5090,10 +5087,6 @@
                 <version>${hibernate-search.version}</version>
                 <exclusions>
                     <!-- We don't want Jandex at runtime -->
-                    <exclusion>
-                        <groupId>org.jboss</groupId>
-                        <artifactId>jandex</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
@@ -5106,10 +5099,6 @@
                 <version>${hibernate-search.version}</version>
                 <exclusions>
                     <!-- We don't want Jandex at runtime -->
-                    <exclusion>
-                        <groupId>org.jboss</groupId>
-                        <artifactId>jandex</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
diff --git a/extensions/hibernate-envers/runtime/pom.xml b/extensions/hibernate-envers/runtime/pom.xml
index 95319d2fa3dab..c985316f7e31b 100644
--- a/extensions/hibernate-envers/runtime/pom.xml
+++ b/extensions/hibernate-envers/runtime/pom.xml
@@ -18,20 +18,6 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-envers</artifactId>
-            <!-- We need to repeat the same exclusions applied on hibernate-core -->
-            <exclusions>
-                <!-- These XML parsers are banned in the project as we use the new package -->
-                <exclusion>
-                    <groupId>org.glassfish.jaxb</groupId>
-                    <artifactId>jaxb-runtime</artifactId>
-                </exclusion>
-
-                <!-- Following dependencies are only necessary during metadata initialization -->
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml
index a9c86cf7c75b2..5db120b401cb0 100644
--- a/extensions/hibernate-orm/runtime/pom.xml
+++ b/extensions/hibernate-orm/runtime/pom.xml
@@ -59,20 +59,6 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish.jaxb</groupId>
-                    <artifactId>jaxb-runtime</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.smallrye</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!-- ByteBuddy is marked as a "runtime" dependency of Hibernate ORM but we need it to compile the extension -->
         <dependency>
@@ -102,12 +88,6 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml
index d9e6721774318..16d8755270292 100644
--- a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml
@@ -32,12 +32,6 @@
         <dependency>
             <groupId>org.hibernate.search</groupId>
             <artifactId>hibernate-search-mapper-orm</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
diff --git a/extensions/panache/hibernate-orm-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
index 58c4abeaa1bc0..170a7624aadd5 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
@@ -48,18 +48,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- Explicitly provide banned dependencies, in the correct version -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.angus</groupId>
-            <artifactId>angus-activation</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml
index 0836ad5b199c4..e007a8da611b8 100644
--- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml
@@ -75,13 +75,9 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Explicitly provide banned dependencies, in the correct version -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
+        <!-- Necessary runtime dependency of jpamodelgen,
+             which needs to be imported explicitly
+             otherwise it's not available during annotation processing -->
         <dependency>
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-activation</artifactId>
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
index 4eded842676f7..7c3a24f07a37d 100644
--- a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
@@ -52,18 +52,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- Explicitly provide banned dependencies, in the correct version -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.angus</groupId>
-            <artifactId>angus-activation</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>