Skip to content

Commit

Permalink
DONOTMERGE Insert Jandex 3 dependency in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@yrodiere
yrodiere committed Jun 5, 2023
1 parent 78c77ae commit 11dd883
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 8 deletions.
2 changes: 1 addition & 1 deletion integrationtest/showcase/library/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<build>
<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion orm6/build/parents/internal/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
<!-- Trust the ORM 6 dependency to bring in the correct version of Jandex and Bytebuddy
<!-- Trust the ORM 6 dependency to bring in the correct version of Bytebuddy
(which, unfortunately, might be different from the version used in ORM 5.x
on which our utils are aligned) -->
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion orm6/build/parents/public/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
<!-- Trust the ORM 6 dependency to bring in the correct version of Jandex and Bytebuddy
<!-- Trust the ORM 6 dependency to bring in the correct version of Bytebuddy
(which, unfortunately, might be different from the version used in ORM 5.x
on which our utils are aligned) -->
<exclusion>
Expand Down
80 changes: 78 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@
and to our own explicit dependencies in the relevant artifacts.
-->
<version.org.jboss.jandex>2.4.2.Final</version.org.jboss.jandex>
<version.io.smallrye.jandex>3.0.0</version.io.smallrye.jandex>
<version.org.hibernate.commons.annotations>5.1.2.Final</version.org.hibernate.commons.annotations>
<version.javax.persistence>2.2</version.javax.persistence>
<version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
Expand Down Expand Up @@ -382,7 +383,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.0</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>
Expand Down Expand Up @@ -743,6 +744,13 @@
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-util-common</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
Expand Down Expand Up @@ -803,6 +811,13 @@
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-jakarta</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
Expand Down Expand Up @@ -965,6 +980,13 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand All @@ -977,27 +999,60 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate.orm}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers-jakarta</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${version.org.hibernate.orm}</version>
<exclusions>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
Expand Down Expand Up @@ -1304,6 +1359,11 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -1316,6 +1376,11 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -1328,6 +1393,11 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<!-- We use Jandex 3 -->
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -1723,6 +1793,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>
Expand Down Expand Up @@ -2144,7 +2220,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>
Expand Down
6 changes: 3 additions & 3 deletions util/internal/test/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 11dd883

Please sign in to comment.