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 2023/12/06 17:47:43 UTC
(camel-quarkus) branch 2.13.x updated (962cc07f4a -> 430b48f2b4)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 962cc07f4a Upgrade to Quarkus CXF 1.5.16
new c3e19db653 Upgrade Quarkus to 2.13.9.Final
new 430b48f2b4 Disable SSH tests as Camel 3.18.x is now EOL and not aligned with org.apache.sshd 2.10
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:
docs/antora.yml | 2 +-
integration-tests/ssh/pom.xml | 2 ++
.../test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java | 2 ++
.../java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 ++
pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++--
8 files changed, 16 insertions(+), 10 deletions(-)
(camel-quarkus) 02/02: Disable SSH tests as Camel 3.18.x is now EOL and not aligned with org.apache.sshd 2.10
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 430b48f2b4cc56b1775b213b914978095d0f5509
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Dec 6 08:11:48 2023 +0000
Disable SSH tests as Camel 3.18.x is now EOL and not aligned with org.apache.sshd 2.10
---
integration-tests/ssh/pom.xml | 2 ++
.../src/test/java/org/apache/camel/quarkus/component/ssh/it/SshIT.java | 2 ++
.../test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/integration-tests/ssh/pom.xml b/integration-tests/ssh/pom.xml
index c7c57f93ea..eea2d0d696 100644
--- a/integration-tests/ssh/pom.xml
+++ b/integration-tests/ssh/pom.xml
@@ -71,6 +71,7 @@
<profiles>
+ <!-- Camel 3.18.x is now EOL and not aligned with org.apache.sshd 2.10
<profile>
<id>native</id>
<activation>
@@ -98,6 +99,7 @@
</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 92af64875a..2fd75ba3e2 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,7 +17,9 @@
package org.apache.camel.quarkus.component.ssh.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("Camel 3.18.x is now EOL and not aligned with org.apache.sshd 2.10")
@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 4681ee0a94..3c6555b38f 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,10 +20,12 @@ 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("Camel 3.18.x is now EOL and not aligned with org.apache.sshd 2.10")
@QuarkusTest
@QuarkusTestResource(SshTestResource.class)
class SshTest {
(camel-quarkus) 01/02: Upgrade Quarkus to 2.13.9.Final
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c3e19db653db51bc3e4a735c0f89d4daa94819b7
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Dec 5 14:58:50 2023 +0000
Upgrade Quarkus to 2.13.9.Final
---
docs/antora.yml | 2 +-
pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 407801b3f6..2f542e78e6 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -27,7 +27,7 @@ asciidoc:
# Project versions
camel-version: 3.18.8 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.13.8.Final # replace ${quarkus.version}
+ quarkus-version: 2.13.9.Final # replace ${quarkus.version}
graalvm-version: 22.3.0 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/pom.xml b/pom.xml
index 7172b910fe..45c359f58d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>1.0.6</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-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.8.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>2.13.9.Final</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/ -->
@@ -68,7 +68,7 @@
<ahc.version>${ahc-version}</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
- <avro.version>1.11.1</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <avro.version>1.11.3</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.17.291</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<assertj.version>3.23.1</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
@@ -166,7 +166,7 @@
<mock-javamail.version>${mock-javamail-version}</mock-javamail.version>
<pdfbox.version>${pdfbox-version}</pdfbox.version>
<slf4j-log4j12.version>1.7.30</slf4j-log4j12.version><!-- Mess in the transitive dependencies of hbase-testing-util -->
- <sshd.version>2.9.2</sshd.version><!-- Sync works only since Quarkus 2.13.6 @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
+ <sshd.version>2.10.0</sshd.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
<wiremock.version>2.27.2</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 d9b4e78321..4f7d145289 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6686,7 +6686,7 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6701,7 +6701,7 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</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 3fb7f1790b..ab2975085f 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6686,7 +6686,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-jetty</artifactId>
- <version>1.11.1</version>
+ <version>1.11.3</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -6701,7 +6701,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-netty</artifactId>
- <version>1.11.1</version>
+ <version>1.11.3</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</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 3156bcc790..928c19b429 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6686,7 +6686,7 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6701,7 +6701,7 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->