You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/10/10 06:31:37 UTC
[camel-quarkus] 01/02: Upgrade Quarkus to 2.14.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 02c43eb353d14efb95583b718fe784f2306a7bd0
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 15 13:34:36 2022 +0100
Upgrade Quarkus to 2.14.0.CR1
---
docs/antora.yml | 2 +-
.../quarkus/core/deployment/ConsumeProcessor.java | 2 +-
.../core/deployment/InjectionPointsProcessor.java | 2 +-
.../component/grpc/deployment/GrpcProcessor.java | 11 +++--
integration-tests/kubernetes/pom.xml | 55 +++++++++++-----------
integration-tests/master-openshift/pom.xml | 3 --
pom.xml | 13 ++++-
7 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 4306f51936..66590918f5 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 3.18.2 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.13.1.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.2.0 # replace ${graalvm.version}
graalvm-docs-version: 22.2
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
index caa397c872..13f14d584c 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
@@ -101,7 +101,7 @@ public class ConsumeProcessor {
/* If there is @Consume on a method, make the declaring class a named injectable bean */
String beanName = namedValue(classInfo);
final Transformation transform = ctx.transform();
- if (!classInfo.annotations().keySet().stream().anyMatch(BEAN_DEFINING_ANNOTATIONS::contains)) {
+ if (!classInfo.annotationsMap().keySet().stream().anyMatch(BEAN_DEFINING_ANNOTATIONS::contains)) {
/* Only add @Singleton if there is no other bean defining annotation yet */
transform.add(Singleton.class);
}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
index e37c6a9399..5e4b471dd1 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
@@ -124,7 +124,7 @@ public class InjectionPointsProcessor {
if (injectionPoint.getTarget().kind() == AnnotationTarget.Kind.METHOD) {
final MethodInfo target = injectionPoint.getTarget().asMethod();
- final List<Type> types = target.parameters();
+ final List<Type> types = target.parameterTypes();
for (int i = 0; i < types.size(); i++) {
Type type = types.get(0);
diff --git a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
index ec0efa729e..10a0d20e0c 100644
--- a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
+++ b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
@@ -48,6 +48,7 @@ import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.MethodParameterInfo;
import org.jboss.jandex.Type;
class GrpcProcessor {
@@ -157,7 +158,9 @@ class GrpcProcessor {
if (isCandidateServiceMethod(method)) {
String[] params = method.parameters()
.stream()
- .map(type -> type.name().toString())
+ .map(MethodParameterInfo::type)
+ .map(Type::name)
+ .map(DotName::toString)
.toArray(String[]::new);
ClassInfo classInfo = index
@@ -188,11 +191,11 @@ class GrpcProcessor {
}
private boolean isCandidateServiceMethod(MethodInfo method) {
- List<Type> parameters = method.parameters();
+ List<MethodParameterInfo> parameters = method.parameters();
if (parameters.size() == 1) {
- return parameters.get(0).name().toString().equals(StreamObserver.class.getName());
+ return parameters.get(0).type().name().toString().equals(StreamObserver.class.getName());
} else if (parameters.size() == 2) {
- return parameters.get(1).name().toString().equals(StreamObserver.class.getName());
+ return parameters.get(1).type().name().toString().equals(StreamObserver.class.getName());
}
return false;
}
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index ebc7a72b68..42d0a59cc1 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -71,34 +71,33 @@
<profiles>
-<!-- Disabled because of https://github.com/apache/camel-quarkus/issues/4095-->
-<!-- <profile>-->
-<!-- <id>native</id>-->
-<!-- <activation>-->
-<!-- <property>-->
-<!-- <name>native</name>-->
-<!-- </property>-->
-<!-- </activation>-->
-<!-- <properties>-->
-<!-- <quarkus.package.type>native</quarkus.package.type>-->
-<!-- </properties>-->
-<!-- <build>-->
-<!-- <plugins>-->
-<!-- <plugin>-->
-<!-- <groupId>org.apache.maven.plugins</groupId>-->
-<!-- <artifactId>maven-failsafe-plugin</artifactId>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <goals>-->
-<!-- <goal>integration-test</goal>-->
-<!-- <goal>verify</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
-<!-- </plugins>-->
-<!-- </build>-->
-<!-- </profile>-->
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <properties>
+ <quarkus.package.type>native</quarkus.package.type>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml
index 6c4b36439a..0ba05a8f6c 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -145,8 +145,6 @@
</plugins>
</build>
</profile>
-
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/4095
<profile>
<id>native</id>
<activation>
@@ -184,7 +182,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/pom.xml b/pom.xml
index 4b4fdbf45c..fb89ce7eb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<quarkiverse-minio.version>2.9.2</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.13.1.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.38.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -94,12 +94,16 @@
<google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync -->
<google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version><!-- TODO: Fix this in Camel https://github.com/apache/camel-quarkus/issues/4139 -->
<graalvm.version>22.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.49.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.49.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hbase.version>${hbase-version}</hbase.version>
<htrace.version>4.2.0-incubating</htrace.version><!-- Mess in hbase transitive deps -->
+<<<<<<< HEAD
<infinispan.version>13.0.11.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core -->
+=======
+ <infinispan.version>14.0.0.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core -->
+>>>>>>> 97a80ea020 (Upgrade Quarkus to 2.14.0.CR1)
<influxdb.version>${influx-java-driver-version}</influxdb.version>
<jackson1.version>1.9.13</jackson1.version><!-- Mess in the transitive dependencies of hbase-testing-util -->
<jackson-asl.version>${jackson1.version}</jackson-asl.version><!-- Can be different from jackson1.version on some occasions -->
@@ -127,8 +131,13 @@
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
<perfmark-api.version>0.25.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
+<<<<<<< HEAD
<protobuf.version>3.19.3</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<reactor-core.version>3.4.22</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
+=======
+ <protobuf.version>3.19.6</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
+ <reactor-core.version>3.4.21</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
+>>>>>>> 97a80ea020 (Upgrade Quarkus to 2.14.0.CR1)
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.5.0</retrofit.version>
<smallrye.reactive.messaging.camel.version>3.20.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->