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 2024/04/12 10:35:25 UTC
(camel-quarkus) branch quarkus-main updated (a15982cd42 -> a870cede1c)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard a15982cd42 Upgrade Quarkus to 3.10.0.CR1
add 71c8f4433c Remove jsch container DOCKER_MODS configuration
add 599d861022 JT400 Inquiry test
add a02012d329 [NettyHttp] Increase proxy connection timeout and make it configurable
add e9843295ea Improve the testability against Quarkus Platform BOMs
add b5bcb87894 Regen SBOM from commit e9843295ea9827235f46a3ccdd2818de33248092 (#5974)
add c0a9858385 Camel 4.5 : create langchain-embeddings extension Fixes #5970
add 1553fffda7 Temporarily rename any langchain doc xrefs to langchain4j
add bde3acad6a Fix auto milestone workflow title regex
add d291182b09 Http: use FIPS complaiant keystore and truststore (#5968)
add 09aa7fe4dc Remove findbugs exclusion from quarkus-grpc-common in gRPC extension (#5978)
add e6a6743a61 Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.1 to 3.3.0 (#5984)
add e490008680 Restore file tests original class naming
add ee206ec774 Create AWS bedrock extensions (#5987)
add dfe70e0326 Fix various ClassNotFoundExceptions for spring-redis extension
new 680ea9b944 Upgrade Quarkus to 3.10.0.CR1
new a870cede1c Disable microprofile-fault-tolerance testing due to #5995
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a15982cd42)
\
N -- N -- N refs/heads/quarkus-main (a870cede1c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
.github/workflows/assign-issue-milestone.yaml | 2 +-
camel-quarkus-sbom/camel-quarkus-sbom.json | 26404 ++++++++++---------
camel-quarkus-sbom/camel-quarkus-sbom.xml | 18255 ++++++-------
catalog/pom.xml | 26 +
.../components/aws-bedrock-agent-runtime.yml | 13 +
.../ROOT/examples/components/aws-bedrock-agent.yml | 13 +
.../ROOT/examples/components/aws-bedrock.yml | 13 +
.../examples/components/langchain-embeddings.yml | 13 +
docs/modules/ROOT/nav.adoc | 2 +
.../pages/reference/extensions/aws-bedrock.adoc | 47 +
.../reference/extensions/langchain-embeddings.adoc | 41 +
.../langchain-embeddings/deployment/pom.xml | 63 +
.../deployment/LangchainEmbeddingsProcessor.java | 46 +
.../langchain-embeddings}/pom.xml | 31 +-
.../runtime/pom.xml | 28 +-
.../main/resources/META-INF/quarkus-extension.yaml | 33 +
extensions-jvm/pom.xml | 1 +
extensions-jvm/spring-redis/runtime/pom.xml | 8 +-
extensions-support/spring/shade/core/pom.xml | 1 +
extensions/aws-bedrock/deployment/pom.xml | 63 +
.../bedrock/deployment/AwsBedrockProcessor.java | 14 +-
.../aws-bedrock}/pom.xml | 31 +-
.../aws-bedrock}/runtime/pom.xml | 29 +-
.../main/resources/META-INF/quarkus-extension.yaml | 32 +
extensions/grpc/runtime/pom.xml | 4 -
extensions/pom.xml | 1 +
.../foundation/core-fault-tolerance/pom.xml | 2 +
.../it/CoreFaultToleranceProducers.java | 2 +-
.../faulttolerance/it/CoreFaultToleranceIT.java | 2 +
.../faulttolerance/it/CoreFaultToleranceTest.java | 2 +
integration-test-groups/http/README.adoc | 6 +-
.../http/common/generate-certs.sh | 67 +
.../component/http/common/CommonProducers.java | 10 +-
.../src/main/resources/application.properties | 4 +-
.../main/resources/jsse/client-truststore.pkcs12 | Bin 0 -> 2246 bytes
.../common/src/main/resources/jsse/keystore.p12 | Bin 2421 -> 0 bytes
.../main/resources/jsse/localhost-keystore.pkcs12 | Bin 0 -> 3638 bytes
.../common/src/main/resources/jsse/truststore.jks | Bin 1018 -> 0 bytes
.../component/http/common/HttpTestResource.java | 1 +
integration-test-groups/http/common/v3.ext | 3 +
.../ProxyCapableClientInitializerFactory.java | 2 +-
integration-test-groups/pom.xml | 3 +-
.../{spring-redis => langchain-embeddings}/pom.xml | 14 +-
.../it/LangchainEmbeddingsResource.java} | 20 +-
.../embeddings/it/LangchainEmbeddingsTest.java} | 8 +-
integration-tests-jvm/pom.xml | 1 +
integration-tests-jvm/spring-redis/pom.xml | 38 +
.../spring/redis/it/SpringRedisProducers.java | 54 +
.../spring/redis/it/SpringRedisResource.java | 27 +-
.../spring/redis/it/SpringRedisRoutes.java | 46 +
.../component/spring/redis/it/SpringRedisTest.java | 21 +-
.../spring/redis/it/SpringRedisTestResource.java | 40 +-
.../spring-redis/src/test/resources/redis.conf | 21 +-
integration-tests-support/pom.xml | 25 +-
integration-tests/aws2/pom.xml | 17 +
.../camel/quarkus/component/aws2/CamelRoute.java | 4 +
.../file/it/{NonFlakyFileIT.java => FileIT.java} | 2 +-
.../it/{NonFlakyFileTest.java => FileTest.java} | 48 +-
...FileTestResource.java => FileTestResource.java} | 2 +-
integration-tests/foundation-grouped/pom.xml | 2 +
.../component/jsch/it/JschTestResource.java | 1 -
integration-tests/jt400/README.adoc | 11 +-
.../quarkus/component/jt400/it/Jt400Resource.java | 50 +-
.../quarkus/component/jt400/it/Jt400Routes.java | 59 +
.../src/main/resources/application.properties | 1 +
.../quarkus/component/jt400/it/Jt400Test.java | 154 +-
integration-tests/messaging/common/pom.xml | 145 +-
integration-tests/messaging/jms/pom.xml | 94 +-
integration-tests/messaging/sjms/pom.xml | 93 +-
pom.xml | 4 +-
poms/bom/pom.xml | 46 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 46 +-
.../src/main/generated/flattened-reduced-pom.xml | 66 +-
.../generated/flattened-reduced-verbose-pom.xml | 66 +-
.../camel-quarkus-banned-dependencies-spring.xml | 1 +
.../enforcer-rules/quarkus-banned-dependencies.xsl | 2 +-
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 4 +
77 files changed, 24241 insertions(+), 22310 deletions(-)
create mode 100644 docs/modules/ROOT/examples/components/aws-bedrock-agent-runtime.yml
create mode 100644 docs/modules/ROOT/examples/components/aws-bedrock-agent.yml
create mode 100644 docs/modules/ROOT/examples/components/aws-bedrock.yml
create mode 100644 docs/modules/ROOT/examples/components/langchain-embeddings.yml
create mode 100644 docs/modules/ROOT/pages/reference/extensions/aws-bedrock.adoc
create mode 100644 docs/modules/ROOT/pages/reference/extensions/langchain-embeddings.adoc
create mode 100644 extensions-jvm/langchain-embeddings/deployment/pom.xml
create mode 100644 extensions-jvm/langchain-embeddings/deployment/src/main/java/org/apache/camel/quarkus/component/langchain/embeddings/deployment/LangchainEmbeddingsProcessor.java
copy {integration-test-groups => extensions-jvm/langchain-embeddings}/pom.xml (53%)
copy extensions-jvm/{spring-redis => langchain-embeddings}/runtime/pom.xml (75%)
create mode 100644 extensions-jvm/langchain-embeddings/runtime/src/main/resources/META-INF/quarkus-extension.yaml
create mode 100644 extensions/aws-bedrock/deployment/pom.xml
copy integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/NonFlakyFileIT.java => extensions/aws-bedrock/deployment/src/main/java/org/apache/camel/quarkus/component/aws/bedrock/deployment/AwsBedrockProcessor.java (68%)
copy {integration-test-groups => extensions/aws-bedrock}/pom.xml (53%)
copy {extensions-jvm/spring-redis => extensions/aws-bedrock}/runtime/pom.xml (75%)
create mode 100644 extensions/aws-bedrock/runtime/src/main/resources/META-INF/quarkus-extension.yaml
create mode 100755 integration-test-groups/http/common/generate-certs.sh
create mode 100644 integration-test-groups/http/common/src/main/resources/jsse/client-truststore.pkcs12
delete mode 100644 integration-test-groups/http/common/src/main/resources/jsse/keystore.p12
create mode 100644 integration-test-groups/http/common/src/main/resources/jsse/localhost-keystore.pkcs12
delete mode 100644 integration-test-groups/http/common/src/main/resources/jsse/truststore.jks
create mode 100644 integration-test-groups/http/common/v3.ext
copy integration-tests-jvm/{spring-redis => langchain-embeddings}/pom.xml (81%)
copy integration-tests-jvm/{spring-redis/src/main/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisResource.java => langchain-embeddings/src/main/java/org/apache/camel/quarkus/component/langchain/embeddings/it/LangchainEmbeddingsResource.java} (67%)
copy integration-tests-jvm/{spring-redis/src/test/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisTest.java => langchain-embeddings/src/test/java/org/apache/camel/quarkus/component/langchain/embeddings/it/LangchainEmbeddingsTest.java} (81%)
create mode 100644 integration-tests-jvm/spring-redis/src/main/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisProducers.java
create mode 100644 integration-tests-jvm/spring-redis/src/main/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisRoutes.java
copy integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java => integration-tests-jvm/spring-redis/src/test/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisTestResource.java (50%)
copy integration-test-groups/http/common/src/main/resources/application.properties => integration-tests-jvm/spring-redis/src/test/resources/redis.conf (57%)
rename integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/{NonFlakyFileIT.java => FileIT.java} (95%)
rename integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/{NonFlakyFileTest.java => FileTest.java} (82%)
rename integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/{NonFlakyFileTestResource.java => FileTestResource.java} (98%)
create mode 100644 integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Routes.java
(camel-quarkus) 02/02: Disable microprofile-fault-tolerance testing due to #5995
Posted by ja...@apache.org.
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 a870cede1c36c12c3f614cce4f1d81371f1b398c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Apr 12 11:20:50 2024 +0100
Disable microprofile-fault-tolerance testing due to #5995
---
integration-test-groups/foundation/core-fault-tolerance/pom.xml | 2 ++
.../camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java | 2 ++
.../camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java | 2 ++
integration-tests/foundation-grouped/pom.xml | 2 ++
4 files changed, 8 insertions(+)
diff --git a/integration-test-groups/foundation/core-fault-tolerance/pom.xml b/integration-test-groups/foundation/core-fault-tolerance/pom.xml
index d4175591a2..6d9763ea47 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/pom.xml
+++ b/integration-test-groups/foundation/core-fault-tolerance/pom.xml
@@ -59,6 +59,7 @@
</dependencies>
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
<profile>
<id>native</id>
<activation>
@@ -86,6 +87,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
index 76f553a17b..a05c81faf2 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
+++ b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.core.faulttolerance.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
@QuarkusIntegrationTest
public class CoreFaultToleranceIT extends CoreFaultToleranceTest {
}
diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
index 6aaa60aaf1..6ccdcf4364 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
+++ b/integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceTest.java
@@ -17,11 +17,13 @@
package org.apache.camel.quarkus.core.faulttolerance.it;
import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static io.restassured.RestAssured.get;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5995")
@QuarkusTest
public class CoreFaultToleranceTest {
diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
index 7c9c1ceac0..78c0c2485f 100644
--- a/integration-tests/foundation-grouped/pom.xml
+++ b/integration-tests/foundation-grouped/pom.xml
@@ -212,6 +212,8 @@
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/foundation</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
<group-tests.concat.rel.paths>src/main/resources/application.properties</group-tests.concat.rel.paths>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/5995 -->
+ <group-tests.files.excludes>core-fault-tolerance</group-tests.files.excludes>
</properties>
</configuration>
</execution>
(camel-quarkus) 01/02: Upgrade Quarkus to 3.10.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 quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 680ea9b9443d2753b255daf7e27850fc4558045c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 13 19:00:20 2024 +0000
Upgrade Quarkus to 3.10.0.CR1
---
.../apache/camel/quarkus/component/jasypt/JasyptDevUITest.java | 2 ++
.../camel/quarkus/component/joor/deployment/JoorProcessor.java | 6 +++---
.../core/faulttolerance/it/CoreFaultToleranceProducers.java | 2 +-
integration-test-groups/pom.xml | 3 ++-
integration-tests/cxf-soap-grouped/pom.xml | 6 ++++++
integration-tests/quartz-clustered/pom.xml | 4 ++++
integration-tests/ssh/pom.xml | 2 --
.../java/org/apache/camel/quarkus/component/ssh/it/SshIT.java | 2 --
.../java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 --
pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
13 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java b/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
index cd770f4d77..17445d072d 100644
--- a/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
+++ b/extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java
@@ -23,12 +23,14 @@ import io.quarkus.test.QuarkusDevModeTest;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5946")
public class JasyptDevUITest extends DevUIJsonRPCTest {
@RegisterExtension
static final QuarkusDevModeTest CONFIG = new QuarkusDevModeTest().withEmptyApplication();
diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
index a7832e7508..b97ce0b86d 100644
--- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
+++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
@@ -30,7 +30,7 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
-import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.NativeConfig;
import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
import io.quarkus.maven.dependency.ResolvedDependency;
import io.quarkus.paths.PathCollection;
@@ -196,11 +196,11 @@ class JoorProcessor {
*/
public static final class CompileAtBuildTime implements BooleanSupplier {
JoorExpressionConfig config;
- PackageConfig packageConfig;
+ NativeConfig nativeConfig;
@Override
public boolean getAsBoolean() {
- return config.compileAtBuildTime || packageConfig.type.equalsIgnoreCase(PackageConfig.BuiltInType.NATIVE.name());
+ return config.compileAtBuildTime || nativeConfig.enabled();
}
}
}
diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
index 4317184f98..7b82e4867b 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
+++ b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
@@ -59,7 +59,7 @@ public class CoreFaultToleranceProducers {
@ApplicationScoped
@Named("threadTimer")
ThreadTimer threadTimer(@Named("threadTimerExecutor") ExecutorService executorService) {
- return new ThreadTimer(executorService);
+ return ThreadTimer.create(executorService);
}
@ApplicationScoped
diff --git a/integration-test-groups/pom.xml b/integration-test-groups/pom.xml
index badac9ba9d..bdcc0d98b2 100644
--- a/integration-test-groups/pom.xml
+++ b/integration-test-groups/pom.xml
@@ -42,7 +42,8 @@
<module>aws2-quarkus-client</module>
<module>azure</module>
<module>compression</module>
- <module>cxf-soap</module>
+ <!-- TODO: Reinstate this: https://github.com/apache/camel-quarkus/issues/5926 -->
+ <!-- <module>cxf-soap</module> -->
<module>dataformats-json</module>
<module>foundation</module>
<module>http</module>
diff --git a/integration-tests/cxf-soap-grouped/pom.xml b/integration-tests/cxf-soap-grouped/pom.xml
index 75e095ee76..1e50107f51 100644
--- a/integration-tests/cxf-soap-grouped/pom.xml
+++ b/integration-tests/cxf-soap-grouped/pom.xml
@@ -30,6 +30,12 @@
<name>Camel Quarkus :: Integration Tests :: Cxf Soap Grouped</name>
<description>Cxf Soap tests from ../integration-test-groups/cxf-soap merged together</description>
+ <!-- TODO: Remove this: https://github.com/apache/camel-quarkus/issues/5926 -->
+ <properties>
+ <quarkus.build.skip>true</quarkus.build.skip>
+ <skipTests>true</skipTests>
+ </properties>
+
<!-- Regenerate the dependencies via `mvn process-resources -Pformat -N` from the source tree root directory -->
<dependencies>
<dependency>
diff --git a/integration-tests/quartz-clustered/pom.xml b/integration-tests/quartz-clustered/pom.xml
index e80c59db49..3fbc633428 100644
--- a/integration-tests/quartz-clustered/pom.xml
+++ b/integration-tests/quartz-clustered/pom.xml
@@ -59,6 +59,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-flyway</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-database-postgresql</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/integration-tests/ssh/pom.xml b/integration-tests/ssh/pom.xml
index daa69211da..56f8b5edae 100644
--- a/integration-tests/ssh/pom.xml
+++ b/integration-tests/ssh/pom.xml
@@ -71,7 +71,6 @@
<profiles>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5850
<profile>
<id>native</id>
<activation>
@@ -99,7 +98,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
index 5ffdcc87ee..92af64875a 100644
--- a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
+++ b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.component.ssh.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5850")
@QuarkusIntegrationTest
class SshIT extends SshTest {
diff --git a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
index b1df19d4e7..4681ee0a94 100644
--- a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
+++ b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java
@@ -20,12 +20,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@Disabled("https://github.com/apache/camel-quarkus/issues/5850")
@QuarkusTest
@QuarkusTestResource(SshTestResource.class)
class SshTest {
diff --git a/pom.xml b/pom.xml
index c55f8bb169..f1d0f55be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.2.2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.3.1</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.9.0</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>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.6.1</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -113,7 +113,7 @@
<icu4j.version>${icu4j-version}</icu4j.version>
<immutables.version>2.9.3</immutables.version>
<influxdb.version>${influx-java-driver-version}</influxdb.version>
- <jackson.version>2.16.1</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
+ <jackson.version>2.17.0</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
<jakarta.jms-api.version>${jakarta-jms-api-version}</jakarta.jms-api.version>
<java-json-tools.json-patch.version>${json-patch-version}</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch -->
<jodatime.version>${jodatime2-version}</jodatime.version><!-- Mess in transitive dependencies of Splunk -->
@@ -149,7 +149,7 @@
<reactor-core.version>3.4.34</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit -->
- <smallrye.reactive.messaging.camel.version>4.18.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+ <smallrye.reactive.messaging.camel.version>4.20.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<snakeyaml.version>2.2</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!-- Resolve conflict between camel-snakeyaml & kubernetes-client -->
<spring.version>${spring-version}</spring.version>
@@ -170,7 +170,7 @@
<hamcrest.version>2.2</hamcrest.version><!-- Awaitility and Wiremock -->
<htmlunit-driver.version>4.13.0</htmlunit-driver.version>
<pdfbox.version>${pdfbox-version}</pdfbox.version>
- <sshd.version>2.12.0</sshd.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
+ <sshd.version>2.12.1</sshd.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
<unboundid-ldapsdk.version>7.0.0</unboundid-ldapsdk.version>
<wiremock.version>3.3.1</wiremock.version>
<zt-exec.version>1.12</zt-exec.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 53d443db48..d819e75700 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6560,7 +6560,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.18.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.20.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</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 e1b89a1e22..29ad49f45c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6520,7 +6520,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.18.0</version>
+ <version>4.20.0</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</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 1074dd23b0..4b60a8b6a0 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6520,7 +6520,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.18.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.20.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->