This is an automated email from the ASF dual-hosted git repository. klease pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 469faf73eca CAMEL-18707: Upgrade to Jandex 3.0.3 (#8735) 469faf73eca is described below commit 469faf73eca13d7f006fa1f8e54fbd4326cc0df5 Author: klease <38634989+kle...@users.noreply.github.com> AuthorDate: Mon Nov 21 15:40:01 2022 +0100 CAMEL-18707: Upgrade to Jandex 3.0.3 (#8735) Change maven group to io.smallrye. Adapt to minor API changes in Jandex 3. --- camel-dependencies/pom.xml | 2 +- dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml | 2 +- .../maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 2 +- parent/pom.xml | 2 +- tooling/maven/camel-package-maven-plugin/pom.xml | 2 +- .../maven/packaging/GenerateInvokeOnHeaderMojo.java | 2 +- .../packaging/TypeConverterLoaderGeneratorMojo.java | 17 +++++++++-------- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e67d5f210ef..3ab8cdf9c39 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -281,7 +281,7 @@ <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version> <jakarta-mail-version>1.6.7</jakarta-mail-version> <jakarta.el-version>3.0.3</jakarta.el-version> - <jandex-version>2.4.3.Final</jandex-version> + <jandex-version>3.0.3</jandex-version> <jansi-version>2.4.0</jansi-version> <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version> <jasypt-version>1.9.3</jasypt-version> diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml index 8adbef6aab1..765fd4a8009 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml @@ -118,7 +118,7 @@ </dependency> <dependency> - <groupId>org.jboss</groupId> + <groupId>io.smallrye</groupId> <artifactId>jandex</artifactId> <version>${jandex-version}</version> </dependency> diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java index a9ab21ad219..2e8c7a9f8f8 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java @@ -987,7 +987,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo { @SuppressWarnings("MethodLength") private boolean generateSetValue(CodeBlock.Builder cb, MethodInfo method, Collection<AnnotationSpec> annotations) { final String name = StringHelper.camelCaseToDash(method.name()).toLowerCase(Locale.US).substring(4); - final Type parameterType = method.parameters().get(0); + final Type parameterType = method.parameterTypes().get(0); // // Others diff --git a/parent/pom.xml b/parent/pom.xml index a3233fd1d93..2ff2effde14 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -257,7 +257,7 @@ <jackson2-version>2.14.0</jackson2-version> <jackrabbit-version>2.21.13</jackrabbit-version> <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version> - <jandex-version>2.4.3.Final</jandex-version> + <jandex-version>3.0.3</jandex-version> <jansi-version>2.4.0</jansi-version> <jasypt-version>1.9.3</jasypt-version> <java-grok-version>0.1.9</java-grok-version> diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index ffddf592056..3a47e8c4b89 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -126,7 +126,7 @@ <!-- jandex for annotation processing --> <dependency> - <groupId>org.jboss</groupId> + <groupId>io.smallrye</groupId> <artifactId>jandex</artifactId> <version>${jandex-version}</version> </dependency> diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java index 2e87b04c612..e87432925f3 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java @@ -141,7 +141,7 @@ public class GenerateInvokeOnHeaderMojo extends AbstractGeneratorMojo { } else { model.setReturnType(mi.returnType().toString()); } - for (Type type : mi.parameters()) { + for (Type type : mi.parameterTypes()) { String arg = type.name().toString(); model.addArgs(arg); } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java index 7cc3e2f298c..0874f04fed3 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java @@ -106,7 +106,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo { classConverters.addFallbackTypeConverter(ee); } else { Type to = ee.returnType(); - Type from = ee.parameters().get(0); + Type from = ee.parameterTypes().get(0); if (asBoolean(annotation, "generateBulkLoader")) { bulkConverters.add(ee); } else { @@ -161,8 +161,8 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo { Integer order2 = asInteger(o2.annotation(CONVERTER_ANNOTATION), "order"); sort = order1.compareTo(order2); if (sort == 0) { - String str1 = o1.parameters().stream().findFirst().map(Type::toString).orElse(""); - String str2 = o2.parameters().stream().findFirst().map(Type::toString).orElse(""); + String str1 = o1.parameterTypes().stream().findFirst().map(Type::toString).orElse(""); + String str2 = o2.parameterTypes().stream().findFirst().map(Type::toString).orElse(""); return str1.compareTo(str2); } } @@ -295,7 +295,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo { } else { to = method.returnType().name().toString(); } - String from = method.parameters().get(0).toString(); + String from = method.parameterTypes().get(0).toString(); // clip generics if (to.indexOf('<') != -1) { to = to.substring(0, to.indexOf('<')); @@ -518,7 +518,8 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo { // the 2nd parameter is optional and can either be Exchange or CamelContext String param = ""; String paramType - = converter.parameters().size() == 2 ? converter.parameters().get(1).asClassType().name().toString() : null; + = converter.parameterTypes().size() == 2 + ? converter.parameterTypes().get(1).asClassType().name().toString() : null; if (paramType != null) { if ("org.apache.camel.Exchange".equals(paramType)) { param = ", exchange"; @@ -526,7 +527,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo { param = ", camelContext"; } } - String type = toString(converter.parameters().get(0)); + String type = toString(converter.parameterTypes().get(0)); String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") "; return pfx + "(" + cast + "value" + param + ")"; } @@ -539,9 +540,9 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo { converterClasses.add(converter.declaringClass().toString()); pfx = "get" + converter.declaringClass().simpleName() + "()." + converter.name(); } - String type = toString(converter.parameters().get(converter.parameters().size() - 2)); + String type = toString(converter.parameterTypes().get(converter.parameterTypes().size() - 2)); String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") "; - return pfx + "(type, " + (converter.parameters().size() == 4 ? "exchange, " : "") + cast + "value" + ", registry)"; + return pfx + "(type, " + (converter.parameterTypes().size() == 4 ? "exchange, " : "") + cast + "value" + ", registry)"; } private static boolean isFallbackCanPromote(MethodInfo element) {