From 21b1c8b7fe22762b223b38b1e4239093e3b074bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Tue, 1 Jun 2021 17:04:38 +0200 Subject: [PATCH 1/5] Upgrade to Jandex 2.3.0 --- bom/application/pom.xml | 2 +- independent-projects/arc/pom.xml | 2 +- independent-projects/resteasy-reactive/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index e7e648a304abf..c212a63bce2ea 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -17,7 +17,7 @@ 1.68 1.0.2.1 1.0.11.4 - 2.2.3.Final + 2.3.0.Final 4.6.0.Final 0.33.0 1.0.0 diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 0ec9787549872..3c639f830ac10 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -38,7 +38,7 @@ 2.0.2 1.3.3 - 2.2.3.Final + 2.3.0.Final 5.7.2 3.8.1 3.19.0 diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index f3b30866bf631..09d152896fa81 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -37,7 +37,7 @@ 11 2.0.2 - 2.2.3.Final + 2.3.0.Final 5.7.2 3.8.1 3.19.0 From 6e4d641e36d5374fb3c682d715d9931d34ba7b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Tue, 1 Jun 2021 17:07:17 +0200 Subject: [PATCH 2/5] Upgrade to jandex-maven-plugin 1.1.0 --- build-parent/pom.xml | 4 ++-- docs/src/main/asciidoc/cdi-reference.adoc | 2 +- docs/src/main/asciidoc/maven-tooling.adoc | 2 +- independent-projects/tools/artifact-api/pom.xml | 2 +- independent-projects/tools/registry-client/pom.xml | 2 +- tcks/microprofile-rest-client-reactive/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 148dab245e070..6a8b35c1dbf2e 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -548,7 +548,7 @@ org.jboss.jandex jandex-maven-plugin - 1.0.8 + 1.1.0 net.revelc.code.formatter @@ -912,7 +912,7 @@ jandex-maven-plugin - [1.0.5,) + [1.1.0,) jandex diff --git a/docs/src/main/asciidoc/cdi-reference.adoc b/docs/src/main/asciidoc/cdi-reference.adoc index 389f69228ba1b..aa5add348c6b9 100644 --- a/docs/src/main/asciidoc/cdi-reference.adoc +++ b/docs/src/main/asciidoc/cdi-reference.adoc @@ -53,7 +53,7 @@ To generate the index just add the following to your `pom.xml`: org.jboss.jandex jandex-maven-plugin - 1.0.7 + 1.1.0 make-index diff --git a/docs/src/main/asciidoc/maven-tooling.adoc b/docs/src/main/asciidoc/maven-tooling.adoc index 33d077e7c3228..4c9cb74228705 100644 --- a/docs/src/main/asciidoc/maven-tooling.adoc +++ b/docs/src/main/asciidoc/maven-tooling.adoc @@ -551,7 +551,7 @@ unless it is the main application module already configured with the quarkus-mav org.jboss.jandex jandex-maven-plugin - 1.0.7 + 1.1.0 make-index diff --git a/independent-projects/tools/artifact-api/pom.xml b/independent-projects/tools/artifact-api/pom.xml index 532436a5e2f73..92fafdbce73d4 100644 --- a/independent-projects/tools/artifact-api/pom.xml +++ b/independent-projects/tools/artifact-api/pom.xml @@ -18,7 +18,7 @@ org.jboss.jandex jandex-maven-plugin - 1.0.8 + 1.1.0 make-index diff --git a/independent-projects/tools/registry-client/pom.xml b/independent-projects/tools/registry-client/pom.xml index b19b8ee9ccdc8..22f9694785d7b 100644 --- a/independent-projects/tools/registry-client/pom.xml +++ b/independent-projects/tools/registry-client/pom.xml @@ -50,7 +50,7 @@ org.jboss.jandex jandex-maven-plugin - 1.0.8 + 1.1.0 make-index diff --git a/tcks/microprofile-rest-client-reactive/pom.xml b/tcks/microprofile-rest-client-reactive/pom.xml index c8719dbcadd69..84a10536fb84e 100644 --- a/tcks/microprofile-rest-client-reactive/pom.xml +++ b/tcks/microprofile-rest-client-reactive/pom.xml @@ -88,7 +88,7 @@ org.jboss.jandex jandex-maven-plugin - 1.0.8 + 1.1.0 make-index From 10bd54a87d2e2e50066bc083d9e2542e79d9cbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Tue, 1 Jun 2021 17:10:15 +0200 Subject: [PATCH 3/5] Upgrade to org.kordamp.gradle.jandex 0.11.0 --- docs/src/main/asciidoc/cdi-reference.adoc | 2 +- .../jandex-basic-multi-module-project/common/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/cdi-reference.adoc b/docs/src/main/asciidoc/cdi-reference.adoc index aa5add348c6b9..92fac4e658f0a 100644 --- a/docs/src/main/asciidoc/cdi-reference.adoc +++ b/docs/src/main/asciidoc/cdi-reference.adoc @@ -72,7 +72,7 @@ If you are are using gradle, you can apply the following plugin to your `build.g [source,groovy] ---- plugins { - id 'org.kordamp.gradle.jandex' version '0.10.0' + id 'org.kordamp.gradle.jandex' version '0.11.0' } ---- diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle index 73a04793a63cc..fe90b053de660 100644 --- a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle +++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle @@ -1,7 +1,7 @@ plugins { id 'io.quarkus' id 'java-library' - id "org.kordamp.gradle.jandex" version "0.10.0" + id "org.kordamp.gradle.jandex" version "0.11.0" } dependencies { From 5bbba938cb48d2fce963a8ff4ac3e840286a1fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 2 Jun 2021 08:37:11 +0200 Subject: [PATCH 4/5] Revert part of "Hibernate Validator - Work around Jandex issue in enclosingTarget()" This reverts the workaround from commit f6cffe0efdf4215ce09da17d801265905075e4ef, but preserves the test. Assuming jandex indexes are always built with Jandex 2.3.0+, we no longer need this workaround. --- .../HibernateValidatorProcessor.java | 49 +++++++------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index e331c6deadc3d..5509ef44580a4 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -273,37 +273,26 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC contributeClass(classNamesToBeValidated, indexView, annotation.target().asClass().name()); // no need for reflection in the case of a class level constraint } else if (annotation.target().kind() == AnnotationTarget.Kind.TYPE) { - // there is a bug in Jandex regarding enclosingTarget() when annotations are on constructors located in a separate indexed library - // (enclosing target is a ClassInfo instead of a MethodInfo and enclosingTarget() tries to catch it to a MethodInfo - // leading to a ClassCastException) - // for now we swallow the exception, pending a bugfix in Jandex - // see https://github.com/quarkusio/quarkus/issues/17491 - try { - // container element constraints - AnnotationTarget enclosingTarget = annotation.target().asType().enclosingTarget(); - if (enclosingTarget.kind() == AnnotationTarget.Kind.FIELD) { - contributeClass(classNamesToBeValidated, indexView, - enclosingTarget.asField().declaringClass().name()); - reflectiveFields.produce(new ReflectiveFieldBuildItem(enclosingTarget.asField())); - if (annotation.target().asType().target() != null) { - contributeClassMarkedForCascadingValidation(classNamesToBeValidated, indexView, - consideredAnnotation, - annotation.target().asType().target()); - } - } else if (enclosingTarget.kind() == AnnotationTarget.Kind.METHOD) { - contributeClass(classNamesToBeValidated, indexView, - enclosingTarget.asMethod().declaringClass().name()); - reflectiveMethods.produce(new ReflectiveMethodBuildItem(enclosingTarget.asMethod())); - if (annotation.target().asType().target() != null) { - contributeClassMarkedForCascadingValidation(classNamesToBeValidated, indexView, - consideredAnnotation, - annotation.target().asType().target()); - } - contributeMethodsWithInheritedValidation(methodsWithInheritedValidation, indexView, - enclosingTarget.asMethod()); + // container element constraints + AnnotationTarget enclosingTarget = annotation.target().asType().enclosingTarget(); + if (enclosingTarget.kind() == AnnotationTarget.Kind.FIELD) { + contributeClass(classNamesToBeValidated, indexView, enclosingTarget.asField().declaringClass().name()); + reflectiveFields.produce(new ReflectiveFieldBuildItem(enclosingTarget.asField())); + if (annotation.target().asType().target() != null) { + contributeClassMarkedForCascadingValidation(classNamesToBeValidated, indexView, + consideredAnnotation, + annotation.target().asType().target()); } - } catch (Exception e) { - // ignore + } else if (enclosingTarget.kind() == AnnotationTarget.Kind.METHOD) { + contributeClass(classNamesToBeValidated, indexView, enclosingTarget.asMethod().declaringClass().name()); + reflectiveMethods.produce(new ReflectiveMethodBuildItem(enclosingTarget.asMethod())); + if (annotation.target().asType().target() != null) { + contributeClassMarkedForCascadingValidation(classNamesToBeValidated, indexView, + consideredAnnotation, + annotation.target().asType().target()); + } + contributeMethodsWithInheritedValidation(methodsWithInheritedValidation, indexView, + enclosingTarget.asMethod()); } } } From 4b6a193ca6e62483e2342faa22247d733ab6280d Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 3 Jun 2021 16:17:12 +0200 Subject: [PATCH 5/5] Upgrade to SmallRye GraphQL 1.2.4 --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index c212a63bce2ea..7f246b45d5154 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -46,7 +46,7 @@ 3.0.2 3.0.1 2.1.5 - 1.2.3 + 1.2.4 2.0.0 5.1.0 3.2.0