HSEARCH-4688 Upgrade to Jandex 3.0

hibernate · Jun 1, 2023 · 9136c18 · 9136c18
1 parent 854ec6e
commit 9136c18
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/integrationtest/showcase/library/pom.xml b/integrationtest/showcase/library/pom.xml
@@ -123,7 +123,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
                 <executions>
                     <execution>

diff --git a/orm6/build/parents/integrationtest/pom.xml b/orm6/build/parents/integrationtest/pom.xml
@@ -82,7 +82,7 @@
                 <exclusions>
                     <!-- We use Jandex 3 -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                     <!-- Trust the ORM 6 dependency to bring in the correct version of Bytebuddy

diff --git a/orm6/build/parents/internal/pom.xml b/orm6/build/parents/internal/pom.xml
@@ -82,7 +82,7 @@
                 <exclusions>
                     <!-- We use Jandex 3 -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                     <!-- Trust the ORM 6 dependency to bring in the correct version of Jandex and Bytebuddy

diff --git a/orm6/build/parents/public/pom.xml b/orm6/build/parents/public/pom.xml
@@ -83,7 +83,7 @@
                 <exclusions>
                     <!-- We use Jandex 3 -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                     <!-- Trust the ORM 6 dependency to bring in the correct version of Jandex and Bytebuddy

diff --git a/pom.xml b/pom.xml
@@ -264,10 +264,8 @@
              when the versions start diverging, thanks to the maven-enforcer-plugin
              and to our own explicit dependencies in the relevant artifacts.
           -->
-        <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 with Jakarta Persistence -->
         <version.org.hibernate.orm>6.2.0.CR2</version.org.hibernate.orm>
@@ -365,7 +363,7 @@
         <version.exec.plugin>3.1.0</version.exec.plugin>
         <version.forbiddenapis.plugin>3.4</version.forbiddenapis.plugin>
         <version.install.plugin>3.1.1</version.install.plugin>
-        <version.jandex.plugin>1.2.3</version.jandex.plugin>
+        <version.jandex.plugin>3.0.3</version.jandex.plugin>
         <version.japicmp.plugin>0.17.2</version.japicmp.plugin>
         <version.jar.plugin>3.3.0</version.jar.plugin>
         <version.javadoc.plugin>3.5.0</version.javadoc.plugin>
@@ -1603,6 +1601,12 @@
                                     <version>${maven.min.version}</version>
                                 </requireMavenVersion>
                                 <banDuplicatePomDependencyVersions />
+                                <bannedDependencies>
+                                    <excludes>
+                                        <!-- We use Jandex 3 instead: io.smallrye:jandex, io.smallrye:jandex-maven-plugin -->
+                                        <exclude>org.jboss:jandex*</exclude>
+                                    </excludes>
+                                </bannedDependencies>
                             </rules>
                         </configuration>
                     </execution>
@@ -2024,7 +2028,7 @@
                     <version>1.0.2</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.jboss.jandex</groupId>
+                    <groupId>io.smallrye</groupId>
                     <artifactId>jandex-maven-plugin</artifactId>
                     <version>${version.jandex.plugin}</version>
                     <executions>

diff --git a/util/common/pom.xml b/util/common/pom.xml
@@ -26,10 +26,10 @@
             <artifactId>jboss-logging-annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss</groupId>
+            <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>
             <!-- DO NOT REMOVE and DO NOT MANAGE the version of this dependency. See the version property declaration. -->
-            <version>${version.org.jboss.jandex}</version>
+            <version>${version.io.smallrye.jandex}</version>
         </dependency>
 
         <dependency>

diff --git a/util/internal/test/common/pom.xml b/util/internal/test/common/pom.xml
@@ -76,10 +76,10 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss</groupId>
+            <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>
             <!-- DO NOT MANAGE this dependency. See the version property declaration. -->
-            <version>${version.org.jboss.jandex}</version>
+            <version>${version.io.smallrye.jandex}</version>
         </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
@@ -103,7 +103,7 @@
             </plugin>
             <!-- This is only necessary to implement a few tests in other Maven modules; see JandexUtilsTest -->
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
                 <executions>
                     <execution>