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 2021/11/19 10:50:47 UTC
[camel-quarkus] branch camel-main updated (354792c -> 1236364)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 354792c Upgrade Camel to 3.14.0
add 01ed8e5 Bump nimbus-jose-jwt version from Quarkus bom
add 5a06580 Updated CHANGELOG.md
new a421288 Upgrade Camel to 3.14.0
new 1236364 Temporarily disable kafka integration test due to #3312
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 (354792c)
\
N -- N -- N refs/heads/camel-main (1236364)
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:
CHANGELOG.md | 1 +
.../org/apache/camel/quarkus/component/kafka/it/CamelKafkaIT.java | 2 ++
.../org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java | 2 ++
pom.xml | 1 -
poms/bom/pom.xml | 5 -----
5 files changed, 5 insertions(+), 6 deletions(-)
[camel-quarkus] 02/02: Temporarily disable kafka integration test due to #3312
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1236364d2b0dde63d33db7662e8996925dc84eb1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Nov 19 10:50:06 2021 +0000
Temporarily disable kafka integration test due to #3312
---
.../java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaIT.java | 2 ++
.../org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaIT.java b/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaIT.java
index 39ac37e..1944d61 100644
--- a/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaIT.java
+++ b/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.kafka.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
@NativeImageTest
+@Disabled("https://github.com/apache/camel-quarkus/issues/3312")
public class CamelKafkaIT extends CamelKafkaTest {
}
diff --git a/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java b/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java
index 627e5c5..a4e91cb 100644
--- a/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java
+++ b/integration-tests/kafka/src/test/java/org/apache/camel/quarkus/component/kafka/it/CamelKafkaTest.java
@@ -27,6 +27,7 @@ import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import org.apache.camel.quarkus.test.support.kafka.KafkaTestResource;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static io.restassured.RestAssured.given;
@@ -37,6 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
@QuarkusTestResource(KafkaTestResource.class)
+@Disabled("https://github.com/apache/camel-quarkus/issues/3312")
public class CamelKafkaTest {
@Test
[camel-quarkus] 01/02: Upgrade Camel to 3.14.0
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a421288261c993a83cb8a8edaba2d376a57b1704
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Nov 18 07:31:39 2021 +0000
Upgrade Camel to 3.14.0
---
docs/antora-playbook-dev.yml | 2 +-
docs/antora-playbook.yml | 4 ++--
docs/antora.yml | 6 +++---
pom.xml | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml
index 97ac4b9..e23d3ef 100644
--- a/docs/antora-playbook-dev.yml
+++ b/docs/antora-playbook-dev.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: git@github.com:apache/camel.git
branches:
- - camel-3.13.x # replace ${camel.docs.branch}
+ - camel-3.14.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- url: git@github.com:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index da9b4b1..be4ea34 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -33,7 +33,7 @@ content:
# The version/branch of main camel 'components' this version of camel-quarkus uses
- url: https://github.com/apache/camel.git
branches:
- - camel-3.13.x # replace ${camel.docs.branch}
+ - camel-3.14.x # replace ${camel.docs.branch}
start_paths:
# eip
- core/camel-core-engine/src/main/docs
@@ -50,7 +50,7 @@ content:
# The camel-spring-boot version corresponding to the main camel 'components' version/branch
- url: https://github.com/apache/camel-spring-boot.git
branches:
- - camel-spring-boot-3.13.x # replace ${camel.sb.docs.branch}
+ - camel-spring-boot-3.14.x # replace ${camel.sb.docs.branch}
start_path: docs/components
asciidoc:
diff --git a/docs/antora.yml b/docs/antora.yml
index bc1bbc6..637cdee 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -26,11 +26,11 @@ asciidoc:
attributes:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
- camel-version: 3.13.0 # replace ${camel.version}
+ camel-version: 3.14.0-SNAPSHOT # replace ${camel.version}
quarkus-version: 2.5.0.Final # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
- cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref}
+ cq-camel-components: 3.14.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
# indexTable common
- indexer-version: 3.13.x # replace ${camel.docs.components.version}
+ indexer-version: 3.14.x # replace ${camel.docs.components.version}
indexer-component: components
diff --git a/pom.xml b/pom.xml
index 70ab644..55454a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -39,8 +39,8 @@
<properties>
<!-- Primary dependencies - maintained manually -->
- <camel.major.minor>3.13</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.0</camel.version>
+ <camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
+ <camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends -->