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/25 04:50:31 UTC
[camel-quarkus] branch camel-main updated (086b883 -> e8a1429)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 086b883 Disable Fhir tests
discard 3eccb70 Upgrade Yaml Routes to Yaml 3.15 style
discard cba372b ⬆️ Upgrade to Camel 3.15
add caaa116 📝Add released branch to official documentation
add 5e674dc Updated CHANGELOG.md
add 2d5f335 Manage Eclipse jgit version and jzlib version Fixes #3414
add 189af5f Added Json-Patch Extension
add 0f82445 Added Json-Patch Extension
add 6f5b6b7 Added Json-Patch Extension
add c5dc28b Added Json-Patch Extension
add 7e6a9ce Added Json-Patch Extension
add 7ce5eba Added Json-Patch Extension
new 8c521c3 ⬆️ Upgrade to Camel 3.15
new 4fedef9 Upgrade Yaml Routes to Yaml 3.15 style
new e8a1429 Disable Fhir tests
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 (086b883)
\
N -- N -- N refs/heads/camel-main (e8a1429)
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 3 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 | 2 ++
catalog/pom.xml | 13 ++++++++
.../ROOT/examples/components/json-patch.yml | 13 ++++++++
docs/modules/ROOT/nav.adoc | 1 +
.../pages/contributor-guide/release-guide.adoc | 2 +-
.../extensions/{asterisk.adoc => json-patch.adoc} | 16 ++++-----
.../json-patch/deployment/pom.xml | 14 ++++----
.../json/patch/deployment/JsonPatchProcessor.java} | 8 ++---
.../json-patch/pom.xml | 8 ++---
.../json-patch/runtime/pom.xml | 32 +++++++++---------
.../main/resources/META-INF/quarkus-extension.yaml | 6 ++--
extensions-jvm/pom.xml | 1 +
.../{splunk-hec => json-patch}/pom.xml | 15 +++++----
.../json/patch/it/JsonPatchResource.java} | 20 +++++------
.../component/json/patch/it/JsonPatchTest.java} | 8 ++---
integration-tests-jvm/pom.xml | 1 +
pom.xml | 2 ++
poms/bom/pom.xml | 39 ++++++++++++++++++----
18 files changed, 131 insertions(+), 70 deletions(-)
create mode 100644 docs/modules/ROOT/examples/components/json-patch.yml
copy docs/modules/ROOT/pages/reference/extensions/{asterisk.adoc => json-patch.adoc} (57%)
copy tooling/create-extension-templates/deployment-pom.xml => extensions-jvm/json-patch/deployment/pom.xml (83%)
copy extensions-jvm/{xslt-saxon/deployment/src/main/java/org/apache/camel/quarkus/component/xslt/saxon/deployment/XsltSaxonProcessor.java => json-patch/deployment/src/main/java/org/apache/camel/quarkus/component/json/patch/deployment/JsonPatchProcessor.java} (88%)
copy tooling/create-extension-templates/parent-pom.xml => extensions-jvm/json-patch/pom.xml (86%)
copy tooling/create-extension-templates/runtime-pom.xml => extensions-jvm/json-patch/runtime/pom.xml (81%)
copy extensions-jvm/{aws-xray => json-patch}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (88%)
copy integration-tests-jvm/{splunk-hec => json-patch}/pom.xml (83%)
copy integration-tests-jvm/{xslt-saxon/src/main/java/org/apache/camel/quarkus/component/xslt/saxon/it/XsltSaxonResource.java => json-patch/src/main/java/org/apache/camel/quarkus/component/json/patch/it/JsonPatchResource.java} (74%)
copy integration-tests-jvm/{splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java => json-patch/src/test/java/org/apache/camel/quarkus/component/json/patch/it/JsonPatchTest.java} (84%)
[camel-quarkus] 02/03: Upgrade Yaml Routes to Yaml 3.15 style
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4fedef99d8f0bc8747746a4388cbfc3470d447f9
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Thu Dec 23 15:04:58 2021 +0100
Upgrade Yaml Routes to Yaml 3.15 style
---
.../route-configurations/src/main/resources/yaml/routes.yaml | 11 ++++++-----
.../main-yaml/src/main/resources/routes/my-rests.yaml | 9 +++++----
.../main-yaml/src/main/resources/routes/my-routes.yaml | 11 ++++++-----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml b/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml
index 6e5418f..fd4dc34 100644
--- a/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml
+++ b/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml
@@ -17,8 +17,9 @@
- route:
route-configuration-id: "xmlRouteConfiguration"
- from: "direct:yamlRoute"
- steps:
- - throw-exception:
- exception-type: "org.apache.camel.quarkus.core.it.routeconfigurations.RouteConfigurationsException"
- message: "Intentional exception to trigger onException in xmlRouteConfiguration"
\ No newline at end of file
+ from:
+ uri: "direct:yamlRoute"
+ steps:
+ - throw-exception:
+ exception-type: "org.apache.camel.quarkus.core.it.routeconfigurations.RouteConfigurationsException"
+ message: "Intentional exception to trigger onException in xmlRouteConfiguration"
\ No newline at end of file
diff --git a/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml b/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
index b246556..fd1f1b6 100644
--- a/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
+++ b/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
@@ -22,7 +22,8 @@
to: "direct:rest"
- route:
id: "rest-route"
- from: "direct:rest"
- steps:
- - set-body:
- constant: "Hello World!!!"
+ from:
+ uri: "direct:rest"
+ steps:
+ - set-body:
+ constant: "Hello World!!!"
diff --git a/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml b/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml
index e6ae42f..d0a6f53 100644
--- a/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml
+++ b/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml
@@ -17,8 +17,9 @@
- route:
id: "my-yaml-route"
- from: "timer:from-xml?period=3000"
- steps:
- - set-body:
- constant: "Hello World!!!"
- - to: "log:from-yaml"
+ from:
+ uri: "timer:from-xml?period=3000"
+ steps:
+ - set-body:
+ constant: "Hello World!!!"
+ - to: "log:from-yaml"
[camel-quarkus] 01/03: ⬆️ Upgrade to Camel 3.15
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8c521c341f56c5e2651cb94dade92c00a481a074
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed Dec 22 16:16:52 2021 +0100
⬆️ Upgrade to Camel 3.15
---
docs/antora.yml | 6 +++---
docs/modules/ROOT/examples/components/azure-eventhubs.yml | 2 +-
docs/modules/ROOT/examples/components/azure-storage-blob.yml | 2 +-
docs/modules/ROOT/examples/components/azure-storage-datalake.yml | 2 +-
docs/modules/ROOT/examples/components/azure-storage-queue.yml | 2 +-
pom.xml | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index be367c8..6180c1b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -28,11 +28,11 @@ asciidoc:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
- camel-version: 3.14.0 # replace ${camel.version}
+ camel-version: 3.15.0-SNAPSHOT # replace ${camel.version}
quarkus-version: 2.6.0.Final # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
- cq-camel-components: 3.14.x@components # replace ${camel.docs.components.xref}
+ cq-camel-components: 3.15.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
# indexTable common
- indexer-version: 3.14.x # replace ${camel.docs.components.version}
+ indexer-version: 3.15.x # replace ${camel.docs.components.version}
indexer-component: camel-quarkus
diff --git a/docs/modules/ROOT/examples/components/azure-eventhubs.yml b/docs/modules/ROOT/examples/components/azure-eventhubs.yml
index 52f94e8..4d09d2a 100644
--- a/docs/modules/ROOT/examples/components/azure-eventhubs.yml
+++ b/docs/modules/ROOT/examples/components/azure-eventhubs.yml
@@ -9,5 +9,5 @@ cqJvmSince: 1.7.0
cqNativeSince: 1.7.0
cqCamelPartName: azure-eventhubs
cqCamelPartTitle: Azure Event Hubs
-cqCamelPartDescription: The azure-eventhubs component that integrates Azure Event Hubs using AMQP protocol. Azure EventHubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers.
+cqCamelPartDescription: Send and receive events to/from Azure Event Hubs using AMQP protocol.
cqExtensionPageTitle: Azure Event Hubs
diff --git a/docs/modules/ROOT/examples/components/azure-storage-blob.yml b/docs/modules/ROOT/examples/components/azure-storage-blob.yml
index dfce732..42cfb5c 100644
--- a/docs/modules/ROOT/examples/components/azure-storage-blob.yml
+++ b/docs/modules/ROOT/examples/components/azure-storage-blob.yml
@@ -9,5 +9,5 @@ cqJvmSince: 1.1.0
cqNativeSince: 1.6.0
cqCamelPartName: azure-storage-blob
cqCamelPartTitle: Azure Storage Blob Service
-cqCamelPartDescription: Store and retrieve blobs from Azure Storage Blob Service using SDK v12.
+cqCamelPartDescription: Store and retrieve blobs from Azure Storage Blob Service.
cqExtensionPageTitle: Azure Storage Blob Service
diff --git a/docs/modules/ROOT/examples/components/azure-storage-datalake.yml b/docs/modules/ROOT/examples/components/azure-storage-datalake.yml
index c66aa04..a768d99 100644
--- a/docs/modules/ROOT/examples/components/azure-storage-datalake.yml
+++ b/docs/modules/ROOT/examples/components/azure-storage-datalake.yml
@@ -9,5 +9,5 @@ cqJvmSince: 1.8.0
cqNativeSince: n/a
cqCamelPartName: azure-storage-datalake
cqCamelPartTitle: Azure Storage Datalake Service
-cqCamelPartDescription: Camel Azure Datalake Gen2 Component
+cqCamelPartDescription: Sends and receives files to/from Azure DataLake Storage.
cqExtensionPageTitle: Azure storage datalake service
diff --git a/docs/modules/ROOT/examples/components/azure-storage-queue.yml b/docs/modules/ROOT/examples/components/azure-storage-queue.yml
index edb634d..87d5d8e 100644
--- a/docs/modules/ROOT/examples/components/azure-storage-queue.yml
+++ b/docs/modules/ROOT/examples/components/azure-storage-queue.yml
@@ -9,5 +9,5 @@ cqJvmSince: 1.1.0
cqNativeSince: 1.7.0
cqCamelPartName: azure-storage-queue
cqCamelPartTitle: Azure Storage Queue Service
-cqCamelPartDescription: The azure-storage-queue component is used for storing and retrieving the messages to/from Azure Storage Queue using Azure SDK v12.
+cqCamelPartDescription: Stores and retrieves messages to/from Azure Storage Queue.
cqExtensionPageTitle: Azure Storage Queue Service
diff --git a/pom.xml b/pom.xml
index e4a9d1b..671b910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.14.0</version>
+ <version>3.15.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -39,8 +39,8 @@
<properties>
<!-- Primary dependencies - maintained manually -->
- <camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.0</camel.version>
+ <camel.major.minor>3.15</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 -->
[camel-quarkus] 03/03: Disable Fhir tests
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e8a14290ca2c24f3818b058e7325952e6d643c22
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Fri Dec 24 12:36:00 2021 +0100
Disable Fhir tests
---
.../java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java | 2 ++
.../java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java | 2 ++
.../org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java | 2 ++
.../org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java | 2 ++
4 files changed, 8 insertions(+)
diff --git a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
index 27d3862..7da92c4 100644
--- a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
+++ b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
@@ -17,8 +17,10 @@
package org.apache.camel.quarkus.component.fhir.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
@NativeImageTest
+@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirClientIT extends FhirClientTest {
}
diff --git a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
index b5967a3..3f677ce 100644
--- a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
+++ b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
@@ -24,10 +24,12 @@ import io.restassured.http.ContentType;
import org.apache.camel.quarkus.component.fhir.FhirFlags;
import org.apache.camel.quarkus.test.EnabledIf;
import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@QuarkusTest
@QuarkusTestResource(FhirTestResource.class)
+@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirClientTest {
private static final Logger LOG = Logger.getLogger(FhirClientTest.class);
diff --git a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
index d6b0209..9ee54ee 100644
--- a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
+++ b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.fhir.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
@NativeImageTest
+@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirDataformatIT extends FhirDataformatTest {
}
diff --git a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
index b2a4193..9f8229d 100644
--- a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
+++ b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
@@ -24,9 +24,11 @@ import org.apache.camel.quarkus.component.fhir.FhirFlags;
import org.apache.camel.quarkus.test.EnabledIf;
import org.hl7.fhir.dstu3.model.Patient;
import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@QuarkusTest
+@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirDataformatTest {
private static final Logger LOG = Logger.getLogger(FhirDataformatTest.class);