From fa0c31c05533d17854ca5b335ea54c9ab9200fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 5 Sep 2022 16:20:44 +0200
Subject: [PATCH] HSEARCH-4688 Upgrade to Jandex 3.0

---
 integrationtest/showcase/library/pom.xml            |  2 +-
 orm6/build/parents/integrationtest/pom.xml          |  2 +-
 orm6/build/parents/internal/pom.xml                 |  2 +-
 orm6/build/parents/public/pom.xml                   |  2 +-
 pom.xml                                             | 13 +++++++++----
 util/common/pom.xml                                 |  4 ++--
 .../search/util/common/jar/impl/JandexUtils.java    |  2 +-
 util/internal/test/common/pom.xml                   |  6 +++---
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/integrationtest/showcase/library/pom.xml b/integrationtest/showcase/library/pom.xml
index 7f95d8ca09a..75c9cb93aa0 100644
--- 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
index f04ff2319dc..4d2b57ba56c 100644
--- a/orm6/build/parents/integrationtest/pom.xml
+++ b/orm6/build/parents/integrationtest/pom.xml
@@ -67,7 +67,7 @@
                          (which, unfortunately, might be different from the version used in ORM 5.x
                          on which our utils are aligned) -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                     <exclusion>
diff --git a/orm6/build/parents/internal/pom.xml b/orm6/build/parents/internal/pom.xml
index a0862decd7d..c0e704ca4a2 100644
--- a/orm6/build/parents/internal/pom.xml
+++ b/orm6/build/parents/internal/pom.xml
@@ -67,7 +67,7 @@
                          (which, unfortunately, might be different from the version used in ORM 5.x
                          on which our utils are aligned) -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                     <exclusion>
diff --git a/orm6/build/parents/public/pom.xml b/orm6/build/parents/public/pom.xml
index a8b22a1897a..a6f5358d8d1 100644
--- a/orm6/build/parents/public/pom.xml
+++ b/orm6/build/parents/public/pom.xml
@@ -67,7 +67,7 @@
                          (which, unfortunately, might be different from the version used in ORM 5.x
                          on which our utils are aligned) -->
                     <exclusion>
-                        <groupId>org.jboss</groupId>
+                        <groupId>io.smallrye</groupId>
                         <artifactId>jandex</artifactId>
                     </exclusion>
                     <exclusion>
diff --git a/pom.xml b/pom.xml
index e0dd8a018f7..f664760be6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,10 +257,9 @@
              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>
+        <version.io.smallrye.jandex>3.0.3</version.io.smallrye.jandex>
 
         <!-- >>> ORM 6 / Jakarta Persistence -->
         <version.org.hibernate.orm>6.2.0-SNAPSHOT</version.org.hibernate.orm>
@@ -355,7 +354,7 @@
         <version.help.plugin>3.3.0</version.help.plugin>
         <version.install.plugin>3.1.0</version.install.plugin>
         <version.io.takari.maven>0.7.7</version.io.takari.maven>
-        <version.jandex.plugin>1.2.3</version.jandex.plugin>
+        <version.jandex.plugin>3.0.3</version.jandex.plugin>
         <version.japicmp.plugin>0.17.1</version.japicmp.plugin>
         <version.jar.plugin>3.3.0</version.jar.plugin>
         <version.javadoc.plugin>3.4.1</version.javadoc.plugin>
@@ -1572,6 +1571,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>
@@ -2023,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
index 02a7a984719..b9f951a0fca 100644
--- 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/common/src/main/java/org/hibernate/search/util/common/jar/impl/JandexUtils.java b/util/common/src/main/java/org/hibernate/search/util/common/jar/impl/JandexUtils.java
index ef042aa3e54..07dae6dd441 100644
--- a/util/common/src/main/java/org/hibernate/search/util/common/jar/impl/JandexUtils.java
+++ b/util/common/src/main/java/org/hibernate/search/util/common/jar/impl/JandexUtils.java
@@ -70,7 +70,7 @@ public static Set<DotName> findAnnotatedAnnotationsAndContaining(IndexView index
 		for ( AnnotationInstance retentionAnnotation : index.getAnnotations( metaAnnotation ) ) {
 			ClassInfo annotation = retentionAnnotation.target().asClass();
 			annotations.add( annotation.name() );
-			AnnotationInstance repeatable = annotation.classAnnotation( REPEATABLE );
+			AnnotationInstance repeatable = annotation.declaredAnnotation( REPEATABLE );
 			if ( repeatable != null ) {
 				Type containing = repeatable.value().asClass();
 				annotations.add( containing.name() );
diff --git a/util/internal/test/common/pom.xml b/util/internal/test/common/pom.xml
index 564b6702dea..6ab5a419d8c 100644
--- 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>
@@ -97,7 +97,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>