This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ad7a9cd360123b452c6cc054cf9bfbe12131deee
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Nov 22 13:38:16 2022 +0100
Revert "CAMEL-18707: Upgrade to Jandex 3.0.3 (#8735)"
This reverts commit 469faf73eca13d7f006fa1f8e54fbd4326cc0df5.
---
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, 14 insertions(+), 15 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 88db7c5c142..2ec8d253c8a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -282,7 +282,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>3.0.3</jandex-version>
+ <jandex-version>2.4.3.Final</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 765fd4a8009..8adbef6aab1 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>io.smallrye</groupId>
+ <groupId>org.jboss</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 2e8c7a9f8f8..a9ab21ad219 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.parameterTypes().get(0);
+ final Type parameterType = method.parameters().get(0);
//
// Others
diff --git a/parent/pom.xml b/parent/pom.xml
index ab77728d48e..95e33781fa5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -258,7 +258,7 @@
<jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
<jackrabbit-version>2.21.13</jackrabbit-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
- <jandex-version>3.0.3</jandex-version>
+ <jandex-version>2.4.3.Final</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 3a47e8c4b89..ffddf592056 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>io.smallrye</groupId>
+ <groupId>org.jboss</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 e87432925f3..2e87b04c612 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.parameterTypes()) {
+ for (Type type : mi.parameters()) {
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 0874f04fed3..7cc3e2f298c 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.parameterTypes().get(0);
+ Type from = ee.parameters().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.parameterTypes().stream().findFirst().map(Type::toString).orElse("");
- String str2 =
o2.parameterTypes().stream().findFirst().map(Type::toString).orElse("");
+ String str1 =
o1.parameters().stream().findFirst().map(Type::toString).orElse("");
+ String str2 =
o2.parameters().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.parameterTypes().get(0).toString();
+ String from = method.parameters().get(0).toString();
// clip generics
if (to.indexOf('<') != -1) {
to = to.substring(0, to.indexOf('<'));
@@ -518,8 +518,7 @@ public class TypeConverterLoaderGeneratorMojo extends
AbstractGeneratorMojo {
// the 2nd parameter is optional and can either be Exchange or
CamelContext
String param = "";
String paramType
- = converter.parameterTypes().size() == 2
- ?
converter.parameterTypes().get(1).asClassType().name().toString() : null;
+ = converter.parameters().size() == 2 ?
converter.parameters().get(1).asClassType().name().toString() : null;
if (paramType != null) {
if ("org.apache.camel.Exchange".equals(paramType)) {
param = ", exchange";
@@ -527,7 +526,7 @@ public class TypeConverterLoaderGeneratorMojo extends
AbstractGeneratorMojo {
param = ", camelContext";
}
}
- String type = toString(converter.parameterTypes().get(0));
+ String type = toString(converter.parameters().get(0));
String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") ";
return pfx + "(" + cast + "value" + param + ")";
}
@@ -540,9 +539,9 @@ public class TypeConverterLoaderGeneratorMojo extends
AbstractGeneratorMojo {
converterClasses.add(converter.declaringClass().toString());
pfx = "get" + converter.declaringClass().simpleName() + "()." +
converter.name();
}
- String type =
toString(converter.parameterTypes().get(converter.parameterTypes().size() - 2));
+ String type =
toString(converter.parameters().get(converter.parameters().size() - 2));
String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") ";
- return pfx + "(type, " + (converter.parameterTypes().size() == 4 ?
"exchange, " : "") + cast + "value" + ", registry)";
+ return pfx + "(type, " + (converter.parameters().size() == 4 ?
"exchange, " : "") + cast + "value" + ", registry)";
}
private static boolean isFallbackCanPromote(MethodInfo element) {
