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 e1c3c0118594ef83cef18d435e941933bb588e02
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Jul 21 17:51:56 2022 +0100
Upgrade Quarkus to 2.12.0.CR1
---
docs/antora.yml | 6 +++---
.../xstream/deployment/XStreamSupportProcessor.java | 16 +++++++++++-----
.../component/influxdb/deployment/InfluxdbProcessor.java | 9 +++++----
.../apache/camel/quarkus/component/grpc/it/GrpcTest.java | 7 +++++--
integration-tests/js-dsl/pom.xml | 1 -
integration-tests/kudu/pom.xml | 4 +++-
integration-tests/xstream/pom.xml | 4 ++++
pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++-----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 ++++----
.../src/main/generated/flattened-reduced-verbose-pom.xml | 8 ++++----
.../java/org/apache/camel/quarkus/test/CallbackUtil.java | 6 ++++++
12 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c2e1c72d0d..33197c8d7b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,9 +31,9 @@ asciidoc:
target-maven-version: 3.8.6 # replace ${target-maven-version}
camel-version: 3.18.1 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.11.1.Final # replace ${quarkus.version}
- graalvm-version: 22.1.0 # replace ${graalvm.version}
- graalvm-docs-version: 22.1
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+ graalvm-version: 22.2.0 # replace ${graalvm.version}
+ graalvm-docs-version: 22.2
# attributes used in xrefs to other Antora components
cq-camel-components: 3.18.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git
a/extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
b/extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
index ae0a5151db..eae9f6afec 100644
---
a/extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
+++
b/extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
@@ -27,8 +27,10 @@ import io.quarkus.deployment.annotations.BuildStep;
import
io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
public class XStreamSupportProcessor {
@@ -45,13 +47,14 @@ public class XStreamSupportProcessor {
}
@BuildStep
- void process(CombinedIndexBuildItem indexBuildItem,
- BuildProducer<ReflectiveClassBuildItem>
reflectiveClassBuildItemBuildProducer) {
+ void process(
+ CombinedIndexBuildItem indexBuildItem,
+ BuildProducer<ReflectiveClassBuildItem>
reflectiveClassBuildItemBuildProducer,
+ BuildProducer<RuntimeInitializedClassBuildItem>
runtimeInitializedClass) {
for (String className : INTERFACES_TO_REGISTER) {
- for (ClassInfo i :
indexBuildItem.getIndex().getAllKnownImplementors(DotName.createSimple(className)))
{
- String name = i.name().toString();
-
+ for (ClassInfo classInfo :
indexBuildItem.getIndex().getAllKnownImplementors(DotName.createSimple(className)))
{
+ String name = classInfo.name().toString();
if (!EXCLUDED_CLASSES.contains(name)) {
reflectiveClassBuildItemBuildProducer.produce(new
ReflectiveClassBuildItem(false, false, name));
}
@@ -240,5 +243,8 @@ public class XStreamSupportProcessor {
reflectiveClassBuildItemBuildProducer.produce(new
ReflectiveClassBuildItem(true, false,
"com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder"));
+
+ runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(
+
"com.thoughtworks.xstream.converters.extended.DynamicProxyConverter$Reflections"));
}
}
diff --git
a/extensions/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.java
b/extensions/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.java
index 8df98a7733..42cfd6667d 100644
---
a/extensions/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.java
+++
b/extensions/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.java
@@ -24,23 +24,20 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.IndexView;
class InfluxdbProcessor {
-
private static String INFLUXDB_DTO_PACKAGE = "org.influxdb.dto";
-
private static final String FEATURE = "camel-influxdb";
@BuildStep
FeatureBuildItem feature() {
-
return new FeatureBuildItem(FEATURE);
}
@BuildStep
void sslSupport(BuildProducer<ExtensionSslNativeSupportBuildItem>
extensionSslNativeSupport) {
-
// Indicates that this extension would like the SSL support to be
enabled
extensionSslNativeSupport.produce(new
ExtensionSslNativeSupportBuildItem(FEATURE));
}
@@ -68,4 +65,8 @@ class InfluxdbProcessor {
return new IndexDependencyBuildItem("org.influxdb", "influxdb-java");
}
+ @BuildStep
+ void
runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem>
runtimeInitializedClass) {
+ runtimeInitializedClass.produce(new
RuntimeInitializedClassBuildItem("org.msgpack.core.buffer.DirectBufferAccess"));
+ }
}
diff --git
a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
index eaae495205..4a90a7ff06 100644
---
a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
+++
b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java
@@ -54,6 +54,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
@QuarkusTestResource(GrpcServerTestResource.class)
@@ -238,7 +239,8 @@ class GrpcTest {
PongResponseStreamObserver responseObserver = new
PongResponseStreamObserver(latch);
StreamObserver<PingRequest> requestObserver =
pingPongStub.pingAsyncSync(responseObserver);
requestObserver.onNext(pingRequest);
- latch.await(5, TimeUnit.SECONDS);
+ requestObserver.onCompleted();
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
Awaitility.await().atMost(5, TimeUnit.SECONDS).until(() -> {
JsonPath json = RestAssured.get("/grpc/tls")
@@ -301,7 +303,8 @@ class GrpcTest {
PongResponseStreamObserver responseObserver = new
PongResponseStreamObserver(latch);
StreamObserver<PingRequest> requestObserver =
pingPongStub.pingAsyncSync(responseObserver);
requestObserver.onNext(pingRequest);
- latch.await(5, TimeUnit.SECONDS);
+ requestObserver.onCompleted();
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
Awaitility.await().atMost(5, TimeUnit.SECONDS).until(() -> {
JsonPath json = RestAssured.get("/grpc/jwt")
diff --git a/integration-tests/js-dsl/pom.xml b/integration-tests/js-dsl/pom.xml
index fb162ae218..7ba331016d 100644
--- a/integration-tests/js-dsl/pom.xml
+++ b/integration-tests/js-dsl/pom.xml
@@ -84,7 +84,6 @@
</activation>
<properties>
<quarkus.package.type>native</quarkus.package.type>
-
<quarkus.native.additional-build-args>--language:js</quarkus.native.additional-build-args>
</properties>
<build>
<plugins>
diff --git a/integration-tests/kudu/pom.xml b/integration-tests/kudu/pom.xml
index 76fe7abe51..ee659ca369 100644
--- a/integration-tests/kudu/pom.xml
+++ b/integration-tests/kudu/pom.xml
@@ -32,7 +32,9 @@
<properties>
<!-- This is to allow the "deep reflection" we do in
KuduInfrastructureTestHelper -->
- <argLine>--add-opens java.base/java.net=ALL-UNNAMED</argLine>
+ <opens>java.base/java.net=ALL-UNNAMED</opens>
+ <argLine>--add-opens ${opens}</argLine>
+
<quarkus.native.additional-build-args>-J--add-opens=${opens}</quarkus.native.additional-build-args>
</properties>
<dependencies>
diff --git a/integration-tests/xstream/pom.xml
b/integration-tests/xstream/pom.xml
index f84ba8c8e6..330ec54318 100644
--- a/integration-tests/xstream/pom.xml
+++ b/integration-tests/xstream/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: XStream</name>
<description>Integration tests for Camel Quarkus XStream
extension</description>
+ <properties>
+
<quarkus.native.additional-build-args>-J--add-opens=java.base/java.io=ALL-UNNAMED,-J--add-opens=java.base/java.util=ALL-UNNAMED</quarkus.native.additional-build-args>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/pom.xml b/pom.xml
index 739c775af7..c72d13103c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<quarkiverse-minio.version>2.9.1</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.11.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.36.0</quarkus-qpid-jms.version><!--
https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -88,8 +88,8 @@
<geny.version>0.6.2</geny.version>
<github-api.version>1.111</github-api.version><!-- Used in a Groovy
script bellow -->
<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 -->
- <graalvm.version>22.1.0</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.47.0</grpc.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <graalvm.version>22.2.0</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
+ <grpc.version>1.48.1</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>
@@ -114,7 +114,7 @@
<json-smart.version>2.4.7</json-smart.version>
<kafka.version>3.1.0</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>1.6.21</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>1.7.10</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kryo.version>2.24.0</kryo.version><!-- @sync
org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo
-->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark
-->
<msal4j.version>1.12.0</msal4j.version><!-- @sync
com.azure:azure-identity:${azure-identity-version}
dep:com.microsoft.azure:msal4j -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index ded37d2bf5..b12d07c722 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -10306,12 +10306,12 @@
<dependency>
<groupId>org.graalvm.js</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>22.1.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>22.2.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js-scriptengine</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>22.1.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>22.2.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.influxdb</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10326,17 +10326,17 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-script-util</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.6.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.7.10</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.6.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.7.10</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm-host</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.6.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.7.10</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jruby.jcodings</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 8e26c3aa84..c69d61d806 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -10262,7 +10262,7 @@
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
- <version>22.1.0</version>
+ <version>22.2.0</version>
</dependency>
<dependency>
<groupId>org.influxdb</groupId>
@@ -10277,17 +10277,17 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-script-util</artifactId>
- <version>1.6.21</version>
+ <version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm</artifactId>
- <version>1.6.21</version>
+ <version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
- <version>1.6.21</version>
+ <version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.jruby.jcodings</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index aa82b2e013..e9ee9ced7c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -10262,7 +10262,7 @@
<dependency>
<groupId>org.graalvm.js</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>22.1.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>22.2.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.influxdb</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10277,17 +10277,17 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-script-util</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.6.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.7.10</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.6.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.7.10</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kotlin-scripting-jvm-host</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.6.21</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.7.10</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.jruby.jcodings</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
index eee10d55ab..b4f8d3fa56 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
@@ -25,6 +25,7 @@ import java.util.function.Function;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.TestInstances;
import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -162,5 +163,10 @@ public class CallbackUtil {
public ExecutionMode getExecutionMode() {
return null;
}
+
+ @Override
+ public ExecutableInvoker getExecutableInvoker() {
+ return null;
+ }
}
}
