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/08/18 12:57:07 UTC
[camel-quarkus] branch main updated (b73c280fb9 -> e7d2479f88)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from b73c280fb9 perf-regression: avoid using fixed port #4004
new 592f260804 Upgrade Quarkus to 2.12.0.CR1
new f89f05df83 Disable js-dsl native tests due to #3961
new 907f3afdc7 Disable FOP native tests due to #3965
new e7d2479f88 Temporarily work around map style configuration property resolution due to #4011
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/antora.yml | 6 +-
extensions-support/azure-core/runtime/pom.xml | 10 +++
...AbstractClientApplicationBaseSubstitutions.java | 73 ++++++++++++++++++++++
.../deployment/XStreamSupportProcessor.java | 15 +++--
.../influxdb/deployment/InfluxdbProcessor.java | 9 +--
.../camel/quarkus/core/CoreThreadPoolsTest.java | 2 +
integration-tests/fop/pom.xml | 2 +
.../camel/quarkus/component/grpc/it/GrpcTest.java | 7 ++-
.../camel/quarkus/component/jq/it/JqRoutes.java | 8 +++
.../jq/src/main/resources/application.properties | 6 +-
integration-tests/js-dsl/pom.xml | 3 +-
integration-tests/kudu/pom.xml | 4 +-
pom.xml | 10 +--
poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++--
.../src/main/generated/flattened-reduced-pom.xml | 10 +--
.../generated/flattened-reduced-verbose-pom.xml | 10 +--
.../apache/camel/quarkus/test/CallbackUtil.java | 6 ++
17 files changed, 154 insertions(+), 39 deletions(-)
create mode 100644 extensions-support/azure-core/runtime/src/main/java/com/microsoft/aad/msal4j/AbstractClientApplicationBaseSubstitutions.java
[camel-quarkus] 02/04: Disable js-dsl native tests due to #3961
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f89f05df83ea57627d0c00e32b4c031a71c8639e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Aug 5 09:45:56 2022 +0100
Disable js-dsl native tests due to #3961
---
integration-tests/js-dsl/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/js-dsl/pom.xml b/integration-tests/js-dsl/pom.xml
index 7ba331016d..7d06320d55 100644
--- a/integration-tests/js-dsl/pom.xml
+++ b/integration-tests/js-dsl/pom.xml
@@ -75,6 +75,7 @@
<profiles>
+ <!-- https://github.com/apache/camel-quarkus/issues/3961
<profile>
<id>native</id>
<activation>
@@ -102,6 +103,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
[camel-quarkus] 04/04: Temporarily work around map style configuration property resolution due to #4011
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e7d2479f88d4d46185cc6632969ae243024da6a7
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Aug 18 10:58:32 2022 +0100
Temporarily work around map style configuration property resolution due to #4011
---
.../java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java | 2 ++
.../java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java | 8 ++++++++
integration-tests/jq/src/main/resources/application.properties | 6 ++++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java b/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java
index 959bf9fd5e..3375f166fb 100644
--- a/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java
+++ b/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.quarkus.core;
+import io.quarkus.test.junit.DisabledOnIntegrationTest;
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
@@ -30,6 +31,7 @@ public class CoreThreadPoolsTest {
get("/core/thread-pools/default").then().body(is("default|true|5|10|20|DiscardOldest"));
}
+ @DisabledOnIntegrationTest("https://github.com/apache/camel-quarkus/issues/4011")
@Test
public void testCustomThreadPoolsConfiguredByProperties() {
get("/core/thread-pools/customPool").then().body(is("customPool|false|1|10|20|Abort"));
diff --git a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java
index 18589c84f8..2fa69f5961 100644
--- a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java
+++ b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java
@@ -16,12 +16,20 @@
*/
package org.apache.camel.quarkus.component.jq.it;
+import java.util.Map;
+
import org.apache.camel.builder.RouteBuilder;
public class JqRoutes extends RouteBuilder {
@Override
public void configure() throws Exception {
+ // TODO: Revert back to using config properties
+ // https://github.com/apache/camel-quarkus/issues/4011
+ Map<String, String> globalOptions = getContext().getGlobalOptions();
+ globalOptions.put("CamelJacksonEnableTypeConverter", "true");
+ globalOptions.put("CamelJacksonTypeConverterToPojo", "true");
+
from("direct:expression")
.transform().jq(".foo")
.to("mock:expression");
diff --git a/integration-tests/jq/src/main/resources/application.properties b/integration-tests/jq/src/main/resources/application.properties
index 26d93d354f..98686c9447 100644
--- a/integration-tests/jq/src/main/resources/application.properties
+++ b/integration-tests/jq/src/main/resources/application.properties
@@ -14,5 +14,7 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-camel.context.global-options[CamelJacksonEnableTypeConverter] = true
-camel.context.global-options[CamelJacksonTypeConverterToPojo] = true
+
+# https://github.com/apache/camel-quarkus/issues/4011
+#camel.context.global-options[CamelJacksonEnableTypeConverter] = true
+#camel.context.global-options[CamelJacksonTypeConverterToPojo] = true
[camel-quarkus] 01/04: Upgrade Quarkus to 2.12.0.CR1
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 592f26080407edbdd734b9bca03f2dc956cce368
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jul 21 17:51:56 2022 +0100
Upgrade Quarkus to 2.12.0.CR1
---
docs/antora.yml | 6 +-
extensions-support/azure-core/runtime/pom.xml | 10 +++
...AbstractClientApplicationBaseSubstitutions.java | 73 ++++++++++++++++++++++
.../deployment/XStreamSupportProcessor.java | 15 +++--
.../influxdb/deployment/InfluxdbProcessor.java | 9 +--
.../camel/quarkus/component/grpc/it/GrpcTest.java | 7 ++-
integration-tests/js-dsl/pom.xml | 1 -
integration-tests/kudu/pom.xml | 4 +-
pom.xml | 10 +--
poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++--
.../src/main/generated/flattened-reduced-pom.xml | 10 +--
.../generated/flattened-reduced-verbose-pom.xml | 10 +--
.../apache/camel/quarkus/test/CallbackUtil.java | 6 ++
13 files changed, 136 insertions(+), 37 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c2e1c72d0d..18b3b4e758 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: 2.12.0.CR1 # 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/azure-core/runtime/pom.xml b/extensions-support/azure-core/runtime/pom.xml
index e08930acb6..95845baeac 100644
--- a/extensions-support/azure-core/runtime/pom.xml
+++ b/extensions-support/azure-core/runtime/pom.xml
@@ -57,6 +57,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.graalvm.nativeimage</groupId>
+ <artifactId>svm</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions-support/azure-core/runtime/src/main/java/com/microsoft/aad/msal4j/AbstractClientApplicationBaseSubstitutions.java b/extensions-support/azure-core/runtime/src/main/java/com/microsoft/aad/msal4j/AbstractClientApplicationBaseSubstitutions.java
new file mode 100644
index 0000000000..746d4b917b
--- /dev/null
+++ b/extensions-support/azure-core/runtime/src/main/java/com/microsoft/aad/msal4j/AbstractClientApplicationBaseSubstitutions.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.microsoft.aad.msal4j;
+
+import java.util.function.BooleanSupplier;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "com.microsoft.aad.msal4j.AbstractClientApplicationBase", onlyWith = AbstractClientApplicationBaseSubstitutions.Msal4jIsPresent.class)
+public final class AbstractClientApplicationBaseSubstitutions {
+
+ /**
+ * Cuts out instantiation of AcquireTokenByInteractiveFlowSupplier which leads to references of classes
+ * in package com.sun.net.httpserver. Since GraalVM 2.22.0, this package is not on the module path by default.
+ *
+ * An additional option is required for native-image in order to compile the application successfully
+ * -J--add-modules=jdk.httpserver.
+ *
+ * Given that interactive authentication is of little value in a production application (since in this case it requires
+ * the launching of a web browser and some human intervention to examine the resulting web page), it should be safe to
+ * disable AcquireTokenByInteractiveFlowSupplier.
+ */
+ @Substitute
+ private AuthenticationResultSupplier getAuthenticationResultSupplier(MsalRequest msalRequest) {
+ AuthenticationResultSupplier supplier;
+ if (msalRequest instanceof DeviceCodeFlowRequest) {
+ supplier = new AcquireTokenByDeviceCodeFlowSupplier(PublicClientApplication.class.cast(this),
+ (DeviceCodeFlowRequest) msalRequest);
+ } else if (msalRequest instanceof SilentRequest) {
+ supplier = new AcquireTokenSilentSupplier(AbstractClientApplicationBase.class.cast(this),
+ (SilentRequest) msalRequest);
+ } else if (msalRequest instanceof InteractiveRequest) {
+ throw new IllegalArgumentException("InteractiveRequest is not supported on GraalVM");
+ } else if (msalRequest instanceof ClientCredentialRequest) {
+ supplier = new AcquireTokenByClientCredentialSupplier(ConfidentialClientApplication.class.cast(this),
+ (ClientCredentialRequest) msalRequest);
+ } else if (msalRequest instanceof OnBehalfOfRequest) {
+ supplier = new AcquireTokenByOnBehalfOfSupplier(ConfidentialClientApplication.class.cast(this),
+ (OnBehalfOfRequest) msalRequest);
+ } else {
+ supplier = new AcquireTokenByAuthorizationGrantSupplier(AbstractClientApplicationBase.class.cast(this), msalRequest,
+ null);
+ }
+ return supplier;
+ }
+
+ static final class Msal4jIsPresent implements BooleanSupplier {
+ @Override
+ public boolean getAsBoolean() {
+ try {
+ Thread.currentThread().getContextClassLoader().loadClass("com.microsoft.aad.msal4j.Credential");
+ return true;
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
+ }
+ }
+}
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..e38c8bcb48 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,6 +27,7 @@ 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;
@@ -45,13 +46,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 +242,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/pom.xml b/pom.xml
index 5d0f63c5a3..b73d01f719 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>2.12.0.CR1</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/ -->
@@ -91,8 +91,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>
@@ -115,9 +115,9 @@
<jna-platform.version>5.6.0</jna-platform.version><!-- @sync com.azure:azure-identity:${azure-identity-version} dep:net.java.dev.jna:jna-platform -->
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
<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 -->
+ <kafka.version>3.2.1</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 1c952c6e90..deda3ac389 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -10212,7 +10212,7 @@
<dependency>
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10354,12 +10354,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} -->
@@ -10374,17 +10374,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 3c72181d95..ed866b5355 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -10188,7 +10188,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -10330,7 +10330,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>
@@ -10345,17 +10345,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 f1045b9083..89e1d65240 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -10188,7 +10188,7 @@
<dependency>
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10330,7 +10330,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} -->
@@ -10345,17 +10345,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;
+ }
}
}
[camel-quarkus] 03/04: Disable FOP native tests due to #3965
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 907f3afdc764731b1563496e7e5974c6751b7f2c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Aug 15 11:41:28 2022 +0100
Disable FOP native tests due to #3965
---
integration-tests/fop/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/fop/pom.xml b/integration-tests/fop/pom.xml
index 4c79fb8f3b..ec0330e3d6 100644
--- a/integration-tests/fop/pom.xml
+++ b/integration-tests/fop/pom.xml
@@ -70,6 +70,7 @@
<profiles>
+ <!-- https://github.com/apache/camel-quarkus/issues/3965
<profile>
<id>native</id>
<activation>
@@ -97,6 +98,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>