You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/12/07 07:17:47 UTC
[camel-quarkus] branch quarkus-main updated (52b698e -> 9f6e4b8)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 52b698e Disable vertx-kafka integration tests and native build due to #3358
discard 4124063 Upgrade Quarkus to 2.6.0.CR1
add 914b38f Fix AWS Lambda failing itest #3356
new a7c57cb Upgrade Quarkus to 2.6.0.CR1
new 9f6e4b8 Disable vertx-kafka integration tests and native build due to #3358
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 (52b698e)
\
N -- N -- N refs/heads/quarkus-main (9f6e4b8)
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:
.../aws2/lambda/it/Aws2LambdaResource.java | 8 ++++---
.../component/aws2/lambda/it/Aws2LambdaTest.java | 26 +++++++++++++++++-----
2 files changed, 25 insertions(+), 9 deletions(-)
[camel-quarkus] 01/02: Upgrade Quarkus to 2.6.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a7c57cbab57506353e12047d8f9bd6fbdb390db4
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Nov 11 14:04:24 2021 +0000
Upgrade Quarkus to 2.6.0.CR1
---
docs/antora.yml | 4 ++--
.../quarkus/component/csimple/deployment/CSimpleProcessor.java | 5 +++--
pom.xml | 10 +++++-----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index bc1bbc6..9619c08 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,9 +25,9 @@ nav:
asciidoc:
attributes:
min-maven-version: 3.6.2 # replace ${min-maven-version}
- target-maven-version: 3.8.1 # replace ${target-maven-version}
+ target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.13.0 # replace ${camel.version}
- quarkus-version: 2.5.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
index 72229a3..c5266fd 100644
--- a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
+++ b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
@@ -310,8 +310,9 @@ class CSimpleProcessor {
csimpleClassesDir.toFile(),
StandardCharsets.UTF_8.name(),
Collections.emptyList(),
- "1.8",
- "1.8",
+ null,
+ "11",
+ "11",
Collections.emptyList(),
Collections.emptyList());
}
diff --git a/pom.xml b/pom.xml
index cd15b4b..d0f0bc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.5.0.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>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.30.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -103,9 +103,9 @@
<jetty.version>${jetty9-version}</jetty.version>
<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>2.8.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
+ <kafka.version>3.0.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.5.31</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>1.6.0</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
<metrics.version>${metrics-version}</metrics.version><!-- Spark -->
<mvel2.version>${mvel-version}</mvel2.version>
@@ -115,7 +115,7 @@
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->
- <smallrye.reactive.messaging.camel.version>3.11.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>3.13.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
@@ -193,7 +193,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.6.2</min-maven-version>
- <target-maven-version>3.8.1</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.8.4</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>
<!-- maven-release-plugin -->
[camel-quarkus] 02/02: Disable vertx-kafka integration tests and native build due to #3358
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9f6e4b87a77db671d3b7f2a272f100012174dcbb
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Dec 6 16:21:36 2021 +0000
Disable vertx-kafka integration tests and native build due to #3358
---
integration-tests/vertx-kafka/pom.xml | 2 ++
.../org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java | 2 ++
.../apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/integration-tests/vertx-kafka/pom.xml b/integration-tests/vertx-kafka/pom.xml
index 978b597..b7c9bee 100644
--- a/integration-tests/vertx-kafka/pom.xml
+++ b/integration-tests/vertx-kafka/pom.xml
@@ -59,6 +59,7 @@
</dependencies>
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/3358
<profile>
<id>native</id>
<activation>
@@ -86,6 +87,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java
index b969afc..c98665c 100644
--- a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java
+++ b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaIT.java
@@ -16,9 +16,11 @@
*/
package org.apache.camel.quarkus.component.vertx.kafka.it;
+import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
@NativeImageTest
+@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3358")
class VertxKafkaIT extends VertxKafkaTest {
}
diff --git a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java
index 28c459f..ebf11f1 100644
--- a/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java
+++ b/integration-tests/vertx-kafka/src/test/java/org/apache/camel/quarkus/component/vertx/kafka/it/VertxKafkaTest.java
@@ -20,12 +20,14 @@ 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.hamcrest.CoreMatchers.is;
@QuarkusTest
@QuarkusTestResource(VertxKafkaTestResource.class)
+@Disabled("https://github.com/apache/camel-quarkus/issues/3358")
class VertxKafkaTest {
@Test