[GitHub] [camel] aryankoul commented on a change in pull request #4697: [CAMEL-15341] Create camel-azure-storage-datalake to serve Azure DataLakes Gen2
aryankoul commented on a change in pull request #4697:
URL: https://github.com/apache/camel/pull/4697#discussion_r536517151
##
File path:
components/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeDirectoryOperations.java
##
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.azure.storage.datalake.operations;
+
+import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration;
+import
org.apache.camel.component.azure.storage.datalake.DataLakeConfigurationOptionsProxy;
+import
org.apache.camel.component.azure.storage.datalake.client.DataLakeDirectoryClientWrapper;
+import org.apache.camel.util.ObjectHelper;
+
+public class DataLakeDirectoryOperations {
Review comment:
So, there are some operations on directory as well in datalake gen2. I
am gonna add those in here.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel-quarkus] branch quarkus-master updated (6adf68a -> 4c81d2c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 6adf68a Upgrade to Quarkus 11.0.0 add 1e834dd Updated CHANGELOG.md add 95e13ee Fix persistence of WireMock mappings add 4682c75 Fixup 9217ba9 Solr native support fixes #1703 add 7d1573f Added a bug trap to catch more info in the context #1978 new 4c81d2c Upgrade to Quarkus 11.0.0 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 (6adf68a) \ N -- N -- N refs/heads/quarkus-master (4c81d2c) 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 1 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 | 7 +-- .../test/wiremock/WireMockTestResourceLifecycleManager.java| 10 +++--- .../camel/quarkus/component/nats/it/NatsTestResource.java | 6 +- integration-tests/solr/pom.xml | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-)
[camel-quarkus] 01/01: Upgrade to Quarkus 11.0.0
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4c81d2c2f43b357539da3025f9f3f173764caa85
Author: James Netherton
AuthorDate: Thu Nov 12 07:00:19 2020 +
Upgrade to Quarkus 11.0.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5ffb33d..aaf9726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
${squareup-okio-version}
0.26.0
7.46.0.Final
-1.10.2.Final
+999-SNAPSHOT
0.21.0
${protobuf-version}
2.5.0
[camel-quarkus] 01/04: Upgrade to Camel 3.7.0
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a6ab6e66a5822eac46d5361156ff48e0fa721f26 Author: James Netherton AuthorDate: Mon Oct 19 07:16:38 2020 +0100 Upgrade to Camel 3.7.0 --- .../ROOT/pages/reference/extensions/core.adoc | 1 + .../pages/reference/extensions/kubernetes.adoc | 1 + .../ROOT/pages/reference/extensions/leveldb.adoc | 12 ++- .../partials/reference/components/atlasmap.adoc| 1 + .../components/kubernetes-custom-resources.adoc| 13 +++ .../partials/reference/dataformats/json-jsonb.adoc | 1 + .../ROOT/partials/reference/languages/csimple.adoc | 13 +++ .../ROOT/partials/reference/languages/joor.adoc| 1 + .../partials/reference/others/csimple-joor.adoc| 1 + .../partials/reference/others/leveldb-legacy.adoc | 1 + .../quarkus/core/deployment/CamelProcessor.java| 8 ++ .../core/runtime/CamelConfigurationTest.java | 4 +- .../core/runtime/CamelInjectionPointTest.java | 3 - extensions-core/core/runtime/pom.xml | 16 +-- .../org/apache/camel/quarkus/core/BaseModel.java | 31 -- .../quarkus/core/CamelLifecycleEventBridge.java| 12 --- .../camel/quarkus/core/FastCamelContext.java | 117 +++-- .../org/apache/camel/quarkus/core/FastModel.java | 1 - .../camel/quarkus/core/FastTypeConverter.java | 2 +- .../camel/quarkus/main/CamelMainRecorder.java | 5 - extensions-support/spring/core/pom.xml | 1 + extensions/json-validator/runtime/pom.xml | 4 + .../leveldb/runtime/src/main/doc/limitations.adoc | 12 ++- .../component/leveldb/ObjectCodecSubstitute.java | 64 --- .../QuarkusLevelDBAggregationRepository.java | 71 + .../MicroprofileFaultToleranceProcessor.java | 8 ++ .../component/qute/QuteComponentConfigurer.java| 36 --- .../component/qute/QuteEndpointConfigurer.java | 38 +++ .../component/qute/QuteEndpointUriFactory.java | 7 +- .../org/apache/camel/component/qute/qute.json | 23 ++-- .../component/foundation/it/mock/MockResource.java | 4 +- .../component/leveldb/it/LeveldbRouteBuilder.java | 10 +- .../quarkus/component/leveldb/it/LeveldbIT.java| 4 - .../quarkus/component/leveldb/it/LeveldbTest.java | 14 +-- .../camel/quarkus/main/CoreMainResource.java | 8 -- .../main/src/main/resources/application.properties | 5 - .../apache/camel/quarkus/main/CoreMainTest.java| 6 -- .../camel/quarkus/component/saga/it/SagaRoute.java | 2 +- pom.xml| 5 +- poms/bom/pom.xml | 10 ++ 40 files changed, 334 insertions(+), 242 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc index 4449dda..cd8e0a5 100644 --- a/docs/modules/ROOT/pages/reference/extensions/core.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc @@ -18,6 +18,7 @@ Camel core functionality and basic Camel languages: Constant, ExchangeProperty, == What's inside * xref:latest@components:languages:constant-language.adoc[Constant language] +* xref:latest@components:languages:csimple-language.adoc[CSimple language] * xref:latest@components:languages:exchangeProperty-language.adoc[ExchangeProperty language] * xref:latest@components:languages:file-language.adoc[File language] * xref:latest@components:languages:header-language.adoc[Header language] diff --git a/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc b/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc index 03778ed..05cfc34 100644 --- a/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc @@ -18,6 +18,7 @@ Perform operations against Kubernetes API == What's inside * xref:latest@components::kubernetes-config-maps-component.adoc[Kubernetes ConfigMap component], URI syntax: `kubernetes-config-maps:masterUrl` +* xref:latest@components::kubernetes-custom-resources-component.adoc[Kubernetes Custom Resources component], URI syntax: `kubernetes-custom-resources:masterUrl` * xref:latest@components::kubernetes-deployments-component.adoc[Kubernetes Deployments component], URI syntax: `kubernetes-deployments:masterUrl` * xref:latest@components::kubernetes-hpa-component.adoc[Kubernetes HPA component], URI syntax: `kubernetes-hpa:masterUrl` * xref:latest@components::kubernetes-job-component.adoc[Kubernetes Job component], URI syntax: `kubernetes-job:masterUrl` diff --git a/docs/modules/ROOT/pages/reference/extensions/leveldb.adoc b/docs/modules/ROOT/pages/reference/extensions/leveldb.adoc index fda4ef0..190fc8d 100644 --- a/docs/modules/ROOT/pages/reference/extensions/leveldb.adoc +++
[camel-quarkus] 04/04: BigQuery native support
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1b2d5e3db5678fd1a9d2e812ee36edbcb0eddd0e
Author: James Netherton
AuthorDate: Fri Dec 4 12:08:28 2020 +
BigQuery native support
Fixes #2014
---
.../reference/extensions/google-bigquery.adoc | 19 +++-
.../reference/components/google-bigquery-sql.adoc | 6 +-
.../reference/components/google-bigquery.adoc | 6 +-
.../google-bigquery/integration-test/pom.xml | 66 -
.../google/bigquery/it/GoogleBigqueryResource.java | 64 -
extensions-jvm/pom.xml | 1 -
.../google-bigquery/deployment/pom.xml | 4 +
.../deployment/GoogleBigqueryProcessor.java| 26 +++--
.../google-bigquery/pom.xml| 1 -
.../google-bigquery/runtime/pom.xml| 6 +-
.../runtime/src/main/doc/usage.adoc| 7 ++
.../GoogleBigQueryConnectionFactoryProducer.java | 38
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
extensions/pom.xml | 1 +
integration-tests/google-bigquery/README.adoc | 16
.../{jsonb => google-bigquery}/pom.xml | 64 ++---
.../google/bigquery/it/GoogleBigqueryResource.java | 105 +
.../src/main/resources/application.properties | 19
.../google/bigquery/it/GoogleBigqueryIT.java | 26 +
.../google/bigquery/it/GoogleBigqueryTest.java | 75 +++
integration-tests/jsonb/pom.xml| 13 +++
integration-tests/pom.xml | 1 +
pom.xml| 2 +-
poms/bom/pom.xml | 20
tooling/scripts/test-categories.yaml | 1 +
25 files changed, 333 insertions(+), 257 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
b/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
index ef9f559..1814f64 100644
--- a/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
@@ -3,15 +3,15 @@
= Google BigQuery
:page-aliases: extensions/google-bigquery.adoc
:cq-artifact-id: camel-quarkus-google-bigquery
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
:cq-description: Access Google Cloud BigQuery service using SQL queries or
Google Client Services API
:cq-deprecated: false
:cq-jvm-since: 1.0.0
-:cq-native-since: 1.0.0
+:cq-native-since: 1.5.0
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.0.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.5.0##
Access Google Cloud BigQuery service using SQL queries or Google Client
Services API
@@ -33,3 +33,14 @@ Please refer to the above links for usage and configuration
details.
Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+
+== Usage
+
+This extension leverages the Quarkiverse Google Cloud Services extension. The
https://github.com/quarkiverse/quarkiverse-google-cloud-services[documentation]
describes
+how to configure authentication for Google cloud services.
+
+For convenience, a `GoogleBigQueryConnectionFactory` for use by the
`google-bigquery` & `google-bigquery-sql` component is automatically configured.
+
+If you want to read SQL scripts from the classpath with `google-bigquery-sql`
in native mode, then you will need to ensure that they are added to the native
image via
+the `quarkus.camel.native.resources.include-patterns` configuration property.
+
diff --git
a/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
b/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
index c20fa09..8330f83 100644
--- a/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
+++ b/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
@@ -2,11 +2,11 @@
// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
:cq-artifact-id: camel-quarkus-google-bigquery
:cq-artifact-id-base: google-bigquery
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
:cq-deprecated: false
:cq-jvm-since: 1.0.0
-:cq-native-since: 1.0.0
+:cq-native-since: 1.5.0
:cq-camel-part-name: google-bigquery-sql
:cq-camel-part-title: Google BigQuery Standard SQL
:cq-camel-part-description: Access Google Cloud BigQuery service using SQL
queries.
diff --git
a/docs/modules/ROOT/partials/reference/components/google-bigquery.adoc
[camel-quarkus] branch camel-master updated (c03848b -> 1b2d5e3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard c03848b BigQuery native support omit 673bae5 Google PubSub native support omit ed7cae5 [Camel 3.7] JSON-B data format support omit d2fa7e2 Upgrade to Camel 3.7.0 add 1e834dd Updated CHANGELOG.md add 95e13ee Fix persistence of WireMock mappings add 4682c75 Fixup 9217ba9 Solr native support fixes #1703 add 7d1573f Added a bug trap to catch more info in the context #1978 new a6ab6e6 Upgrade to Camel 3.7.0 new b0348dc [Camel 3.7] JSON-B data format support new b00b6d6 Google PubSub native support new 1b2d5e3 BigQuery native support 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 (c03848b) \ N -- N -- N refs/heads/camel-master (1b2d5e3) 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 4 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 | 7 +-- .../test/wiremock/WireMockTestResourceLifecycleManager.java| 10 +++--- .../camel/quarkus/component/nats/it/NatsTestResource.java | 6 +- integration-tests/solr/pom.xml | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-)
[camel-quarkus] 02/04: [Camel 3.7] JSON-B data format support
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b0348dcd0605bbd70102efdf31b7c1711175e3fa
Author: JiriOndrusek
AuthorDate: Thu Nov 5 13:02:17 2020 +0100
[Camel 3.7] JSON-B data format support
---
catalog/pom.xml| 13 ++
.../ROOT/pages/reference/extensions/jsonb.adoc | 38 +
.../partials/reference/dataformats/json-jsonb.adoc | 14 +-
extensions/jsonb/deployment/pom.xml| 67 +
.../component/jsonb/deployment/JsonbProcessor.java | 31 +
extensions/jsonb/pom.xml | 39 ++
extensions/jsonb/runtime/pom.xml | 105 ++
.../jsonb/runtime/src/main/doc/configuration.adoc | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 31 +
extensions/pom.xml | 1 +
integration-tests/jsonb/pom.xml| 154 +
.../quarkus/component/jsonb/it/JsonbResource.java | 81 +++
.../component/jsonb/it/JsonbRouteBuilder.java | 38 +
.../camel/quarkus/component/jsonb/it/TestPojo.java | 48 +++
.../camel/quarkus/component/jsonb/it/JsonbIT.java | 24
.../quarkus/component/jsonb/it/JsonbTest.java | 119
integration-tests/pom.xml | 1 +
poms/bom/pom.xml | 15 ++
tooling/scripts/test-categories.yaml | 1 +
19 files changed, 820 insertions(+), 1 deletion(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 09745bb..19e46f5 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -2207,6 +2207,19 @@
org.apache.camel.quarkus
+camel-quarkus-jsonb
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
camel-quarkus-jsonpath
${project.version}
pom
diff --git a/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc
b/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc
new file mode 100644
index 000..47ea4b2
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc
@@ -0,0 +1,38 @@
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+= JSON JSON-B
+:cq-artifact-id: camel-quarkus-jsonb
+:cq-native-supported: true
+:cq-status: Stable
+:cq-description: Marshal POJOs to JSON and back using JSON-B.
+:cq-deprecated: false
+:cq-jvm-since: 1.5.0
+:cq-native-since: 1.5.0
+
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##1.5.0## [.badge-key]##Native
since##[.badge-supported]##1.5.0##
+
+Marshal POJOs to JSON and back using JSON-B.
+
+== What's inside
+
+* xref:latest@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B
data format]
+
+Please refer to the above link for usage and configuration details.
+
+== Maven coordinates
+
+[source,xml]
+
+
+org.apache.camel.quarkus
+camel-quarkus-jsonb
+
+
+
+Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+
+== Additional Camel Quarkus configuration
+
+Extension contains `io.quarkus:quarkus-jsonb` dependency. No jsonb
implementation has to be provided.
+
diff --git a/docs/modules/ROOT/partials/reference/dataformats/json-jsonb.adoc
b/docs/modules/ROOT/partials/reference/dataformats/json-jsonb.adoc
index a509c1d..f5f90c8 100644
--- a/docs/modules/ROOT/partials/reference/dataformats/json-jsonb.adoc
+++ b/docs/modules/ROOT/partials/reference/dataformats/json-jsonb.adoc
@@ -1 +1,13 @@
-// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+:cq-artifact-id: camel-quarkus-jsonb
+:cq-artifact-id-base: jsonb
+:cq-native-supported: true
+:cq-status: Stable
+:cq-deprecated: false
+:cq-jvm-since: 1.5.0
+:cq-native-since: 1.5.0
+:cq-camel-part-name: json-jsonb
+:cq-camel-part-title: JSON JSON-B
+:cq-camel-part-description: Marshal POJOs to JSON and back using JSON-B.
+:cq-extension-page-title: JSON JSON-B
diff --git a/extensions/jsonb/deployment/pom.xml
b/extensions/jsonb/deployment/pom.xml
new file mode 100644
index 000..541c242
--- /dev/null
+++ b/extensions/jsonb/deployment/pom.xml
@@ -0,0 +1,67 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-jsonb-parent
+
[camel-quarkus] 03/04: Google PubSub native support
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit b00b6d68639eb9c6a6d332f2834de5fd8e65c41c Author: James Netherton AuthorDate: Wed Dec 2 10:41:18 2020 + Google PubSub native support Fixes #1041 --- .../pages/reference/extensions/google-pubsub.adoc | 18 ++- .../reference/components/google-pubsub.adoc| 6 +- .../google-pubsub/integration-test/pom.xml | 66 - .../google/pubsub/it/GooglePubsubResource.java | 51 --- extensions-jvm/pom.xml | 1 - .../google-pubsub/deployment/pom.xml | 8 + .../pubsub/deployment/GooglePubsubProcessor.java | 32 ++-- .../google-pubsub/pom.xml | 1 - .../google-pubsub/runtime/pom.xml | 21 ++- .../runtime/src/main/doc/limitations.adoc | 6 + .../google/pubsub/GooglePubsubRecorder.java| 41 ++ .../pubsub/JacksonGooglePubsubSerializer.java | 29 ++-- .../main/resources/META-INF/quarkus-extension.yaml | 3 +- extensions/pom.xml | 1 + integration-tests/google-pubsub/pom.xml| 122 .../quarkus/component/google/pubsub/it/Fruit.java | 22 +-- .../google/pubsub/it/GooglePubsubResource.java | 70 + .../component/google/pubsub/it/GooglePubsubIT.java | 15 +- .../google/pubsub/it/GooglePubsubTest.java | 34 - .../google/pubsub/it/GooglePubsubTestResource.java | 161 + integration-tests/pom.xml | 1 + pom.xml| 6 +- poms/bom/pom.xml | 28 ++-- tooling/scripts/test-categories.yaml | 1 + 24 files changed, 554 insertions(+), 190 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/google-pubsub.adoc b/docs/modules/ROOT/pages/reference/extensions/google-pubsub.adoc index d2f1acc..cf1d22b 100644 --- a/docs/modules/ROOT/pages/reference/extensions/google-pubsub.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/google-pubsub.adoc @@ -3,15 +3,15 @@ = Google Pubsub :page-aliases: extensions/google-pubsub.adoc :cq-artifact-id: camel-quarkus-google-pubsub -:cq-native-supported: false -:cq-status: Preview +:cq-native-supported: true +:cq-status: Stable :cq-description: Send and receive messages to/from Google Cloud Platform PubSub Service. :cq-deprecated: false :cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 +:cq-native-since: 1.5.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.5.0## Send and receive messages to/from Google Cloud Platform PubSub Service. @@ -32,3 +32,13 @@ Please refer to the above link for usage and configuration details. Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. + +== Camel Quarkus limitations + +By default, the Camel PubSub component uses JDK object serialization via `ObjectOutputStream` whenever the message body is anything other than `String` or `byte[]`. + +Since such serialization is not yet supported by GraalVM, this extension provides a custom Jackson based serializer to serialize complex message payloads as JSON. + +If your payload contains binary data, then you will need to handle that by creating a custom Jackson Serializer / Deserializer. Refer to the https://quarkus.io/guides/writing-extensions#customizing-jackson[Quarkus Jackson guide] for +information on how to do this. + diff --git a/docs/modules/ROOT/partials/reference/components/google-pubsub.adoc b/docs/modules/ROOT/partials/reference/components/google-pubsub.adoc index 4a45c2c..8725241 100644 --- a/docs/modules/ROOT/partials/reference/components/google-pubsub.adoc +++ b/docs/modules/ROOT/partials/reference/components/google-pubsub.adoc @@ -2,11 +2,11 @@ // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page :cq-artifact-id: camel-quarkus-google-pubsub :cq-artifact-id-base: google-pubsub -:cq-native-supported: false -:cq-status: Preview +:cq-native-supported: true +:cq-status: Stable :cq-deprecated: false :cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 +:cq-native-since: 1.5.0 :cq-camel-part-name: google-pubsub :cq-camel-part-title: Google Pubsub :cq-camel-part-description: Send and receive messages to/from Google Cloud Platform PubSub Service. diff --git a/extensions-jvm/google-pubsub/integration-test/pom.xml b/extensions-jvm/google-pubsub/integration-test/pom.xml deleted file mode 100644 index af13b7c..000 --- a/extensions-jvm/google-pubsub/integration-test/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - -
[camel-kafka-connector] branch master updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 8a78976 Updated CHANGELOG.md 8a78976 is described below commit 8a789768296b60ed571d64ce426bdb9976f5ca87 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 5 03:19:10 2020 + Updated CHANGELOG.md --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58faed6..df940d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,14 @@ **Closed issues:** +- Add a removeHeaders option on both source and sink [\#763](https://github.com/apache/camel-kafka-connector/issues/763) - Added Camel-SQL kafka connector integration test [\#757](https://github.com/apache/camel-kafka-connector/issues/757) - Support Poll timeout and key cache size as option for kafka idempotent repository [\#734](https://github.com/apache/camel-kafka-connector/issues/734) - Create Arangodb examples [\#457](https://github.com/apache/camel-kafka-connector/issues/457) **Merged pull requests:** +- Remove headers fix [\#764](https://github.com/apache/camel-kafka-connector/pull/764) ([oscerd](https://github.com/oscerd)) - chore: documentation regen for 0.6.1 [\#761](https://github.com/apache/camel-kafka-connector/pull/761) ([valdar](https://github.com/valdar)) - Support Poll timeout and key cache size as option for kafka idempotent repository [\#760](https://github.com/apache/camel-kafka-connector/pull/760) ([oscerd](https://github.com/oscerd)) - Docs update website [\#759](https://github.com/apache/camel-kafka-connector/pull/759) ([oscerd](https://github.com/oscerd)) @@ -29,7 +31,6 @@ - Prevent NPEs in the \(unlikely\) case the record value is null [\#730](https://github.com/apache/camel-kafka-connector/pull/730) ([orpiske](https://github.com/orpiske)) - Added documentation for idempotency in basic configuration docs [\#729](https://github.com/apache/camel-kafka-connector/pull/729) ([oscerd](https://github.com/oscerd)) - Added Support for KafkaIdempotentRepository [\#725](https://github.com/apache/camel-kafka-connector/pull/725) ([oscerd](https://github.com/oscerd)) -- File language and core languages in general are not working [\#723](https://github.com/apache/camel-kafka-connector/pull/723) ([oscerd](https://github.com/oscerd)) - Use a Registry Ref for IdempotentRepository [\#722](https://github.com/apache/camel-kafka-connector/pull/722) ([oscerd](https://github.com/oscerd)) - Use the errorHandler variable coming from Builder [\#718](https://github.com/apache/camel-kafka-connector/pull/718) ([oscerd](https://github.com/oscerd)) - Idempotency [\#716](https://github.com/apache/camel-kafka-connector/pull/716) ([oscerd](https://github.com/oscerd)) @@ -412,7 +413,6 @@ - BigDecimal values are not handled correctly in Headers serialization and deserialization [\#325](https://github.com/apache/camel-kafka-connector/issues/325) - Camel HDFS: does not work due to dependencies conflicts [\#263](https://github.com/apache/camel-kafka-connector/issues/263) - NullPointerException during shutdown when using Salesforce component [\#245](https://github.com/apache/camel-kafka-connector/issues/245) -- Possible problems in CamelSinkAWSSQSITCase tests [\#215](https://github.com/apache/camel-kafka-connector/issues/215) **Closed issues:** @@ -476,6 +476,7 @@ **Fixed bugs:** - Camel-elasticsearch-rest-kafka-connector throws java.lang.NoClassDefFoundError: org/apache/logging/log4j/LogManager [\#259](https://github.com/apache/camel-kafka-connector/issues/259) +- Possible problems in CamelSinkAWSSQSITCase tests [\#215](https://github.com/apache/camel-kafka-connector/issues/215) **Closed issues:**
[camel-k] branch master updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new eb61443 Updated CHANGELOG.md eb61443 is described below commit eb61443d2679525ae1b1df6f3558f93b554b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 5 03:18:23 2020 + Updated CHANGELOG.md --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a8837d..7af1e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,21 +6,26 @@ **Closed issues:** +- Unable to use Kamelet spec in a custom CRD [\#1837](https://github.com/apache/camel-k/issues/1837) - Multiple knative revisions created when integration has multiple spec.configuration items [\#1824](https://github.com/apache/camel-k/issues/1824) - Release 1.2.1 [\#1823](https://github.com/apache/camel-k/issues/1823) - Support for kamelet repository [\#1818](https://github.com/apache/camel-k/issues/1818) - Telegram Kamlet sets CloudEvent source attribute to Knative sink [\#1813](https://github.com/apache/camel-k/issues/1813) - Move released images to a hub without rate limits [\#1761](https://github.com/apache/camel-k/issues/1761) - Define default global Kamelets [\#1675](https://github.com/apache/camel-k/issues/1675) +- Enable SinkBinding automatically [\#1654](https://github.com/apache/camel-k/issues/1654) - Document the --config option in the kamel CLI [\#1185](https://github.com/apache/camel-k/issues/1185) - Basic module structure for Camel K projects [\#1135](https://github.com/apache/camel-k/issues/1135) **Merged pull requests:** +- fix: Fix kamelet.feature for YAKS version 0.1.0 [\#1844](https://github.com/apache/camel-k/pull/1844) ([astefanutti](https://github.com/astefanutti)) +- Upgrade controller-tools to version 0.4.1 [\#1841](https://github.com/apache/camel-k/pull/1841) ([astefanutti](https://github.com/astefanutti)) - chore\(doc\): Add standard operation procedures to troubleshooting guide [\#1839](https://github.com/apache/camel-k/pull/1839) ([astefanutti](https://github.com/astefanutti)) - Fix \#1675: use kamelets in the operator namespace [\#1836](https://github.com/apache/camel-k/pull/1836) ([nicolaferraro](https://github.com/nicolaferraro)) - chore\(test\): upgrade YAKS to 0.1.0 [\#1835](https://github.com/apache/camel-k/pull/1835) ([nicolaferraro](https://github.com/nicolaferraro)) - doc\(cli\): add section for global flags \#1185 [\#1833](https://github.com/apache/camel-k/pull/1833) ([tadayosi](https://github.com/tadayosi)) +- Fix \#1654: enable sinkbinding automatically [\#1832](https://github.com/apache/camel-k/pull/1832) ([nicolaferraro](https://github.com/nicolaferraro)) - Fix \#1818: add support for Kamelet repository [\#1830](https://github.com/apache/camel-k/pull/1830) ([nicolaferraro](https://github.com/nicolaferraro)) - Provide tests for ENTESB-14497 [\#1829](https://github.com/apache/camel-k/pull/1829) ([llowinge](https://github.com/llowinge)) - Sort the integration configurations before returning [\#1825](https://github.com/apache/camel-k/pull/1825) ([kaczyns](https://github.com/kaczyns))
[camel-quarkus] branch master updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 5c8ae3f Updated CHANGELOG.md 5c8ae3f is described below commit 5c8ae3fb025a8e7bb1fef34540c4a260347e27f7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 5 03:05:01 2020 + Updated CHANGELOG.md --- CHANGELOG.md | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9396914..df30b24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,13 +10,13 @@ - timer-log-main example: The example is not working in dev mode [\#2024](https://github.com/apache/camel-quarkus/issues/2024) - \[Camel 3.7\] Camel main autowire properties by type has been removed [\#2002](https://github.com/apache/camel-quarkus/issues/2002) - Camel Avro RPC component native support [\#1941](https://github.com/apache/camel-quarkus/issues/1941) -- Solr native support [\#1703](https://github.com/apache/camel-quarkus/issues/1703) - FastHeadersMapFactory ClassNotFoundException since 1.0.0-M6 [\#1086](https://github.com/apache/camel-quarkus/issues/1086) - JSch native support [\#797](https://github.com/apache/camel-quarkus/issues/797) - Protobuf dataformat native support [\#789](https://github.com/apache/camel-quarkus/issues/789) **Merged pull requests:** +- Fix persistence of WireMock mappings [\#2054](https://github.com/apache/camel-quarkus/pull/2054) ([jamesnetherton](https://github.com/jamesnetherton)) - Updated the release guide in order to publish sources [\#2053](https://github.com/apache/camel-quarkus/pull/2053) ([aldettinger](https://github.com/aldettinger)) - Use camel-dependencies as parent pom to inherit camel version properties [\#2051](https://github.com/apache/camel-quarkus/pull/2051) ([jamesnetherton](https://github.com/jamesnetherton)) - Micrometer component support [\#2050](https://github.com/apache/camel-quarkus/pull/2050) ([jamesnetherton](https://github.com/jamesnetherton)) @@ -33,6 +33,7 @@ - Camel Avro RPC component native support \#1941 [\#2025](https://github.com/apache/camel-quarkus/pull/2025) ([JiriOndrusek](https://github.com/JiriOndrusek)) - Fix protobuf itest dependency on deployment [\#2021](https://github.com/apache/camel-quarkus/pull/2021) ([llowinge](https://github.com/llowinge)) - Fix debezium itest pom dependencies to deployments [\#2020](https://github.com/apache/camel-quarkus/pull/2020) ([llowinge](https://github.com/llowinge)) +- Leverage Quarkus plugin's generate-code mojo instead of protobuf-maven-plugin to generate protobuf stubs [\#2018](https://github.com/apache/camel-quarkus/pull/2018) ([ppalaga](https://github.com/ppalaga)) - OptaPlanner native support fixes \#1721 [\#1822](https://github.com/apache/camel-quarkus/pull/1822) ([zbendhiba](https://github.com/zbendhiba)) ## [1.4.0](https://github.com/apache/camel-quarkus/tree/1.4.0) (2020-11-19) @@ -58,6 +59,7 @@ - SnappyCompression fails while building native image [\#1910](https://github.com/apache/camel-quarkus/issues/1910) - PostgresSQL Event : add usage of Quarkus AgroalDatasource [\#1909](https://github.com/apache/camel-quarkus/issues/1909) - Log with KafkaProducer does not work [\#1862](https://github.com/apache/camel-quarkus/issues/1862) +- Solr native support [\#1703](https://github.com/apache/camel-quarkus/issues/1703) - Revert PR \#1667 once kudu-client stops shading Netty [\#1669](https://github.com/apache/camel-quarkus/issues/1669) - Hipchat native support [\#1652](https://github.com/apache/camel-quarkus/issues/1652) - Provide a quick profile [\#1607](https://github.com/apache/camel-quarkus/issues/1607) @@ -85,7 +87,6 @@ **Merged pull requests:** -- Leverage Quarkus plugin's generate-code mojo instead of protobuf-maven-plugin to generate protobuf stubs [\#2018](https://github.com/apache/camel-quarkus/pull/2018) ([ppalaga](https://github.com/ppalaga)) - Upgrade Quarkus Qpid JMS to 0.20.0 [\#2017](https://github.com/apache/camel-quarkus/pull/2017) ([jamesnetherton](https://github.com/jamesnetherton)) - Upgrade Quarkus to 1.10.0.Final [\#2016](https://github.com/apache/camel-quarkus/pull/2016) ([jamesnetherton](https://github.com/jamesnetherton)) - Added key [\#2015](https://github.com/apache/camel-quarkus/pull/2015) ([aldettinger](https://github.com/aldettinger)) @@ -93,7 +94,6 @@ - Fix github itest to use oauth token instead username/password [\#2009](https://github.com/apache/camel-quarkus/pull/2009) ([llowinge](https://github.com/llowinge)) - Kudu: unshade and remove embedded netty and use quarkus-netty instead [\#2008](https://github.com/apache/camel-quarkus/pull/2008) ([ppalaga](https://github.com/ppalaga)) - Upgrade to Quarkus 1.10.0.CR1
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request #240: [Github Actions] Periodic Sync Camel Spring Boot Master Branch
github-actions[bot] opened a new pull request #240: URL: https://github.com/apache/camel-spring-boot/pull/240 Periodic Sync of Camel Spring Boot Master Branch with main Camel Master. see https://github.com/apache/camel-spring-boot/blob/master/.github/workflows/automatic-sync-master.yml This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (43a65c7 -> d6565b3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. omit 43a65c7 [create-pull-request] automated change add 3f68aa2 [create-pull-request] automated change add 08e850f Fixed Tika Tests add b20e263 Fixed BigQuery Tests add 97661e7 Removed wrong depedency in BigQuery tests add d6565b3 [create-pull-request] automated change 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 (43a65c7) \ N -- N -- N refs/heads/automatic-periodic-sync (d6565b3) 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. No new revisions were added by this update. Summary of changes: .../org/apache/camel/springboot/catalog/components/aws2-sns.json | 4 ++-- .../camel-aws2-sns-starter/src/main/docs/aws2-sns-starter.adoc| 2 +- .../component/aws2/sns/springboot/Sns2ComponentConfiguration.java | 2 +- docs/modules/ROOT/pages/aws2-sns-starter.adoc | 2 +- .../org/apache/camel/itest/springboot/util/ArquillianPackager.java| 4 5 files changed, 9 insertions(+), 5 deletions(-)
[camel] branch regen_bot updated (a12bb70 -> c9a724a)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a12bb70 Migrates camel-pg-replication-slot to the new test infra
(#4724)
add c9a724a Migrates camel-couchdb to the new test infra (#4725)
No new revisions were added by this update.
Summary of changes:
components/camel-couchdb/pom.xml | 22 --
.../camel/component/couchdb/CouchDbCrudTest.java | 2 +-
.../component/couchdb/CouchDbTestSupport.java | 30 ++--
test-infra/camel-test-infra-couchdb/pom.xml| 60 +++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../infra/couchdb/common/CouchDbProperties.java| 29 +++
.../services/CouchDbLocalContainerService.java | 88 ++
.../couchdb/services/CouchDbRemoteService.java | 54 +
.../infra/couchdb/services/CouchDbService.java | 46 +++
.../couchdb/services/CouchDbServiceFactory.java| 43 +++
test-infra/pom.xml | 1 +
11 files changed, 347 insertions(+), 28 deletions(-)
create mode 100644 test-infra/camel-test-infra-couchdb/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-couchdb}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/common/CouchDbProperties.java
create mode 100644
test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerService.java
create mode 100644
test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbRemoteService.java
create mode 100644
test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbService.java
create mode 100644
test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java
[GitHub] [camel-quarkus] ppalaga commented on pull request #2056: Polish how we pass -Djavax.net.ssl.trustStore to the Solr test #2029
ppalaga commented on pull request #2056: URL: https://github.com/apache/camel-quarkus/pull/2056#issuecomment-739046551 In 08e7dc6 I abandoned the idea with JUnit extension. All is done via Maven pom.xml. I think it is easier to follow like that. The downside is that some special pom setup will be needed on the Platform. Could you please re-review, @zbendhiba ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: Migrates camel-couchdb to the new test infra (#4725)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c9a724a Migrates camel-couchdb to the new test infra (#4725)
c9a724a is described below
commit c9a724adc1097bc1de609f722a4020ba81d77c3b
Author: Otavio Rodolfo Piske
AuthorDate: Fri Dec 4 22:57:41 2020 +0100
Migrates camel-couchdb to the new test infra (#4725)
---
components/camel-couchdb/pom.xml | 22 --
.../camel/component/couchdb/CouchDbCrudTest.java | 2 +-
.../component/couchdb/CouchDbTestSupport.java | 30 ++--
test-infra/camel-test-infra-couchdb/pom.xml| 60 +++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../infra/couchdb/common/CouchDbProperties.java| 29 +++
.../services/CouchDbLocalContainerService.java | 88 ++
.../couchdb/services/CouchDbRemoteService.java | 54 +
.../infra/couchdb/services/CouchDbService.java | 46 +++
.../couchdb/services/CouchDbServiceFactory.java| 43 +++
test-infra/pom.xml | 1 +
11 files changed, 347 insertions(+), 28 deletions(-)
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 3bf71bc..e6be5be 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -56,11 +56,6 @@
test
-org.apache.camel
-camel-testcontainers-junit5
-test
-
-
org.mockito
mockito-junit-jupiter
test
@@ -70,6 +65,23 @@
log4j-slf4j-impl
test
+
+
+
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+test
+
+
+
+org.apache.camel
+camel-test-infra-couchdb
+${project.version}
+test-jar
+test
+
diff --git
a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbCrudTest.java
b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbCrudTest.java
index a7d1b65..86faf8e 100644
---
a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbCrudTest.java
+++
b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbCrudTest.java
@@ -54,7 +54,7 @@ public class CouchDbCrudTest extends CouchDbTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
final String couchDbUrlFormat
-= "couchdb:http://; + getCouchDbHost() + ":" +
getCouchDbPort() + "/camelcouchdb?createDatabase=true%s";
+=
"couchdb:http://{{couchdb.service.address}}/camelcouchdb?createDatabase=true%s;;
return new RouteBuilder() {
@Override
diff --git
a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbTestSupport.java
b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbTestSupport.java
index 750552d..109d9f2 100644
---
a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbTestSupport.java
+++
b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbTestSupport.java
@@ -16,28 +16,14 @@
*/
package org.apache.camel.component.couchdb;
-import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
+import org.apache.camel.test.infra.couchdb.services.CouchDbService;
+import org.apache.camel.test.infra.couchdb.services.CouchDbServiceFactory;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
-public class CouchDbTestSupport extends ContainerAwareTestSupport {
-
-public static final String CONTAINER_IMAGE = "couchdb:2.3.1"; // tested
against 2.1.2, 2.2.0 & 2.3.1
-public static final String CONTAINER_NAME = "couchdb";
-public static final int BROKER_PORT = 5984;
-
-@Override
-protected GenericContainer createContainer() {
-return new
GenericContainer<>(CONTAINER_IMAGE).withNetworkAliases(CONTAINER_NAME).withExposedPorts(BROKER_PORT)
-.waitingFor(Wait.forListeningPort());
-}
-
-public String getCouchDbHost() {
-return getContainer(CONTAINER_NAME).getContainerIpAddress();
-}
-
-public int getCouchDbPort() {
-return
getContainer(CONTAINER_NAME).getMappedPort(BROKER_PORT).intValue();
-}
+public class CouchDbTestSupport extends CamelTestSupport {
+@SuppressWarnings("unused")
+@RegisterExtension
+static CouchDbService service =
[GitHub] [camel] orpiske merged pull request #4725: Migrates camel-couchdb to the new test infra
orpiske merged pull request #4725: URL: https://github.com/apache/camel/pull/4725 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on pull request #2056: Polish how we pass -Djavax.net.ssl.trustStore to the Solr test #2029
ppalaga commented on pull request #2056: URL: https://github.com/apache/camel-quarkus/pull/2056#issuecomment-739009781 Ah, the native test would work if the JVM would be run in advance, but apparently on the CI this is not the case. Let me fix it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch asf-site updated (b836ae6 -> c38be53)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard b836ae6 Website updated to 7844de47eba676b008dba17e389d99ce17731d75 discard 432245f Updated the website to b19baea new cc0bfaa Updated the website to b19baea new c38be53 Website updated to 7844de47eba676b008dba17e389d99ce17731d75 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 (b836ae6) \ N -- N -- N refs/heads/asf-site (c38be53) 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: .../_attachments/schema/integration-schema.json| 12 + .../latest/_attachments/schema/kamelet-schema.json | 34 +- camel-k/latest/traits/knative.html |2 +- components/latest/aws2-s3-component.html |2 +- components/latest/aws2-sns-component.html |2 +- sitemap-camel-k.xml| 168 +- sitemap-camel-kafka-connector.xml | 3298 +++ sitemap-camel-karaf.xml| 28 +- sitemap-camel-quarkus-examples.xml | 24 +- sitemap-camel-quarkus.xml | 1294 +++--- sitemap-camel-spring-boot.xml | 1278 +++--- sitemap-components.xml | 4276 ++-- sitemap-manual.xml | 482 +-- 13 files changed, 5467 insertions(+), 5433 deletions(-)
[camel] branch regen_bot updated (d8efa18 -> a12bb70)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from d8efa18 Sync deps
add a12bb70 Migrates camel-pg-replication-slot to the new test infra
(#4724)
No new revisions were added by this update.
Summary of changes:
components/camel-pg-replication-slot/pom.xml | 14 +++-
.../integration/PgReplicationSlotCamelTest.java| 15 ++--
.../slot/integration/PgReplicationTestSupport.java | 52 +++-
test-infra/camel-test-infra-postgres/pom.xml | 66 +++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../infra/postgres/common/PostgresProperties.java | 32
.../services/PostgresLocalContainerService.java| 94 ++
.../postgres/services/PostgresRemoteService.java | 68
.../infra/postgres/services/PostgresService.java | 48 +++
.../postgres/services/PostgresServiceFactory.java | 43 ++
test-infra/pom.xml | 1 +
11 files changed, 385 insertions(+), 48 deletions(-)
create mode 100644 test-infra/camel-test-infra-postgres/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-postgres}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/common/PostgresProperties.java
create mode 100644
test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java
create mode 100644
test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresRemoteService.java
create mode 100644
test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresService.java
create mode 100644
test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresServiceFactory.java
[GitHub] [camel-kafka-connector] oscerd commented on issue #762: using aws2-s3 source and sink to move files between buckets
oscerd commented on issue #762: URL: https://github.com/apache/camel-kafka-connector/issues/762#issuecomment-738935914 This should have been fixed through https://github.com/apache/camel-kafka-connector/issues/763 I'll add the exact same example as the one you reported in camel-kafka-connector-examples repository. This will be released with 0.7.0, for the moment you can build the connector yourself and use a 0.7.0-SNAPSHOT This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] 01/02: Add a removeHeaders option on both source and sink
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 44b53c27e881475af8cc710498371371f40930b5
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 18:06:53 2020 +0100
Add a removeHeaders option on both source and sink
---
.../camel/kafkaconnector/CamelConnectorConfig.java | 4 ++
.../kafkaconnector/CamelSinkConnectorConfig.java | 3 +-
.../apache/camel/kafkaconnector/CamelSinkTask.java | 2 +
.../kafkaconnector/CamelSourceConnectorConfig.java | 3 +-
.../camel/kafkaconnector/CamelSourceTask.java | 2 +
.../utils/CamelKafkaConnectMain.java | 45
.../camel/kafkaconnector/CamelSinkTaskTest.java| 49 ++
.../camel/kafkaconnector/CamelSourceTaskTest.java | 34 +++
8 files changed, 133 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
index 1b5e014..00c3ce4 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
+++
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
@@ -39,6 +39,10 @@ public abstract class CamelConnectorConfig extends
AbstractConfig {
public static final String CAMEL_CONNECTOR_ERROR_HANDLER_CONF =
"camel.error.handler";
public static final String CAMEL_CONNECTOR_ERROR_HANDLER_DOC = "The error
handler to use: possible value are 'no' or 'default'";
+public static final String CAMEL_CONNECTOR_REMOVE_HEADERS_PATTERN_DEFAULT
= "";
+public static final String CAMEL_CONNECTOR_REMOVE_HEADERS_PATTERN_CONF =
"camel.remove.headers.pattern";
+public static final String CAMEL_CONNECTOR_REMOVE_HEADERS_PATTERN_DOC =
"The pattern of the headers we want to exclude from the exchange";
+
public static final int
CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_DEFAULT = 0;
public static final String
CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF =
"camel.error.handler.max.redeliveries";
public static final String
CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_DOC = "The maximum
redeliveries to be use in case of Default Error Handler";
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
index bf766b7..6350fe9 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
+++
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
@@ -66,7 +66,8 @@ public class CamelSinkConnectorConfig extends
CamelConnectorConfig {
.define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF, Type.STRING,
CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DEFAULT, Importance.LOW,
CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DOC)
.define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF,
Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DEFAULT,
Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DOC)
.define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_MAX_CACHE_SIZE_CONF,
Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_MAX_CACHE_SIZE_DEFAULT,
Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_MAX_CACHE_SIZE_DOC)
-.define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_POLL_DURATION_CONF,
Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_POLL_DURATION_DEFAULT,
Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_POLL_DURATION_DOC);
+.define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_POLL_DURATION_CONF,
Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_POLL_DURATION_DEFAULT,
Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_POLL_DURATION_DOC)
+.define(CAMEL_CONNECTOR_REMOVE_HEADERS_PATTERN_CONF, Type.STRING,
CAMEL_CONNECTOR_REMOVE_HEADERS_PATTERN_DEFAULT, Importance.MEDIUM,
CAMEL_CONNECTOR_REMOVE_HEADERS_PATTERN_DOC);
public CamelSinkConnectorConfig(ConfigDef config, Map
parsedConfig) {
super(config, parsedConfig);
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
index e4c9341..5b5e0d5 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
@@ -94,6 +94,7 @@ public class CamelSinkTask extends SinkTask {
final String idempotentRepositoryBootstrapServers =
config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF);
final int idempotentRepositoryKafkaMaxCacheSize =
config.getInt(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_MAX_CACHE_SIZE_CONF);
final int idempotentRepositoryKafkaPollDuration =
[GitHub] [camel-kafka-connector] oscerd merged pull request #764: Remove headers fix
oscerd merged pull request #764: URL: https://github.com/apache/camel-kafka-connector/pull/764 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] 02/02: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit d2cbe95476f1efc33a793b7a36d4f54d5a8fe187
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 18:20:25 2020 +0100
Fixed CS
---
.../camel/kafkaconnector/utils/CamelKafkaConnectMain.java | 13 +++--
.../apache/camel/kafkaconnector/CamelSourceTaskTest.java| 4 +---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 7d3e7d7..5eb0df5 100644
---
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -270,7 +270,8 @@ public class CamelKafkaConnectMain extends SimpleMain {
if
(ObjectHelper.isEmpty(headersExcludePattern)) {
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").toD(to);
} else {
-
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").removeHeaders(headersExcludePattern).toD(to);
+
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout)
+
.idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").removeHeaders(headersExcludePattern).toD(to);
}
break;
case "header":
@@ -282,7 +283,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
.idempotentConsumer(header(expressionHeader)).messageIdRepositoryRef("idempotentRepository").toD(to);
} else {
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout)
-
.idempotentConsumer(header(expressionHeader)).messageIdRepositoryRef("idempotentRepository").removeHeaders(headersExcludePattern).toD(to);
+
.idempotentConsumer(header(expressionHeader)).messageIdRepositoryRef("idempotentRepository").removeHeaders(headersExcludePattern).toD(to);
}
break;
default:
@@ -294,7 +295,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
if (ObjectHelper.isEmpty(headersExcludePattern)) {
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).toD(to);
} else {
-
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).removeHeaders(headersExcludePattern).toD(to);
+
rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).removeHeaders(headersExcludePattern).toD(to);
}
}
} else {
@@ -305,7 +306,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
if
(ObjectHelper.isEmpty(headersExcludePattern)) {
rd.idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").toD(to);
} else {
-
rd.idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").removeHeaders(headersExcludePattern).toD(to);
+
rd.idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").removeHeaders(headersExcludePattern).toD(to);
}
break;
case "header":
@@ -313,7 +314,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
if
(ObjectHelper.isEmpty(headersExcludePattern)) {
rd.idempotentConsumer(header(expressionHeader)).messageIdRepositoryRef("idempotentRepository").toD(to);
} else {
-
[camel-kafka-connector] branch master updated (d437eac -> d2cbe95)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from d437eac Updated CHANGELOG.md new 44b53c2 Add a removeHeaders option on both source and sink new d2cbe95 Fixed CS 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: .../camel/kafkaconnector/CamelConnectorConfig.java | 4 ++ .../kafkaconnector/CamelSinkConnectorConfig.java | 3 +- .../apache/camel/kafkaconnector/CamelSinkTask.java | 2 + .../kafkaconnector/CamelSourceConnectorConfig.java | 3 +- .../camel/kafkaconnector/CamelSourceTask.java | 2 + .../utils/CamelKafkaConnectMain.java | 46 .../camel/kafkaconnector/CamelSinkTaskTest.java| 49 ++ .../camel/kafkaconnector/CamelSourceTaskTest.java | 32 ++ 8 files changed, 132 insertions(+), 9 deletions(-)
[GitHub] [camel-kafka-connector] oscerd closed issue #763: Add a removeHeaders option on both source and sink
oscerd closed issue #763: URL: https://github.com/apache/camel-kafka-connector/issues/763 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch master updated: Added a bug trap to catch more info in the context #1978
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 7d1573f Added a bug trap to catch more info in the context #1978
7d1573f is described below
commit 7d1573f97480d7e80b771647175ec6f8c7502abe
Author: aldettinger
AuthorDate: Fri Dec 4 18:52:39 2020 +0100
Added a bug trap to catch more info in the context #1978
---
.../apache/camel/quarkus/component/nats/it/NatsTestResource.java| 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
index 77e757b..ce46c76 100644
---
a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
+++
b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
@@ -77,7 +77,11 @@ public class NatsTestResource implements
ContainerResourceLifecycleManager {
"--tlsverify",
"--tlscacert=/certs/ca.pem")
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
-tlsAuthContainer.start();
+try {
+tlsAuthContainer.start();
+} catch (Exception ex) {
+throw new RuntimeException("An issue occurred while starting
tlsAuthContainer: " + tlsAuthContainer.getLogs(), ex);
+}
String tlsAuthIp = tlsAuthContainer.getContainerIpAddress();
Integer tlsAuthPort = tlsAuthContainer.getMappedPort(NATS_SERVER_PORT);
String tlsAuthBrokerUrl = String.format("%s:%d", tlsAuthIp,
tlsAuthPort);
[camel] branch master updated: Migrates camel-pg-replication-slot to the new test infra (#4724)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a12bb70 Migrates camel-pg-replication-slot to the new test infra
(#4724)
a12bb70 is described below
commit a12bb70295e9811b83a1000d5b642d6af2d4f990
Author: Otavio Rodolfo Piske
AuthorDate: Fri Dec 4 18:50:56 2020 +0100
Migrates camel-pg-replication-slot to the new test infra (#4724)
---
components/camel-pg-replication-slot/pom.xml | 14 +++-
.../integration/PgReplicationSlotCamelTest.java| 15 ++--
.../slot/integration/PgReplicationTestSupport.java | 52 +++-
test-infra/camel-test-infra-postgres/pom.xml | 66 +++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../infra/postgres/common/PostgresProperties.java | 32
.../services/PostgresLocalContainerService.java| 94 ++
.../postgres/services/PostgresRemoteService.java | 68
.../infra/postgres/services/PostgresService.java | 48 +++
.../postgres/services/PostgresServiceFactory.java | 43 ++
test-infra/pom.xml | 1 +
11 files changed, 385 insertions(+), 48 deletions(-)
diff --git a/components/camel-pg-replication-slot/pom.xml
b/components/camel-pg-replication-slot/pom.xml
index 0a5511d..342b861 100644
--- a/components/camel-pg-replication-slot/pom.xml
+++ b/components/camel-pg-replication-slot/pom.xml
@@ -57,9 +57,21 @@
mockito-junit-jupiter
test
+
+
+
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+test
+
+
org.apache.camel
-camel-testcontainers-junit5
+camel-test-infra-postgres
+${project.version}
+test-jar
test
diff --git
a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotCamelTest.java
b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotCamelTest.java
index 4e05440..6746ef6 100644
---
a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotCamelTest.java
+++
b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotCamelTest.java
@@ -40,10 +40,10 @@ public class PgReplicationSlotCamelTest extends
PgReplicationTestSupport {
public void setUp() throws Exception {
super.setUp();
-String url = String.format("jdbc:postgresql://%s/camel",
getAuthority());
+String url = String.format("jdbc:postgresql://%s/camel",
service.getServiceAddress());
Properties props = new Properties();
-props.setProperty("user", "camel");
-props.setProperty("password", "camel");
+props.setProperty("user", service.userName());
+props.setProperty("password", service.password());
this.connection = DriverManager.getConnection(url, props);
try (Statement statement = this.connection.createStatement()) {
@@ -64,11 +64,12 @@ public class PgReplicationSlotCamelTest extends
PgReplicationTestSupport {
@Override
public void configure() {
-String uriFormat =
"pg-replication-slot://%s/camel/camel_test_slot:test_decoding?user=%s" +
-
"=%s=true=false";
+String uriFormat
+=
"pg-replication-slot://{{postgres.service.address}}/camel/camel_test_slot:test_decoding?"
+ +
"user={{postgres.user.name}}={{postgres.user.password}}"
+ +
"=true=false";
-String uri = String.format(uriFormat, getAuthority(),
getUser(), getPassword());
-from(uri).to(mockEndpoint);
+from(uriFormat).to(mockEndpoint);
}
};
}
diff --git
a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationTestSupport.java
b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationTestSupport.java
index dbd74d2..79e301a 100644
---
a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationTestSupport.java
+++
b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationTestSupport.java
@@ -17,49 +17,21 @@
package org.apache.camel.component.pg.replication.slot.integration;
-import
[GitHub] [camel] orpiske merged pull request #4724: Migrates camel-pg-replication-slot to the new test infra
orpiske merged pull request #4724: URL: https://github.com/apache/camel/pull/4724 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch removeHeaders-fix created (now 87ab5b7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch removeHeaders-fix in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at 87ab5b7 Fixed CS No new revisions were added by this update.
[GitHub] [camel-kafka-connector] oscerd opened a new pull request #764: Remove headers fix
oscerd opened a new pull request #764: URL: https://github.com/apache/camel-kafka-connector/pull/764 Fixes #763 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] jam01 commented on pull request #4561: [CAMEL-15804] - DataSonnet Expression Language Support
jam01 commented on pull request #4561: URL: https://github.com/apache/camel/pull/4561#issuecomment-738902912 @davsclaus yes, it is :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (768f36a -> d8efa18)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 768f36a Fixed build in tests jmh add abc24ef Upgrade Braintree Java to version 3.4.0 add d8efa18 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-k] 07/07: chore(doc): Rebuild JSON schemas
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 472b4335a7ffecaec9195403ec47b6e24024a5ea
Author: Antonin Stefanutti
AuthorDate: Fri Dec 4 10:46:36 2020 +0100
chore(doc): Rebuild JSON schemas
---
.../attachments/schema/integration-schema.json | 2 ++
.../assets/attachments/schema/kamelet-schema.json | 34 ++
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git
a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
b/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
index 1a0ffde..f8358a7 100644
--- a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
+++ b/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
@@ -8476,6 +8476,8 @@
"description": "A TraitSpec contains the configuration of a trait",
"properties": {
"configuration": {
+"description": "TraitConfiguration --",
+"format": "byte",
"type": "object"
}
},
diff --git a/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
b/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
index 735d239..4ea5bf7 100644
--- a/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
+++ b/docs/modules/ROOT/assets/attachments/schema/kamelet-schema.json
@@ -4197,7 +4197,9 @@
"type": "array"
},
"default": {
- "description": "default is a default value for undefined object
fields. Defaulting is a beta feature under the CustomResourceDefaulting feature
gate. Defaulting requires spec.preserveUnknownFields to be false."
+ "description": "default is a default value for undefined object
fields. Defaulting is a beta feature under the CustomResourceDefaulting feature
gate. Defaulting requires spec.preserveUnknownFields to be false.",
+ "format": "byte",
+ "type": "string"
},
"definitions": {
"additionalProperties": {},
@@ -4218,10 +4220,18 @@
"type": "string"
},
"enum": {
- "items": {},
+ "items": {
+"description": "JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.",
+"format": "byte",
+"type": "string"
+ },
"type": "array"
},
-"example": {},
+"example": {
+ "description": "JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.",
+ "format": "byte",
+ "type": "string"
+},
"exclusiveMaximum": {
"type": "boolean"
},
@@ -4362,6 +4372,8 @@
"type": "array"
},
"flow": {
+ "description": "Flow is an unstructured object representing a Camel
Flow in YAML/JSON DSL",
+ "format": "byte",
"maxProperties": 1,
"properties": {
"error-handler": {
@@ -4463,7 +4475,9 @@
"type": "array"
},
"default": {
-"description": "default is a default value for undefined
object fields. Defaulting is a beta feature under the CustomResourceDefaulting
feature gate. Defaulting requires spec.preserveUnknownFields to be false."
+"description": "default is a default value for undefined
object fields. Defaulting is a beta feature under the CustomResourceDefaulting
feature gate. Defaulting requires spec.preserveUnknownFields to be false.",
+"format": "byte",
+"type": "string"
},
"definitions": {
"additionalProperties": {},
@@ -4484,10 +4498,18 @@
"type": "string"
},
"enum": {
-"items": {},
+"items": {
+ "description": "JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.",
+ "format": "byte",
+ "type": "string"
+},
"type": "array"
},
- "example": {},
+ "example": {
+"description": "JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.",
+"format": "byte",
+"type": "string"
+
[camel-k] 02/07: chore(api): Move shared types to common_types.go
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5b776c9fb22c747513a32bc5cdb64120a646845b
Author: Antonin Stefanutti
AuthorDate: Thu Dec 3 15:30:05 2020 +0100
chore(api): Move shared types to common_types.go
---
pkg/apis/camel/v1/camelcatalog_types.go | 8 ---
pkg/apis/camel/v1/common_types.go | 87 +
pkg/apis/camel/v1/integration_types.go | 77 -
3 files changed, 87 insertions(+), 85 deletions(-)
diff --git a/pkg/apis/camel/v1/camelcatalog_types.go
b/pkg/apis/camel/v1/camelcatalog_types.go
index 609932b..89bceb9 100644
--- a/pkg/apis/camel/v1/camelcatalog_types.go
+++ b/pkg/apis/camel/v1/camelcatalog_types.go
@@ -95,15 +95,7 @@ type CamelCatalogList struct {
Items []CamelCatalog `json:"items"`
}
-// RuntimeProvider --
-type RuntimeProvider string
-
const (
// CamelCatalogKind --
CamelCatalogKind string = "CamelCatalog"
-
- // RuntimeProviderMain --
- RuntimeProviderMain RuntimeProvider = "main"
- // RuntimeProviderQuarkus --
- RuntimeProviderQuarkus RuntimeProvider = "quarkus"
)
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index 1a852f0..25eff32 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -150,3 +150,90 @@ type ResourceCondition interface {
type Flow struct {
json.RawMessage `json:",inline"`
}
+
+// RuntimeProvider --
+type RuntimeProvider string
+
+const (
+ // RuntimeProviderMain --
+ RuntimeProviderMain RuntimeProvider = "main"
+ // RuntimeProviderQuarkus --
+ RuntimeProviderQuarkus RuntimeProvider = "quarkus"
+)
+
+// ResourceType --
+type ResourceType string
+
+// ResourceSpec --
+type ResourceSpec struct {
+ DataSpec `json:",inline"`
+ Type ResourceType `json:"type,omitempty"`
+ MountPath string `json:"mountPath,omitempty"`
+}
+
+const (
+ // ResourceTypeData --
+ ResourceTypeData ResourceType = "data"
+ // ResourceTypeOpenAPI --
+ ResourceTypeOpenAPI ResourceType = "openapi"
+)
+
+// SourceSpec --
+type SourceSpec struct {
+ DataSpec `json:",inline"`
+ Language Language `json:"language,omitempty"`
+ // Loader is an optional id of the org.apache.camel.k.RoutesLoader that
will
+ // interpret this source at runtime
+ Loader string `json:"loader,omitempty"`
+ // Interceptors are optional identifiers the
org.apache.camel.k.RoutesLoader
+ // uses to pre/post process sources
+ Interceptors []string `json:"interceptors,omitempty"`
+ // Type defines the kind of source described by this object
+ Type SourceType `json:"type,omitempty"`
+ // List of property names defined in the source (e.g. if type is
"template")
+ PropertyNames []string `json:"property-names,omitempty"`
+}
+
+type SourceType string
+
+const (
+ SourceTypeDefault SourceType = ""
+ SourceTypeTemplate SourceType = "template"
+)
+
+// DataSpec --
+type DataSpec struct {
+ Namestring `json:"name,omitempty"`
+ Content string `json:"content,omitempty"`
+ ContentRef string `json:"contentRef,omitempty"`
+ ContentKey string `json:"contentKey,omitempty"`
+ Compression bool `json:"compression,omitempty"`
+}
+
+// Language --
+type Language string
+
+const (
+ // LanguageJavaSource --
+ LanguageJavaSource Language = "java"
+ // LanguageGroovy --
+ LanguageGroovy Language = "groovy"
+ // LanguageJavaScript --
+ LanguageJavaScript Language = "js"
+ // LanguageXML --
+ LanguageXML Language = "xml"
+ // LanguageKotlin --
+ LanguageKotlin Language = "kts"
+ // LanguageYaml --
+ LanguageYaml Language = "yaml"
+)
+
+// Languages is the list of all supported languages
+var Languages = []Language{
+ LanguageJavaSource,
+ LanguageGroovy,
+ LanguageJavaScript,
+ LanguageXML,
+ LanguageKotlin,
+ LanguageYaml,
+}
diff --git a/pkg/apis/camel/v1/integration_types.go
b/pkg/apis/camel/v1/integration_types.go
index d29f93d..3d103d5 100644
--- a/pkg/apis/camel/v1/integration_types.go
+++ b/pkg/apis/camel/v1/integration_types.go
@@ -92,83 +92,6 @@ type IntegrationList struct {
Items []Integration `json:"items"`
}
-// DataSpec --
-type DataSpec struct {
- Namestring `json:"name,omitempty"`
- Content string `json:"content,omitempty"`
- ContentRef string `json:"contentRef,omitempty"`
- ContentKey string `json:"contentKey,omitempty"`
- Compression bool `json:"compression,omitempty"`
-}
-
-// ResourceType --
-type ResourceType string
-
-// ResourceSpec --
-type ResourceSpec struct {
- DataSpec `json:",inline"`
- Type
[camel-k] 01/07: chore: Upgrade controller-tools to version 0.4.1
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 59ed9a9d68f180d5f816db82cb6fd63b4c07a8ee Author: Antonin Stefanutti AuthorDate: Thu Dec 3 15:27:16 2020 +0100 chore: Upgrade controller-tools to version 0.4.1 --- go.sum| 2 ++ pkg/apis/camel/go.mod | 3 +-- pkg/apis/camel/go.sum | 44 script/Makefile | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/go.sum b/go.sum index 4efafe5..a66d9d9 100644 --- a/go.sum +++ b/go.sum @@ -1595,6 +1595,7 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200527183253-8e7acdbce89d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200701000337-a32c0cb1d5b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -2047,6 +2048,7 @@ sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJU sigs.k8s.io/controller-tools v0.0.0-20200528125929-5c0c6ae3b64b/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= sigs.k8s.io/controller-tools v0.2.4 h1:la1h46EzElvWefWLqfsXrnsO3lZjpkI0asTpX6h8PLA= sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA= +sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= diff --git a/pkg/apis/camel/go.mod b/pkg/apis/camel/go.mod index d80c823..2ed4e91 100644 --- a/pkg/apis/camel/go.mod +++ b/pkg/apis/camel/go.mod @@ -6,7 +6,6 @@ require ( github.com/stretchr/testify v1.4.0 k8s.io/api v0.18.9 k8s.io/apimachinery v0.18.9 - // Required to get https://github.com/kubernetes-sigs/controller-tools/pull/428 - sigs.k8s.io/controller-tools v0.0.0-20200528125929-5c0c6ae3b64b // indirect + sigs.k8s.io/controller-tools v0.4.1 // indirect sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e // indirect ) diff --git a/pkg/apis/camel/go.sum b/pkg/apis/camel/go.sum index 1df0b88..a526471 100644 --- a/pkg/apis/camel/go.sum +++ b/pkg/apis/camel/go.sum @@ -11,6 +11,7 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -28,8 +29,10 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod
[camel-k] 06/07: fix(crd): Override OpenAPI schema type for RawMessage
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 9cbbb956e1d1f5d15313f90da1d6427aa741f65f Author: Antonin Stefanutti AuthorDate: Fri Dec 4 10:46:06 2020 +0100 fix(crd): Override OpenAPI schema type for RawMessage --- .../bases/camel.apache.org_integrationkits.yaml| 3 +- .../camel.apache.org_integrationplatforms.yaml | 6 ++-- .../crd/bases/camel.apache.org_integrations.yaml | 6 ++-- .../bases/camel.apache.org_kameletbindings.yaml| 12 +++ config/crd/bases/camel.apache.org_kamelets.yaml| 3 +- deploy/crd-integration-kit.yaml| 3 +- deploy/crd-integration-platform.yaml | 6 ++-- deploy/crd-integration.yaml| 6 ++-- deploy/crd-kamelet-binding.yaml| 12 +++ deploy/crd-kamelet.yaml| 3 +- .../integrationkits.camel.apache.org.crd.yaml | 3 +- .../integrationplatforms.camel.apache.org.crd.yaml | 6 ++-- .../integrations.camel.apache.org.crd.yaml | 6 ++-- .../kameletbindings.camel.apache.org.crd.yaml | 12 +++ .../kamelets.camel.apache.org.crd.yaml | 3 +- deploy/resources.go| 20 +-- helm/camel-k/crds/crd-integration-kit.yaml | 3 +- helm/camel-k/crds/crd-integration-platform.yaml| 6 ++-- helm/camel-k/crds/crd-integration.yaml | 6 ++-- helm/camel-k/crds/crd-kamelet-binding.yaml | 12 +++ helm/camel-k/crds/crd-kamelet.yaml | 3 +- pkg/apis/addtoscheme_camel_v1.go | 2 +- pkg/apis/addtoscheme_camel_v1alpha1.go | 2 +- pkg/apis/camel/v1/common_types.go | 15 pkg/apis/camel/v1/common_types_support.go | 22 pkg/apis/camel/v1/zz_generated.deepcopy.go | 24 +++-- pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 8 ++--- pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/client/camel/go.sum| 40 ++ 29 files changed, 148 insertions(+), 107 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index aa4b129..23f52b3 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -104,8 +104,7 @@ spec: properties: configuration: description: TraitConfiguration -- -format: byte -type: string +type: object required: - configuration type: object diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index bb27323..5cdc3ff 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -200,8 +200,7 @@ spec: properties: configuration: description: TraitConfiguration -- -format: byte -type: string +type: object required: - configuration type: object @@ -381,8 +380,7 @@ spec: properties: configuration: description: TraitConfiguration -- -format: byte -type: string +type: object required: - configuration type: object diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index 2b36a75..77cb361 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -96,8 +96,7 @@ spec: items: description: Flow is an unstructured object representing a Camel Flow in YAML/JSON DSL -format: byte -type: string +type: object type: array kit: type: string @@ -180,8 +179,7 @@ spec: properties: configuration: description: TraitConfiguration -- -format: byte -type: string +type: object required: - configuration type: object diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index 0d02f41..5f2e859 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++
[camel-k] branch master updated (55ce357 -> 472b433)
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 55ce357 Fix #1654: disable sinkbinding in kameletbinding explicit uri new 59ed9a9 chore: Upgrade controller-tools to version 0.4.1 new 5b776c9 chore(api): Move shared types to common_types.go new 7468fb5 fix(crd): Type json.RawMessage fields as byte-formatted string in OpenAPI schema new 4524996 chore(crd): Re-generate CRDs with controller-tools 0.4.1 new ef9ba82 chore: Rebuild resources new 9cbbb95 fix(crd): Override OpenAPI schema type for RawMessage new 472b433 chore(doc): Rebuild JSON schemas The 7 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: config/crd/bases/camel.apache.org_builds.yaml | 2 +- .../crd/bases/camel.apache.org_camelcatalogs.yaml | 2 +- .../bases/camel.apache.org_integrationkits.yaml| 3 +- .../camel.apache.org_integrationplatforms.yaml | 4 +- .../crd/bases/camel.apache.org_integrations.yaml | 5 +- .../bases/camel.apache.org_kameletbindings.yaml| 5 +- config/crd/bases/camel.apache.org_kamelets.yaml| 36 +++- deploy/crd-build.yaml | 2 +- deploy/crd-camel-catalog.yaml | 2 +- deploy/crd-integration-kit.yaml| 3 +- deploy/crd-integration-platform.yaml | 4 +- deploy/crd-integration.yaml| 5 +- deploy/crd-kamelet-binding.yaml| 5 +- deploy/crd-kamelet.yaml| 36 +++- .../builds.camel.apache.org.crd.yaml | 2 +- .../camelcatalogs.camel.apache.org.crd.yaml| 2 +- .../integrationkits.camel.apache.org.crd.yaml | 3 +- .../integrationplatforms.camel.apache.org.crd.yaml | 4 +- .../integrations.camel.apache.org.crd.yaml | 5 +- .../kameletbindings.camel.apache.org.crd.yaml | 5 +- .../kamelets.camel.apache.org.crd.yaml | 36 +++- deploy/resources.go| 28 +++--- .../attachments/schema/integration-schema.json | 2 + .../assets/attachments/schema/kamelet-schema.json | 34 +-- go.sum | 2 + helm/camel-k/crds/crd-build.yaml | 2 +- helm/camel-k/crds/crd-camel-catalog.yaml | 2 +- helm/camel-k/crds/crd-integration-kit.yaml | 3 +- helm/camel-k/crds/crd-integration-platform.yaml| 4 +- helm/camel-k/crds/crd-integration.yaml | 5 +- helm/camel-k/crds/crd-kamelet-binding.yaml | 5 +- helm/camel-k/crds/crd-kamelet.yaml | 36 +++- pkg/apis/addtoscheme_camel_v1.go | 2 +- pkg/apis/addtoscheme_camel_v1alpha1.go | 2 +- pkg/apis/camel/go.mod | 3 +- pkg/apis/camel/go.sum | 44 + pkg/apis/camel/v1/camelcatalog_types.go| 8 -- pkg/apis/camel/v1/common_types.go | 102 +++-- pkg/apis/camel/v1/common_types_support.go | 22 + pkg/apis/camel/v1/integration_types.go | 77 pkg/apis/camel/v1/zz_generated.deepcopy.go | 24 - pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 8 +- pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/client/camel/go.sum| 40 script/Makefile| 2 +- 45 files changed, 461 insertions(+), 169 deletions(-)
[camel-k] 05/07: chore: Rebuild resources
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ef9ba8251c047731bc9f0875543c1eaf7cb3b94c
Author: Antonin Stefanutti
AuthorDate: Fri Dec 4 08:41:29 2020 +0100
chore: Rebuild resources
---
deploy/resources.go | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index 1056ca3..f5a5e5b 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -112,51 +112,51 @@ var assets = func() http.FileSystem {
"/crd-build.yaml": Ű°CompressedFileInfo{
name: "crd-build.yaml",
modTime: time.Time{},
- uncompressedSize: 301790,
+ uncompressedSize: 301762,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x6b\x73\x1b\x37\x96\x30\x8e\xbf\xcf\xa7\x40\x29\x53\x25\x69\x23\x52\xf6\x6c\x76\x76\x46\xb3\x35\x29\xc5\x92\x33\xfa\x27\xb6\xf5\x58\x72\xf2\x7f\x2a\x93\x9d\x02\xbb\x41\x12\xab\x6e\xa0\x03\xa0\x25\x73\x9e\xec\x77\xff\x15\x0e\x80\xbe\xf0\xd6\x07\x4d\x4a\x56\x92\xc6\x1b\x5b\x24\xfb\x34\x2e\x07\xe7\x7e\xf9\x9c\x8c\xf6\x37\x3e\xfb\x9c\x7c\xc7\x13\x26\x34\x4b\x89\x91\xc4\xcc\x19\x39\x2f\x68\x32\x67\xe4\x46\x4e\xcd\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1b\x37\xb6\x28\xfa\x3d\xbf\x02\xa5\x4c\x95\xa4\x1d\x91\xb2\xf7\xce\x9d\x99\xad\x99\x9a\x94\x62\xc9\x19\xdd\xc4\xb6\x8e\x25\x27\xf7\x54\x26\x7b\x0a\xec\x06\x49\x8c\xba\x81\x0e\x80\x96\xcc\x39\x39\xff\xfd\x16\x16\x80\x7e\xf0\xd5\x0b\x4d\x4a\x56\x92\xc6\x17\x5b\x24\x7b\x35\x1e\x0b\xeb\xfd\xf8\x9c\x8c\xf6\x37\x3e\xfb\x9c\x7c\xc7\x13\x26\x34\x4b\x89\x91\xc4\xcc\x19\x39\x2f\x68\x32\x67\xe4\x46\x4e\xcd\x03\x
[...]
},
"/crd-camel-catalog.yaml": Ű°CompressedFileInfo{
name: "crd-camel-catalog.yaml",
modTime: time.Time{},
- uncompressedSize: 9284,
+ uncompressedSize: 9256,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\x5f\x93\xdb\xb6\x11\x7f\xe7\xa7\xd8\x39\x3d\x38\x99\x39\x52\xe7\x4b\x9d\x49\xd4\x27\x55\x3e\x4f\x55\x3b\xba\x9b\x93\xe2\x4c\x1e\x21\x70\x45\x21\x07\x02\x2c\x00\x4a\xa7\x76\xfa\xdd\x3b\x00\x48\x89\x94\xf8\x2f\xf6\xd9\x69\x67\x82\x27\x89\x58\xee\x9f\xdf\xee\x6f\x01\x10\x23\x08\x5f\x6e\x04\x23\xf8\xc0\x28\x0a\x8d\x31\x18\x09\x66\x8b\x30\xcd\x08\xdd\x22\x2c\xe5\xc6\xec\x89\x42\x78\x27\x73\x11\x13\xc3\xa4\x80\x6f\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\xcd\x72\xe3\xb8\x11\xbe\xf3\x29\xba\xac\xc3\xec\x56\x59\xd4\x4e\x92\x43\x4a\x39\x29\x1a\xbb\xa2\x8c\x57\x76\x59\xda\xd9\xda\x63\x8b\x6c\x51\x58\x83\x00\x03\x80\x92\x95\x54\xde\x3d\x05\x80\x94\x48\x89\x7f\x3b\xe3\x99\x4d\xaa\x82\x93\x44\x34\xfb\xe7\xeb\xfe\x1a\x00\x31\x82\xf1\xdb\x8d\x60\x04\x0f\x2c\x22\xa1\x29\x06\x23\xc1\xec\x08\x66\x19\x46\x3b\x82\x95\xdc\x9a\x03\x2a\x82\x7b\x99\x8b\x18\x0d\x93\x02\xbe\x9b\x
[...]
},
"/crd-integration-kit.yaml": Ű°CompressedFileInfo{
name: "crd-integration-kit.yaml",
modTime: time.Time{},
- uncompressedSize: 7404,
+ uncompressedSize: 7464,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x59\xdf\x6f\xdb\x38\xf2\x7f\xd7\x5f\x31\x88\x1f\xba\x0b\xc4\x72\x9a\xfd\x76\xb1\xeb\xef\x93\xcf\x6d\x70\xbe\xb6\x49\x10\xbb\xbb\x58\xa0\x2f\x63\x69\x2c\xcf\x59\x22\x75\x24\x65\x27\x77\xb8\xff\xfd\x40\x52\x92\x25\x5b\x72\x9c\xb4\xd5\x93\x45\x0e\x67\x3e\xf3\x7b\x44\x0f\x60\xf8\xfd\x9e\x60\x00\x9f\x38\x22\xa1\x29\x06\x23\xc1\xac\x09\x26\x39\x46\x6b\x82\xb9\x5c\x99\x1d\x2a\x82\x1b\x59\x88\x18\x0d\x4b\x01\x3f\x4d\xe6\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x59\x5f\x93\xe2\xb8\x11\x7f\xf7\xa7\xe8\x1a\x1e\xee\xae\x6a\x30\xb7\x49\x1e\x52\xe4\x89\xb0\x3b\x15\xb2\xbb\x33\x53\x03\x7b\x57\x57\xb5\x2f\x8d\xdd\x98\x0e\xb6\xe4\x48\x32\x0c\x49\xe5\xbb\xa7\x24\xd9\xc6\xc6\x36\xc3\xcc\xee\xfa\x09\x4b\xad\xee\x5f\xff\x6f\x8b\x11\x8c\xbf\xdf\x13\x8c\xe0\x13\x47\x24\x34\xc5\x60\x24\x98\x2d\xc1\x2c\xc7\x68\x4b\xb0\x94\x1b\x73\x40\x45\x70\x27\x0b\x11\xa3\x61\x29\xe0\xe7\xd9\xf2\xee\x
[...]
},
"/crd-integration-platform.yaml": Ű°CompressedFileInfo{
name: "crd-integration-platform.yaml",
modTime: time.Time{},
- uncompressedSize: 15857,
+ uncompressedSize: 16005,
-
[camel-k] 03/07: fix(crd): Type json.RawMessage fields as byte-formatted string in OpenAPI schema
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7468fb566dbb248f1eff29faa4b77168a3c94300
Author: Antonin Stefanutti
AuthorDate: Thu Dec 3 15:32:11 2020 +0100
fix(crd): Type json.RawMessage fields as byte-formatted string in OpenAPI
schema
---
pkg/apis/camel/v1/common_types.go| 4 ++--
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index 25eff32..343f6b7 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -58,7 +58,7 @@ type TraitSpec struct {
Configuration TraitConfiguration `json:"configuration"`
}
-// +kubebuilder:validation:Type=object
+// +kubebuilder:validation:Type=string
// TraitConfiguration --
type TraitConfiguration struct {
json.RawMessage `json:",inline"`
@@ -146,7 +146,7 @@ type ResourceCondition interface {
}
// Flow is an unstructured object representing a Camel Flow in YAML/JSON DSL
-// +kubebuilder:validation:Type=object
+// +kubebuilder:validation:Type=string
type Flow struct {
json.RawMessage `json:",inline"`
}
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index b1cc853..124c3ab 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -53,7 +53,7 @@ const (
)
// EndpointProperties is a key/value struct represented as JSON raw to allow
numeric/boolean values
-// +kubebuilder:validation:Type=object
+// +kubebuilder:validation:Type=string
type EndpointProperties struct {
json.RawMessage `json:",inline"`
}
[camel-k] 04/07: chore(crd): Re-generate CRDs with controller-tools 0.4.1
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 4524996941a7dcb85a1226f54f067be0a47cae08 Author: Antonin Stefanutti AuthorDate: Thu Dec 3 15:35:22 2020 +0100 chore(crd): Re-generate CRDs with controller-tools 0.4.1 --- config/crd/bases/camel.apache.org_builds.yaml | 2 +- .../crd/bases/camel.apache.org_camelcatalogs.yaml | 2 +- .../bases/camel.apache.org_integrationkits.yaml| 6 ++-- .../camel.apache.org_integrationplatforms.yaml | 10 -- .../crd/bases/camel.apache.org_integrations.yaml | 11 -- .../bases/camel.apache.org_kameletbindings.yaml| 17 +++--- config/crd/bases/camel.apache.org_kamelets.yaml| 39 ++ deploy/crd-build.yaml | 2 +- deploy/crd-camel-catalog.yaml | 2 +- deploy/crd-integration-kit.yaml| 6 ++-- deploy/crd-integration-platform.yaml | 10 -- deploy/crd-integration.yaml| 11 -- deploy/crd-kamelet-binding.yaml| 17 +++--- deploy/crd-kamelet.yaml| 39 ++ .../builds.camel.apache.org.crd.yaml | 2 +- .../camelcatalogs.camel.apache.org.crd.yaml| 2 +- .../integrationkits.camel.apache.org.crd.yaml | 6 ++-- .../integrationplatforms.camel.apache.org.crd.yaml | 10 -- .../integrations.camel.apache.org.crd.yaml | 11 -- .../kameletbindings.camel.apache.org.crd.yaml | 17 +++--- .../kamelets.camel.apache.org.crd.yaml | 39 ++ helm/camel-k/crds/crd-build.yaml | 2 +- helm/camel-k/crds/crd-camel-catalog.yaml | 2 +- helm/camel-k/crds/crd-integration-kit.yaml | 6 ++-- helm/camel-k/crds/crd-integration-platform.yaml| 10 -- helm/camel-k/crds/crd-integration.yaml | 11 -- helm/camel-k/crds/crd-kamelet-binding.yaml | 17 +++--- helm/camel-k/crds/crd-kamelet.yaml | 39 ++ 28 files changed, 264 insertions(+), 84 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index b98271c..199ae47 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -21,7 +21,7 @@ metadata: labels: app: "camel-k" annotations: -controller-gen.kubebuilder.io/version: v0.0.0-20200528125929-5c0c6ae3b64b +controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null name: builds.camel.apache.org spec: diff --git a/config/crd/bases/camel.apache.org_camelcatalogs.yaml b/config/crd/bases/camel.apache.org_camelcatalogs.yaml index 1235c8f..9dcc268 100644 --- a/config/crd/bases/camel.apache.org_camelcatalogs.yaml +++ b/config/crd/bases/camel.apache.org_camelcatalogs.yaml @@ -21,7 +21,7 @@ metadata: labels: app: "camel-k" annotations: -controller-gen.kubebuilder.io/version: v0.0.0-20200528125929-5c0c6ae3b64b +controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null name: camelcatalogs.camel.apache.org spec: diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index d818aa3..aa4b129 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -21,7 +21,7 @@ metadata: labels: app: "camel-k" annotations: -controller-gen.kubebuilder.io/version: v0.0.0-20200528125929-5c0c6ae3b64b +controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null name: integrationkits.camel.apache.org spec: @@ -103,7 +103,9 @@ spec: description: A TraitSpec contains the configuration of a trait properties: configuration: -type: object +description: TraitConfiguration -- +format: byte +type: string required: - configuration type: object diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 8046048..bb27323 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -21,7 +21,7 @@ metadata: labels: app: "camel-k" annotations: -controller-gen.kubebuilder.io/version: v0.0.0-20200528125929-5c0c6ae3b64b +controller-gen.kubebuilder.io/version: v0.4.1 creationTimestamp: null name: integrationplatforms.camel.apache.org spec: @@ -199,7 +199,9 @@ spec: description: A TraitSpec contains the configuration of a trait
[GitHub] [camel-k] astefanutti merged pull request #1841: Upgrade controller-tools to version 0.4.1
astefanutti merged pull request #1841: URL: https://github.com/apache/camel-k/pull/1841 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti closed issue #1837: Unable to use Kamelet spec in a custom CRD
astefanutti closed issue #1837: URL: https://github.com/apache/camel-k/issues/1837 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba commented on pull request #2056: Polish how we pass -Djavax.net.ssl.trustStore to the Solr test #2029
zbendhiba commented on pull request #2056: URL: https://github.com/apache/camel-quarkus/pull/2056#issuecomment-738879650 @ppalaga For JVM, mode it looks good to me. I can't tell for native mode. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit d8efa18d0b978f644c85378c5f7ca4d5f000785c Author: Andrea Cosentino AuthorDate: Fri Dec 4 17:26:05 2020 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 0b91cfd..8483389 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -83,7 +83,7 @@ 1.4.6 1.66 2.52.0 -3.3.0 +3.4.0 5.13.2 3.1.0 0.9.5.5
[camel] 01/02: Upgrade Braintree Java to version 3.4.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit abc24efa04c0e696cfd2d1120ecf84b6ddc1aa0a Author: Andrea Cosentino AuthorDate: Fri Dec 4 17:25:13 2020 +0100 Upgrade Braintree Java to version 3.4.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d3ded93..8cc4d48 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,7 +91,7 @@ 1.4.6 1.66 2.52.0 -3.3.0 +3.4.0 5.13.2 3.1.0 0.9.5.5
[camel] branch master updated (768f36a -> d8efa18)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 768f36a Fixed build in tests jmh new abc24ef Upgrade Braintree Java to version 3.4.0 new d8efa18 Sync deps 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: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] orpiske commented on pull request #4725: Migrates camel-couchdb to the new test infra
orpiske commented on pull request #4725: URL: https://github.com/apache/camel/pull/4725#issuecomment-738872211 Likely to conflict once #4724 is merged in, but I'll keep and eye and will rebase if that's the case. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #4725: Migrates camel-couchdb to the new test infra
orpiske opened a new pull request #4725: URL: https://github.com/apache/camel/pull/4725 - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (3dd6229 -> 768f36a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 3dd6229 Sync deps add 5b82a17 CAMEL-15914: camel-csimple - Generate source code whether its a predicate or expression. add 2356f9d CAMEL-15860: Use logger instead of stdio for camel-catalog-maven. add 845cb86 CAMEL-15832: maven archetypes do not use deprecated add 346ccd8 Camel-AWS2-S3: Use default credentials Provider docs update add 47c1335 Regen docs add aaa346d Camel-AWS2-SNS: Fixed javadoc refs add a4198a92 Camel-AWS2-SNS: Regen and rebuild add ad8b27b Regen catalog add 1d7ff2a Migrates zookeeper related components to the new test-infra (#4722) add b011982 CAMEL-15815: endpoint-dsl pollEnrich/enrich to support simple expressions in context-path add 1b8f013 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721) add b5398d2 Regen add 768f36a Fixed build in tests jmh No new revisions were added by this update. Summary of changes: .../src/main/java/__name__Endpoint.java| 3 +- .../src/main/java/__name__Endpoint.java| 3 +- catalog/camel-catalog-maven/pom.xml| 5 ++ .../maven/DefaultMavenArtifactProvider.java| 14 ++-- .../camel/catalog/maven/MavenVersionManager.java | 10 ++- .../apache/camel/catalog/components/aws2-sns.json | 4 +- .../camel/catalog/docs/aws2-s3-component.adoc | 8 +- .../camel/catalog/docs/aws2-sns-component.adoc | 4 +- .../src/main/docs/aws2-s3-component.adoc | 8 +- .../apache/camel/component/aws2/sns/aws2-sns.json | 4 +- .../src/main/docs/aws2-sns-component.adoc | 4 +- .../component/aws2/sns/Sns2Configuration.java | 2 +- .../faulttolerance/FaultToleranceReifier.java | 2 +- .../component/resilience4j/ResilienceReifier.java | 2 +- components/camel-zookeeper-master/pom.xml | 18 - .../MasterEndpointFailoverTest.java| 12 +-- .../component/zookeepermaster/group/GroupTest.java | 18 ++--- .../zookeepermaster/MasterEndpointTest-context.xml | 2 +- .../MasterQuartzEndpointTest-context.xml | 2 +- components/camel-zookeeper/pom.xml | 22 +++-- .../component/zookeeper/ConsumeChildrenTest.java | 2 +- .../camel/component/zookeeper/ConsumeDataTest.java | 2 +- .../component/zookeeper/ZooKeeperContainer.java| 94 -- .../zookeeper/ZooKeeperManagedEndpointTest.java| 2 +- .../component/zookeeper/ZooKeeperProducerTest.java | 14 ++-- .../component/zookeeper/ZooKeeperTestSupport.java | 19 +++-- .../cloud/SpringZooKeeperServiceCallRouteTest.java | 20 +++-- .../cloud/ZooKeeperServiceCallRouteTest.java | 19 ++--- .../cloud/ZooKeeperServiceDiscoveryTest.java | 15 ++-- .../ZooKeeperServiceRegistrationTestBase.java | 2 +- .../ZooKeeperClusteredRoutePolicyFactoryTest.java | 36 - .../cluster/ZooKeeperClusteredRoutePolicyTest.java | 36 - .../zookeeper/cluster/ZooKeeperMasterTest.java | 36 - .../cloud/SpringZooKeeperServiceCallRouteTest.xml | 2 +- ...ingZooKeeperClusteredRouteConfigurationTest.xml | 2 +- .../dsl/Aws2SnsComponentBuilderFactory.java| 2 +- .../language/csimple/CSimpleCodeGenerator.java | 6 ++ .../camel/language/csimple/CSimpleExpression.java | 5 ++ .../camel/language/csimple/CSimpleLanguage.java| 50 ++-- .../apache/camel/model/ProcessorDefinition.java| 19 ++--- .../camel/language/csimple/HighPredicate.java | 5 ++ .../camel/language/csimple/MedPredicate.java | 5 ++ .../endpoint/dsl/Sns2EndpointBuilderFactory.java | 4 +- .../endpoint/SedaEnrichSimpleExpressionTest.java | 48 +++ .../SedaPollEnrichSimpleExpressionTest.java| 46 +++ .../modules/ROOT/pages/aws2-s3-component.adoc | 8 +- .../modules/ROOT/pages/aws2-sns-component.adoc | 4 +- test-infra/camel-test-infra-zookeeper/pom.xml | 60 ++ .../src/main/resources/META-INF/MANIFEST.MF| 0 .../zookeeper/common/ZooKeeperProperties.java | 25 +- .../zookeeper/services/ZooKeeperContainer.java | 21 ++--- .../services/ZooKeeperLocalContainerService.java | 72 + .../zookeeper/services/ZooKeeperRemoteService.java | 37 + .../infra/zookeeper/services/ZooKeeperService.java | 32 .../services/ZooKeeperServiceFactory.java | 43 ++ test-infra/pom.xml | 1 + .../org/apache/camel/itest/jmh/CSimpleScript1.java | 5 ++ .../org/apache/camel/itest/jmh/CSimpleScript2.java | 5 ++ .../org/apache/camel/itest/jmh/CSimpleScript3.java | 5 ++ 59 files changed, 580 insertions(+), 376 deletions(-) delete mode 100644
[camel] branch master updated (1b8f013 -> 768f36a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 1b8f013 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721) new b5398d2 Regen new 768f36a Fixed build in tests jmh 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: .../camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java | 2 +- .../src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java | 5 + .../src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java | 5 + .../src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java | 5 + 4 files changed, 16 insertions(+), 1 deletion(-)
[camel] 01/02: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b5398d24f517313f791fd79e86dc5b42ea6a8f3c
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 16:06:37 2020 +0100
Regen
---
.../apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java
index cc67510..964bbfe 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java
@@ -31,7 +31,7 @@ public class SedaEnrichSimpleExpressionTest extends
CamelTestSupport {
from(direct("start")).enrich(seda("${exchangeProperty.whereTo}").offerTimeout(1000)).to("mock:result");
from("seda:cheese")
-.transform().constant("Hello World");
+.transform().constant("Hello World");
}
};
}
[camel] 02/02: Fixed build in tests jmh
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 768f36a123ea7d2e741950520a61a194c4c0e9c7
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 16:23:05 2020 +0100
Fixed build in tests jmh
---
.../src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java | 5 +
.../src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java | 5 +
.../src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java | 5 +
3 files changed, 15 insertions(+)
diff --git
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java
index 2ef4440..3f3751f 100644
---
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java
+++
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript1.java
@@ -40,4 +40,9 @@ public class CSimpleScript1 extends CSimpleSupport {
return headerAs(message, "gold", int.class) == 123;
}
+@Override
+public boolean isPredicate() {
+return true;
+}
+
}
diff --git
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java
index 9d0305a..f5ad940 100644
---
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java
+++
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript2.java
@@ -40,4 +40,9 @@ public class CSimpleScript2 extends CSimpleSupport {
return headerAs(message, "gold", int.class) > 123;
}
+@Override
+public boolean isPredicate() {
+return true;
+}
+
}
diff --git
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java
index 82f4dd9..c8d559b 100644
---
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java
+++
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CSimpleScript3.java
@@ -40,4 +40,9 @@ public class CSimpleScript3 extends CSimpleSupport {
return headerAs(message, "gold", int.class) < 123;
}
+@Override
+public boolean isPredicate() {
+return true;
+}
+
}
[GitHub] [camel] jamesnetherton commented on a change in pull request #4723: CAMEL-15510: Add camel-vertx-kafka component
jamesnetherton commented on a change in pull request #4723:
URL: https://github.com/apache/camel/pull/4723#discussion_r536161246
##
File path:
components/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaComponent.java
##
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.vertx.kafka;
+
+import java.util.Map;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import
org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.annotations.Component;
+import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.PropertiesHelper;
+
+@Component("vertx-kafka")
+public class VertxKafkaComponent extends DefaultComponent {
+
+@Metadata
+private VertxKafkaConfiguration configuration = new
VertxKafkaConfiguration();
+
+@Metadata(label = "advanced", autowired = true)
+private Vertx vertx;
+@Metadata(label = "advanced")
+private VertxOptions vertxOptions;
+
+public VertxKafkaComponent() {
+}
+
+public VertxKafkaComponent(CamelContext context) {
+super(context);
+}
+
+@Override
+protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
+
+if (ObjectHelper.isEmpty(remaining)) {
+throw new IllegalArgumentException("Topic must be configured on
endpoint using syntax kafka:topic");
+}
+
+final VertxKafkaConfiguration configuration
+= this.configuration != null ? this.configuration.copy() : new
VertxKafkaConfiguration();
+
+configuration.setTopic(remaining);
+
+final VertxKafkaEndpoint endpoint = new VertxKafkaEndpoint(uri, this,
configuration);
+
+// extract the additional properties map
+if (PropertiesHelper.hasProperties(parameters,
"additionalProperties.")) {
+final Map additionalProperties =
endpoint.getConfiguration().getAdditionalProperties();
+
+// add and overwrite additional properties from endpoint to
+// pre-configured properties
+
additionalProperties.putAll(PropertiesHelper.extractProperties(parameters,
"additionalProperties."));
+}
+
+setProperties(endpoint, parameters);
+
+validateConfigurations(configuration);
+
+return endpoint;
+}
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+
+if (vertx == null) {
+if (vertxOptions != null) {
+vertx = Vertx.vertx(vertxOptions);
+} else {
+vertx = Vertx.vertx();
+}
+}
+}
+
+@Override
+protected void doStop() throws Exception {
+if (vertx != null) {
+vertx.close();
+}
+vertx = null;
Review comment:
Might be better to do like
[`VertxComponent.doStop()`](https://github.com/apache/camel/blob/master/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java#L201-L209)
and handle the case where the Vert.x instance was provided by the user. In
that scenario you probably don't want to clean it up as there may be other
things that depend on it.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new issue #2057: Use WireMock for BigQuery integration tests
jamesnetherton opened a new issue #2057: URL: https://github.com/apache/camel-quarkus/issues/2057 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch camel-master updated: BigQuery native support
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-master by this push:
new c03848b BigQuery native support
c03848b is described below
commit c03848b68b1bce4f17ea7aa7323c41d02d5377fe
Author: James Netherton
AuthorDate: Fri Dec 4 12:08:28 2020 +
BigQuery native support
Fixes #2014
---
.../reference/extensions/google-bigquery.adoc | 19 +++-
.../reference/components/google-bigquery-sql.adoc | 6 +-
.../reference/components/google-bigquery.adoc | 6 +-
.../google-bigquery/integration-test/pom.xml | 66 -
.../google/bigquery/it/GoogleBigqueryResource.java | 64 -
extensions-jvm/pom.xml | 1 -
.../google-bigquery/deployment/pom.xml | 4 +
.../deployment/GoogleBigqueryProcessor.java| 26 +++--
.../google-bigquery/pom.xml| 1 -
.../google-bigquery/runtime/pom.xml| 6 +-
.../runtime/src/main/doc/usage.adoc| 7 ++
.../GoogleBigQueryConnectionFactoryProducer.java | 38
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
extensions/pom.xml | 1 +
integration-tests/google-bigquery/README.adoc | 16
.../{jsonb => google-bigquery}/pom.xml | 64 ++---
.../google/bigquery/it/GoogleBigqueryResource.java | 105 +
.../src/main/resources/application.properties | 19
.../google/bigquery/it/GoogleBigqueryIT.java | 26 +
.../google/bigquery/it/GoogleBigqueryTest.java | 75 +++
integration-tests/jsonb/pom.xml| 13 +++
integration-tests/pom.xml | 1 +
pom.xml| 2 +-
poms/bom/pom.xml | 20
tooling/scripts/test-categories.yaml | 1 +
25 files changed, 333 insertions(+), 257 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
b/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
index ef9f559..1814f64 100644
--- a/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/google-bigquery.adoc
@@ -3,15 +3,15 @@
= Google BigQuery
:page-aliases: extensions/google-bigquery.adoc
:cq-artifact-id: camel-quarkus-google-bigquery
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
:cq-description: Access Google Cloud BigQuery service using SQL queries or
Google Client Services API
:cq-deprecated: false
:cq-jvm-since: 1.0.0
-:cq-native-since: 1.0.0
+:cq-native-since: 1.5.0
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.0.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.5.0##
Access Google Cloud BigQuery service using SQL queries or Google Client
Services API
@@ -33,3 +33,14 @@ Please refer to the above links for usage and configuration
details.
Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+
+== Usage
+
+This extension leverages the Quarkiverse Google Cloud Services extension. The
https://github.com/quarkiverse/quarkiverse-google-cloud-services[documentation]
describes
+how to configure authentication for Google cloud services.
+
+For convenience, a `GoogleBigQueryConnectionFactory` for use by the
`google-bigquery` & `google-bigquery-sql` component is automatically configured.
+
+If you want to read SQL scripts from the classpath with `google-bigquery-sql`
in native mode, then you will need to ensure that they are added to the native
image via
+the `quarkus.camel.native.resources.include-patterns` configuration property.
+
diff --git
a/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
b/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
index c20fa09..8330f83 100644
--- a/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
+++ b/docs/modules/ROOT/partials/reference/components/google-bigquery-sql.adoc
@@ -2,11 +2,11 @@
// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
:cq-artifact-id: camel-quarkus-google-bigquery
:cq-artifact-id-base: google-bigquery
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
:cq-deprecated: false
:cq-jvm-since: 1.0.0
-:cq-native-since: 1.0.0
+:cq-native-since: 1.5.0
:cq-camel-part-name: google-bigquery-sql
:cq-camel-part-title: Google BigQuery Standard SQL
:cq-camel-part-description: Access Google Cloud BigQuery
[GitHub] [camel-quarkus] jamesnetherton merged pull request #2055: BigQuery native support
jamesnetherton merged pull request #2055: URL: https://github.com/apache/camel-quarkus/pull/2055 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 1b8f013 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721) 1b8f013 is described below commit 1b8f013acbf1a143612717ee70178d23bbd739dc Author: Liroyd AuthorDate: Fri Dec 4 16:52:32 2020 +0200 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4721) Support property placeholder for ResilienceReifier and FaultToleranceReifier circuit breaker configurationRef in routes definitions --- .../component/microprofile/faulttolerance/FaultToleranceReifier.java| 2 +- .../java/org/apache/camel/component/resilience4j/ResilienceReifier.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java index 338a373..ee7411d 100644 --- a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java +++ b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java @@ -148,7 +148,7 @@ public class FaultToleranceReifier extends ProcessorReifier camelContext.getExtension(Model.class).getFaultToleranceConfiguration(ref), diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java index 1782d16..76c9597 100644 --- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java +++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java @@ -180,7 +180,7 @@ public class ResilienceReifier extends ProcessorReifier camelContext.getExtension(Model.class).getResilience4jConfiguration(ref),
[GitHub] [camel] davsclaus merged pull request #4721: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
davsclaus merged pull request #4721: URL: https://github.com/apache/camel/pull/4721 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] apupier commented on pull request #502: Provide relative link for Camel webiste
apupier commented on pull request #502: URL: https://github.com/apache/camel-website/pull/502#issuecomment-738826777 > If you're having issues building/running checks I would like to hear about them, perhaps we're missing something in the docs or have an issue other contributors might encounter, so I'd like to fix that. tried again by reading more closely the readme, working fine. I upgraded my node version so maybe it was the reason. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.4.x updated: CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4720)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.4.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.4.x by this push: new a1a63d1 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4720) a1a63d1 is described below commit a1a63d16dd8d2ae45142170b71a80019ddc44e65 Author: Liroyd AuthorDate: Fri Dec 4 16:52:07 2020 +0200 CAMEL-15917: Resilience4j Property Component doesn't work for configurationRef (#4720) Support property placeholder for ResilienceReifier and FaultToleranceReifier circuit breaker configurationRef in routes definitions --- .../component/microprofile/faulttolerance/FaultToleranceReifier.java| 2 +- .../java/org/apache/camel/component/resilience4j/ResilienceReifier.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java index 5facf3f..2f347af 100644 --- a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java +++ b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java @@ -146,7 +146,7 @@ public class FaultToleranceReifier extends ProcessorReifier camelContext.getExtension(Model.class).getFaultToleranceConfiguration(ref), diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java index 2ddcc62..9c117f7 100644 --- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java +++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java @@ -176,7 +176,7 @@ public class ResilienceReifier extends ProcessorReifier camelContext.getExtension(Model.class).getResilience4jConfiguration(ref),
[GitHub] [camel] davsclaus merged pull request #4720: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
davsclaus merged pull request #4720: URL: https://github.com/apache/camel/pull/4720 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga opened a new pull request #2056: Polish how we pass -Djavax.net.ssl.trustStore to the Solr test #2029
ppalaga opened a new pull request #2056: URL: https://github.com/apache/camel-quarkus/pull/2056 Could you please review, @zbendhiba ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: CAMEL-15815: endpoint-dsl pollEnrich/enrich to support simple expressions in context-path
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b011982 CAMEL-15815: endpoint-dsl pollEnrich/enrich to support simple
expressions in context-path
b011982 is described below
commit b011982691307f68b63ac4d9704ef1e0707ccce3
Author: Claus Ibsen
AuthorDate: Fri Dec 4 13:33:04 2020 +0100
CAMEL-15815: endpoint-dsl pollEnrich/enrich to support simple expressions
in context-path
---
.../apache/camel/model/ProcessorDefinition.java| 19 -
.../endpoint/SedaEnrichSimpleExpressionTest.java | 48 ++
.../SedaPollEnrichSimpleExpressionTest.java| 46 +
3 files changed, 101 insertions(+), 12 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 2bb5f2c..73413f8 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -1305,7 +1305,7 @@ public abstract class ProcessorDefinition
/**
* Creates a log message to be logged at INFO level.
*
- * @param message the log message, (you can use {@link
org.apache.camel.language.simple.SimpleLanguage} syntax)
+ * @param message the log message (you can use simple language syntax)
* @return the builder
*/
public Type log(String message) {
@@ -1318,8 +1318,7 @@ public abstract class ProcessorDefinition
* Creates a log message to be logged at the given level.
*
* @param loggingLevel the logging level to use
- * @param message the log message, (you can use {@link
org.apache.camel.language.simple.SimpleLanguage}
- * syntax)
+ * @param message the log message (you can use simple language
syntax)
* @return the builder
*/
public Type log(LoggingLevel loggingLevel, String message) {
@@ -1334,8 +1333,7 @@ public abstract class ProcessorDefinition
*
* @param loggingLevel the logging level to use
* @param logName the log name to use
- * @param message the log message, (you can use {@link
org.apache.camel.language.simple.SimpleLanguage}
- * syntax)
+ * @param message the log message (you can use simple language
syntax)
* @return the builder
*/
public Type log(LoggingLevel loggingLevel, String logName, String message)
{
@@ -1351,8 +1349,7 @@ public abstract class ProcessorDefinition
*
* @param loggingLevel the logging level to use
* @param logger the logger to use
- * @param message the log message, (you can use {@link
org.apache.camel.language.simple.SimpleLanguage}
- * syntax)
+ * @param message the log message (you can use simple language
syntax)
* @return the builder
*/
public Type log(LoggingLevel loggingLevel, Logger logger, String message) {
@@ -1369,8 +1366,7 @@ public abstract class ProcessorDefinition
* @param loggingLevel the logging level to use
* @param logName the log name to use
* @param marker log marker name
- * @param message the log message, (you can use {@link
org.apache.camel.language.simple.SimpleLanguage}
- * syntax)
+ * @param message the log message (you can use simple language
syntax)
* @return the builder
*/
public Type log(LoggingLevel loggingLevel, String logName, String marker,
String message) {
@@ -1388,8 +1384,7 @@ public abstract class ProcessorDefinition
* @param loggingLevel the logging level to use
* @param logger the logger to use
* @param marker log marker name
- * @param message the log message, (you can use {@link
org.apache.camel.language.simple.SimpleLanguage}
- * syntax)
+ * @param message the log message (you can use simple language
syntax)
* @return the builder
*/
public Type log(LoggingLevel loggingLevel, Logger logger, String marker,
String message) {
@@ -3182,7 +3177,7 @@ public abstract class ProcessorDefinition
* @seeorg.apache.camel.processor.PollEnricher
*/
public Type pollEnrich(EndpointProducerBuilder resourceUri) {
-return pollEnrich(resourceUri.getUri());
+return pollEnrich(resourceUri.expr(), -1, (String) null, false);
}
/**
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java
[GitHub] [camel-k] astefanutti edited a comment on pull request #1841: Upgrade controller-tools to version 0.4.1
astefanutti edited a comment on pull request #1841: URL: https://github.com/apache/camel-k/pull/1841#issuecomment-738819343 > Travis CI is taking ages, do we still need it ? The Travis CI job executes the common test suite on OpenShift 3.11. It should be easy to run the suite as part of the tests executed by the GitHub actions OpenShift workflow, and get rid of Travis CI. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on pull request #1841: Upgrade controller-tools to version 0.4.1
astefanutti commented on pull request #1841: URL: https://github.com/apache/camel-k/pull/1841#issuecomment-738819343 > Travis CI is taking ages, do we still need it ? The Travis CI job executes the common test suite on OpenShift 3.11. It should be easy to run the suite as part of the tests executed by the GitHub actions OpenShift workflow. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] lburgazzoli commented on pull request #1841: Upgrade controller-tools to version 0.4.1
lburgazzoli commented on pull request #1841: URL: https://github.com/apache/camel-k/pull/1841#issuecomment-738813851 Travis CI is taking ages, do we still need it ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #4724: Migrates camel-pg-replication-slot to the new test infra
orpiske opened a new pull request #4724: URL: https://github.com/apache/camel/pull/4724 - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new issue #763: Add a removeHeaders option on both source and sink
oscerd opened a new issue #763: URL: https://github.com/apache/camel-kafka-connector/issues/763 It could be splitted in to two different option includePattern and excludePattern. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] nicolaferraro closed issue #1654: Enable SinkBinding automatically
nicolaferraro closed issue #1654: URL: https://github.com/apache/camel-k/issues/1654 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 01/02: Fix #1654: enable sinkbinding automatically
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 787f97ef986ddb8c9af73b0650814ec029fbc3b5
Author: nicolaferraro
AuthorDate: Fri Nov 27 16:01:52 2020 +0100
Fix #1654: enable sinkbinding automatically
---
deploy/traits.yaml | 2 +-
.../attachments/schema/integration-schema.json | 10 +
docs/modules/traits/pages/knative.adoc | 3 ++-
pkg/trait/knative.go | 24 +-
pkg/util/bindings/bindings_test.go | 9
pkg/util/bindings/knative_ref.go | 24 +-
6 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/deploy/traits.yaml b/deploy/traits.yaml
index 9797ee1..46b0785 100755
--- a/deploy/traits.yaml
+++ b/deploy/traits.yaml
@@ -401,7 +401,7 @@ traits:
description: Enables Knative CamelSource pre 0.15 compatibility fixes
(will be removed in future versions).
- name: sink-binding
type: bool
-description: Allows binding the integration to a sink via a Knative
SinkBinding resource.This can be used when the integration targets a single
sink.It's disabled by default.
+description: Allows binding the integration to a sink via a Knative
SinkBinding resource.This can be used when the integration targets a single
sink.It's enabled by default when the integration targets a single sink(except
when the integration is owned by a Knative source).
- name: auto
type: bool
description: Enable automatic discovery of all trait properties.
diff --git
a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
b/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
index 76c8fa9..1a0ffde 100644
--- a/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
+++ b/docs/modules/ROOT/assets/attachments/schema/integration-schema.json
@@ -8502,6 +8502,11 @@
"items": {
"description": "IntegrationCondition describes the state of a
resource at a certain point.",
"properties": {
+ "firstTruthyTime": {
+"description": "First time the condition status transitioned
to True.",
+"format": "date-time",
+"type": "string"
+ },
"lastTransitionTime": {
"description": "Last time the condition transitioned from one
status to another.",
"format": "date-time",
@@ -8690,6 +8695,11 @@
"kit": {
"type": "string"
},
+"lastInitTimestamp": {
+ "description": "The timestamp representing the last time when this
integration was initialized.",
+ "format": "date-time",
+ "type": "string"
+},
"phase": {
"description": "IntegrationPhase --",
"type": "string"
diff --git a/docs/modules/traits/pages/knative.adoc
b/docs/modules/traits/pages/knative.adoc
index 304ed7b..6660115 100755
--- a/docs/modules/traits/pages/knative.adoc
+++ b/docs/modules/traits/pages/knative.adoc
@@ -77,7 +77,8 @@ listening from more than 1 channel.
| bool
| Allows binding the integration to a sink via a Knative SinkBinding resource.
This can be used when the integration targets a single sink.
-It's disabled by default.
+It's enabled by default when the integration targets a single sink
+(except when the integration is owned by a Knative source).
| knative.auto
| bool
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index 32df45f..c3c06e8 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -77,7 +77,8 @@ type knativeTrait struct {
CamelSourceCompat *bool `property:"camel-source-compat"
json:"camelSourceCompat,omitempty"`
// Allows binding the integration to a sink via a Knative SinkBinding
resource.
// This can be used when the integration targets a single sink.
- // It's disabled by default.
+ // It's enabled by default when the integration targets a single sink
+ // (except when the integration is owned by a Knative source).
SinkBinding *bool `property:"sink-binding" json:"sinkBinding,omitempty"`
// Enable automatic discovery of all trait properties.
Auto *bool `property:"auto" json:"auto,omitempty"`
@@ -195,6 +196,10 @@ func (t *knativeTrait) Configure(e *Environment) (bool,
error) {
filter := true
t.FilterSourceChannels =
}
+ if t.SinkBinding == nil {
+ allowed := t.isSinkBindingAllowed(e)
+ t.SinkBinding =
+ }
}
return true, nil
@@ -454,6 +459,23 @@ func (t *knativeTrait) configureEvents(e *Environment, env
*knativeapi.CamelEnvi
return nil
}
+func (t *knativeTrait) isSinkBindingAllowed(e
[camel-k] 02/02: Fix #1654: disable sinkbinding in kameletbinding explicit uri
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 55ce3578b3bfb79a89ee5322a6e56d6459127cc4
Author: nicolaferraro
AuthorDate: Wed Dec 2 11:58:49 2020 +0100
Fix #1654: disable sinkbinding in kameletbinding explicit uri
---
deploy/resources.go | 4 ++--
e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml | 2 +-
e2e/yaks/common/kamelet-binding/messages-channel.yaml | 2 +-
e2e/yaks/common/kamelet-binding/timer-source-binding.yaml | 2 +-
e2e/yaks/common/knative-sinkbinding/messages-channel.yaml | 2 +-
e2e/yaks/common/knative-sinkbinding/source.yaml | 2 +-
pkg/util/bindings/bindings_test.go| 1 +
pkg/util/bindings/knative_uri.go | 1 +
8 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index a67c4fb..1056ca3 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -340,9 +340,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": Ű°CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 33738,
+ uncompressedSize: 33838,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x6f\xdc\xb6\xd6\xe0\xf7\xfe\x0a\xc2\xbb\x80\x3d\xc6\x48\x76\x7a\xd1\xdb\x5e\xef\x76\x0b\x37\x49\xef\x75\xda\x24\xde\x38\x6d\x77\xd1\xbd\xb8\xc3\x91\xce\xcc\x30\xa6\x48\x3d\x24\x35\xce\x74\xb1\xff\x7d\xc1\xc3\x57\x69\x64\x5b\x4e\xe3\xc2\x17\x78\x90\x0f\xb1\xc7\x12\x79\x78\x78\xde\xdf\xc6\x28\xca\x8c\x3e\xfb\xa2\x20\x82\x36\x70\x46\xe8\x6a\xc5\x04\x33\xbb\x2f\x08\x69\x39\x35\x2b\xa9\x9a\x33\xb2\xa2\x5c\x83\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x6f\x1c\x37\xd2\xe0\xf7\xfc\x0a\x42\x77\x80\x34\xc2\x74\x4b\xce\x22\x9b\xac\xee\x72\x81\x62\x3b\xbb\x72\x62\x5b\x67\x39\xc9\x1d\x72\x8b\x1d\x4e\x77\xcd\x0c\x2d\x36\xd9\x0f\xc9\x1e\x79\x72\xb8\xff\x7e\x60\xf1\xb5\x7b\x5a\x52\xcb\xb1\x02\x2d\xf0\xc0\x1f\x2c\x8d\xba\x8b\xc5\x62\xbd\xbf\x70\x8c\xa2\xcc\xe8\xb3\x2f\x0a\x22\x68\x03\x67\x84\xae\x56\x4c\x30\xb3\xfb\x82\x90\x96\x53\xb3\x92\xaa\x39\x23\x2b\xca\x35\x
[...]
},
"/user-cluster-role.yaml": Ű°CompressedFileInfo{
name: "user-cluster-role.yaml",
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index 72f2e8e..237f8ca 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
@@ -23,7 +23,7 @@ spec:
source:
ref:
kind: InMemoryChannel
- apiVersion: messaging.knative.dev/v1beta1
+ apiVersion: messaging.knative.dev/v1
name: messages
sink:
ref:
diff --git a/e2e/yaks/common/kamelet-binding/messages-channel.yaml
b/e2e/yaks/common/kamelet-binding/messages-channel.yaml
index abd3483..c67517d 100644
--- a/e2e/yaks/common/kamelet-binding/messages-channel.yaml
+++ b/e2e/yaks/common/kamelet-binding/messages-channel.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---
-apiVersion: messaging.knative.dev/v1beta1
+apiVersion: messaging.knative.dev/v1
kind: InMemoryChannel
metadata:
name: messages
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index a47fdf6..536e632 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
@@ -31,5 +31,5 @@ spec:
sink:
ref:
kind: InMemoryChannel
- apiVersion: messaging.knative.dev/v1beta1
+ apiVersion: messaging.knative.dev/v1
name: messages
diff --git a/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
b/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
index abd3483..c67517d 100644
--- a/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---
-apiVersion: messaging.knative.dev/v1beta1
+apiVersion: messaging.knative.dev/v1
kind: InMemoryChannel
metadata:
name: messages
diff --git a/e2e/yaks/common/knative-sinkbinding/source.yaml
b/e2e/yaks/common/knative-sinkbinding/source.yaml
index 3e5179b..9ec23fa 100644
--- a/e2e/yaks/common/knative-sinkbinding/source.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/source.yaml
@@ -25,4 +25,4 @@
- transform:
simple: "${body.toUpperCase()}"
-
[GitHub] [camel-k] nicolaferraro merged pull request #1832: Fix #1654: enable sinkbinding automatically
nicolaferraro merged pull request #1832: URL: https://github.com/apache/camel-k/pull/1832 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch master updated (6a36e54 -> 55ce357)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 6a36e54 fix: Fix kamelet.feature for YAKS version 0.1.0 new 787f97e Fix #1654: enable sinkbinding automatically new 55ce357 Fix #1654: disable sinkbinding in kameletbinding explicit uri 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: deploy/resources.go| 4 ++-- deploy/traits.yaml | 2 +- .../attachments/schema/integration-schema.json | 10 + docs/modules/traits/pages/knative.adoc | 3 ++- .../kamelet-binding/logger-sink-binding.yaml | 2 +- .../common/kamelet-binding/messages-channel.yaml | 2 +- .../kamelet-binding/timer-source-binding.yaml | 2 +- .../knative-sinkbinding/messages-channel.yaml | 2 +- e2e/yaks/common/knative-sinkbinding/source.yaml| 2 +- pkg/trait/knative.go | 24 +- pkg/util/bindings/bindings_test.go | 10 + pkg/util/bindings/knative_ref.go | 24 +- pkg/util/bindings/knative_uri.go | 1 + 13 files changed, 46 insertions(+), 42 deletions(-)
[camel] branch master updated: Migrates zookeeper related components to the new test-infra (#4722)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1d7ff2a Migrates zookeeper related components to the new test-infra
(#4722)
1d7ff2a is described below
commit 1d7ff2a489d0db24df86ef60b0bdeec4c5e7e4f7
Author: Otavio Rodolfo Piske
AuthorDate: Fri Dec 4 14:23:12 2020 +0100
Migrates zookeeper related components to the new test-infra (#4722)
Includes:
- camel-zookeeper
- camel-zookeeper-master
---
components/camel-zookeeper-master/pom.xml | 18 -
.../MasterEndpointFailoverTest.java| 12 +--
.../component/zookeepermaster/group/GroupTest.java | 18 ++---
.../zookeepermaster/MasterEndpointTest-context.xml | 2 +-
.../MasterQuartzEndpointTest-context.xml | 2 +-
components/camel-zookeeper/pom.xml | 22 +++--
.../component/zookeeper/ConsumeChildrenTest.java | 2 +-
.../camel/component/zookeeper/ConsumeDataTest.java | 2 +-
.../component/zookeeper/ZooKeeperContainer.java| 94 --
.../zookeeper/ZooKeeperManagedEndpointTest.java| 2 +-
.../component/zookeeper/ZooKeeperProducerTest.java | 14 ++--
.../component/zookeeper/ZooKeeperTestSupport.java | 19 +++--
.../cloud/SpringZooKeeperServiceCallRouteTest.java | 20 +++--
.../cloud/ZooKeeperServiceCallRouteTest.java | 19 ++---
.../cloud/ZooKeeperServiceDiscoveryTest.java | 15 ++--
.../ZooKeeperServiceRegistrationTestBase.java | 2 +-
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 36 -
.../cluster/ZooKeeperClusteredRoutePolicyTest.java | 36 -
.../zookeeper/cluster/ZooKeeperMasterTest.java | 36 -
.../cloud/SpringZooKeeperServiceCallRouteTest.xml | 2 +-
...ingZooKeeperClusteredRouteConfigurationTest.xml | 2 +-
test-infra/camel-test-infra-zookeeper/pom.xml | 60 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../zookeeper/common/ZooKeeperProperties.java | 26 ++
.../zookeeper/services/ZooKeeperContainer.java | 21 ++---
.../services/ZooKeeperLocalContainerService.java | 72 +
.../zookeeper/services/ZooKeeperRemoteService.java | 42 ++
.../infra/zookeeper/services/ZooKeeperService.java | 39 +
.../services/ZooKeeperServiceFactory.java | 43 ++
test-infra/pom.xml | 1 +
30 files changed, 434 insertions(+), 245 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml
b/components/camel-zookeeper-master/pom.xml
index 38c82bd..4615903 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -136,16 +136,26 @@
test
-
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+
org.apache.camel
-camel-testcontainers-spring
+camel-test-infra-common
+${project.version}
+test-jar
test
-org.apache.logging.log4j
-log4j-slf4j-impl
+org.apache.camel
+camel-test-infra-zookeeper
+${project.version}
+test-jar
test
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
index 49e7106..367a90b 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
@@ -24,14 +24,20 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
+import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService;
+import org.apache.camel.test.infra.zookeeper.services.ZooKeeperServiceFactory;
import org.apache.curator.framework.CuratorFramework;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MasterEndpointFailoverTest {
+@RegisterExtension
+static ZooKeeperService service = ZooKeeperServiceFactory.createService();
+
private static final transient Logger LOG =
LoggerFactory.getLogger(MasterEndpointFailoverTest.class);
protected ProducerTemplate template;
@@ -41,15 +47,12 @@ public class
[GitHub] [camel] orpiske merged pull request #4722: Migrates zookeeper related components to the new test-infra
orpiske merged pull request #4722: URL: https://github.com/apache/camel/pull/4722 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] Liroyd commented on pull request #4721: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
Liroyd commented on pull request #4721: URL: https://github.com/apache/camel/pull/4721#issuecomment-738776994 Made similar update based on review from https://github.com/apache/camel/pull/4720 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] Liroyd commented on pull request #4720: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
Liroyd commented on pull request #4720: URL: https://github.com/apache/camel/pull/4720#issuecomment-738772640 Please check updated review This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] omarsmak opened a new pull request #4723: CAMEL-15510: Add camel-vertx-kafka component
omarsmak opened a new pull request #4723: URL: https://github.com/apache/camel/pull/4723 This is pretty huge PR but I can summarise here , this PR will the component of camel-vertx-kafka to Camel, it includes the following: - A maven plugin that will generate the component configuration from Kafka Consumer/Producer similar to camel-debezium. Later, I am planning as well to use this plugin to generate the configurations for camel-kafka. This plugin is highly customizable with many options that allows to be adopted it easily to camel-kafka. - The component itself, based on Vert.x client for Kafka that supports full async operations, coupled with Mono and Flux just to minimize the callbacks (not necessary) though. In vertx 4.0 (still beta) it uses Future instead of callback, however the work should't be large, with Flux/Mono could easily wrapped. - The component doesnt yet support manual commit offsets, storing offsets to be committed but it can be added later. - The ensure the consistently functionality, I have used the integration tests and unit tests of camel-kafka to test this component (with small modifications specific to the component). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request #2055: BigQuery native support
jamesnetherton opened a new pull request #2055: URL: https://github.com/apache/camel-quarkus/pull/2055 I wanted to use WireMock to stub out the BigQuery API interactions, but I hit some issues, so I've abandoned it for now. I'll follow up with an issue to look into it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 03/03: Regen catalog
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ad8b27b83b44986bbb4e9bbfbb8e2858852ae7fd
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 13:34:30 2020 +0100
Regen catalog
---
.../resources/org/apache/camel/catalog/components/aws2-sns.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
index 0443756..b3a880c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
@@ -40,7 +40,7 @@
"subject": { "kind": "property", "displayName": "Subject", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "The subject which is
used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "property", "displayName": "Subscribe SNSto
SQS", "group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Define if the subscription between SNS Topic
and SQS must be done or not" },
"trustAllCertificates": { "kind": "property", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
-"useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "Set whether the SQS
client should expect to load credentials on an AWS i [...]
+"useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "Set whether the SNS
client should expect to load credentials on an AWS i [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
@@ -65,7 +65,7 @@
"subject": { "kind": "parameter", "displayName": "Subject", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField":
[camel] 01/03: Camel-AWS2-SNS: Fixed javadoc refs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aaa346d595c9f227c7250b5b0932e479007924da
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 13:26:25 2020 +0100
Camel-AWS2-SNS: Fixed javadoc refs
---
.../java/org/apache/camel/component/aws2/sns/Sns2Configuration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
index e0fd80d..78a0822 100644
---
a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
+++
b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Configuration.java
@@ -277,7 +277,7 @@ public class Sns2Configuration implements Cloneable {
}
/**
- * Set whether the SQS client should expect to load credentials on an AWS
infra instance or to expect static
+ * Set whether the SNS client should expect to load credentials on an AWS
infra instance or to expect static
* credentials to be passed in.
*/
public void setUseDefaultCredentialsProvider(boolean
useDefaultCredentialsProvider) {
[camel] 02/03: Camel-AWS2-SNS: Regen and rebuild
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a4198a9259168e236ef9a91c6d49ede3df7a56a0
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 13:27:53 2020 +0100
Camel-AWS2-SNS: Regen and rebuild
---
.../resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc | 4 ++--
.../resources/org/apache/camel/component/aws2/sns/aws2-sns.json | 4 ++--
components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 4 ++--
.../camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java | 2 +-
.../apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java | 4 ++--
docs/components/modules/ROOT/pages/aws2-sns-component.adoc| 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
index 0e34990..cee68a0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc
@@ -70,7 +70,7 @@ The AWS 2 Simple Notification System (SNS) component supports
22 options, which
| *subject* (producer) | The subject which is used if the message header
'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS
Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
-| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client
should expect to load credentials on an AWS infra instance or to expect static
credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SNS client
should expect to load credentials on an AWS infra instance or to expect static
credentials to be passed in. | false | boolean
| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used
for automatic autowiring options (the option must be marked as autowired) by
looking up in the registry to find if there is a single instance of matching
type, which then gets configured on the component. This can be used for
automatic configuring JDBC data sources, JMS connection factories, AWS Clients,
etc. | true | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
@@ -124,7 +124,7 @@ with the following path and query parameters:
| *subject* (producer) | The subject which is used if the message header
'CamelAwsSnsSubject' is not present. | | String
| *subscribeSNStoSQS* (producer) | Define if the subscription between SNS
Topic and SQS must be done or not | false | boolean
| *trustAllCertificates* (producer) | If we want to trust all certificates in
case of overriding the endpoint | false | boolean
-| *useDefaultCredentialsProvider* (producer) | Set whether the SQS client
should expect to load credentials on an AWS infra instance or to expect static
credentials to be passed in. | false | boolean
+| *useDefaultCredentialsProvider* (producer) | Set whether the SNS client
should expect to load credentials on an AWS infra instance or to expect static
credentials to be passed in. | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
diff --git
a/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
b/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
index 0443756..b3a880c 100644
---
a/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
+++
b/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
@@ -40,7 +40,7 @@
"subject": { "kind": "property", "displayName": "Subject", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "The subject which is
used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "property", "displayName": "Subscribe SNSto
SQS", "group": "producer", "label": "", "required": false, "type": "boolean",
[camel] branch master updated (47c1335 -> ad8b27b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 47c1335 Regen docs new aaa346d Camel-AWS2-SNS: Fixed javadoc refs new a4198a92 Camel-AWS2-SNS: Regen and rebuild new ad8b27b Regen catalog 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: .../resources/org/apache/camel/catalog/components/aws2-sns.json | 4 ++-- .../resources/org/apache/camel/catalog/docs/aws2-sns-component.adoc | 4 ++-- .../resources/org/apache/camel/component/aws2/sns/aws2-sns.json | 4 ++-- components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 4 ++-- .../java/org/apache/camel/component/aws2/sns/Sns2Configuration.java | 2 +- .../camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java | 2 +- .../apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java | 4 ++-- docs/components/modules/ROOT/pages/aws2-sns-component.adoc| 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-)
[camel] 02/02: Regen docs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 47c133570702e2e918be456cbb57dde0df32261b
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 13:23:37 2020 +0100
Regen docs
---
.../org/apache/camel/catalog/docs/aws2-s3-component.adoc | 8
docs/components/modules/ROOT/pages/aws2-s3-component.adoc | 8
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-s3-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-s3-component.adoc
index c61d8fc..ffde72a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-s3-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-s3-component.adoc
@@ -373,12 +373,12 @@ from("file:tmp/test?fileName=test.txt")
In this way you'll ask to S3, to use the KMS key
3f0637ad-296a-3dfe-a796-e60654fb128c, to encrypt the file test.txt. When you'll
ask to download this file, the decryption will be done directly before the
download.
-=== Use "useIAMCredentials" with the s3 component
+=== Use "useDefaultCredentialsProvider" with the s3 component and IAM
-To use AWS IAM credentials, you must first verify that the EC2 in which you
are launching the Camel application on has an IAM role associated with it
containing the appropriate policies attached to run effectively.
+To use AWS Default Credentials Provider, you must first verify that the EC2 in
which you are launching the Camel application on has an IAM role associated
with it containing the appropriate policies attached to run effectively.
Keep in mind that this feature should only be set to "true" on remote
instances. To clarify even further, you must still use static credentials
locally since IAM is an AWS specific component,
-but AWS environments should now be easier to manage. After this is implemented
and understood, you can set the query parameter "useIAMCredentials" to "true"
for AWS environments! To effectively toggle this
-on and off based on local and remote environments, you can consider enabling
this query parameter with system environment variables. For example, your code
could set the "useIAMCredentials" query parameter to "true",
+but AWS environments should now be easier to manage. After this is implemented
and understood, you can set the query parameter "useDefaultCredentialsProvider"
to "true" for AWS environments! To effectively toggle this
+on and off based on local and remote environments, you can consider enabling
this query parameter with system environment variables. For example, your code
could set the "useDefaultCredentialsProvider" query parameter to "true",
when the system environment variable called "isRemote" is set to true (there
are many other ways to do this and this should act as a simple example).
Although it doesn't take away the need for static credentials completely,
using IAM credentials on AWS environments takes away the need to refresh on
remote environments and adds a major security boost (IAM credentials are
refreshed automatically every 6 hours and update when their
policies are updated). This is the AWS recommended way to manage credentials
and therefore should be used as often as possible.
diff --git a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
index 986458a..0c229d4 100644
--- a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
@@ -375,12 +375,12 @@ from("file:tmp/test?fileName=test.txt")
In this way you'll ask to S3, to use the KMS key
3f0637ad-296a-3dfe-a796-e60654fb128c, to encrypt the file test.txt. When you'll
ask to download this file, the decryption will be done directly before the
download.
-=== Use "useIAMCredentials" with the s3 component
+=== Use "useDefaultCredentialsProvider" with the s3 component and IAM
-To use AWS IAM credentials, you must first verify that the EC2 in which you
are launching the Camel application on has an IAM role associated with it
containing the appropriate policies attached to run effectively.
+To use AWS Default Credentials Provider, you must first verify that the EC2 in
which you are launching the Camel application on has an IAM role associated
with it containing the appropriate policies attached to run effectively.
Keep in mind that this feature should only be set to "true" on remote
instances. To clarify even further, you must still use static credentials
locally since IAM is an AWS specific component,
-but AWS environments should now be easier to manage. After this is implemented
and understood, you can set the query parameter "useIAMCredentials" to "true"
for AWS
[camel] 01/02: Camel-AWS2-S3: Use default credentials Provider docs update
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 346ccd83ee4c6c38856b42ba9669c777c996929b
Author: Andrea Cosentino
AuthorDate: Fri Dec 4 11:48:26 2020 +0100
Camel-AWS2-S3: Use default credentials Provider docs update
---
components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
b/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
index c61d8fc..ffde72a 100644
--- a/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
+++ b/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
@@ -373,12 +373,12 @@ from("file:tmp/test?fileName=test.txt")
In this way you'll ask to S3, to use the KMS key
3f0637ad-296a-3dfe-a796-e60654fb128c, to encrypt the file test.txt. When you'll
ask to download this file, the decryption will be done directly before the
download.
-=== Use "useIAMCredentials" with the s3 component
+=== Use "useDefaultCredentialsProvider" with the s3 component and IAM
-To use AWS IAM credentials, you must first verify that the EC2 in which you
are launching the Camel application on has an IAM role associated with it
containing the appropriate policies attached to run effectively.
+To use AWS Default Credentials Provider, you must first verify that the EC2 in
which you are launching the Camel application on has an IAM role associated
with it containing the appropriate policies attached to run effectively.
Keep in mind that this feature should only be set to "true" on remote
instances. To clarify even further, you must still use static credentials
locally since IAM is an AWS specific component,
-but AWS environments should now be easier to manage. After this is implemented
and understood, you can set the query parameter "useIAMCredentials" to "true"
for AWS environments! To effectively toggle this
-on and off based on local and remote environments, you can consider enabling
this query parameter with system environment variables. For example, your code
could set the "useIAMCredentials" query parameter to "true",
+but AWS environments should now be easier to manage. After this is implemented
and understood, you can set the query parameter "useDefaultCredentialsProvider"
to "true" for AWS environments! To effectively toggle this
+on and off based on local and remote environments, you can consider enabling
this query parameter with system environment variables. For example, your code
could set the "useDefaultCredentialsProvider" query parameter to "true",
when the system environment variable called "isRemote" is set to true (there
are many other ways to do this and this should act as a simple example).
Although it doesn't take away the need for static credentials completely,
using IAM credentials on AWS environments takes away the need to refresh on
remote environments and adds a major security boost (IAM credentials are
refreshed automatically every 6 hours and update when their
policies are updated). This is the AWS recommended way to manage credentials
and therefore should be used as often as possible.
[camel] branch master updated (845cb86 -> 47c1335)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 845cb86 CAMEL-15832: maven archetypes do not use deprecated new 346ccd8 Camel-AWS2-S3: Use default credentials Provider docs update new 47c1335 Regen docs 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: .../org/apache/camel/catalog/docs/aws2-s3-component.adoc | 8 components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc | 8 docs/components/modules/ROOT/pages/aws2-s3-component.adoc | 8 3 files changed, 12 insertions(+), 12 deletions(-)
[GitHub] [camel-k] nicolaferraro commented on issue #1843: Lower priority of modeline options
nicolaferraro commented on issue #1843: URL: https://github.com/apache/camel-k/issues/1843#issuecomment-738755456 Yes, I think what you're suggesting is the right way to handle those params This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: CAMEL-15832: maven archetypes do not use deprecated
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 845cb86 CAMEL-15832: maven archetypes do not use deprecated
845cb86 is described below
commit 845cb868ef66c8741ebae998b1e5d2eacb1950e1
Author: Claus Ibsen
AuthorDate: Fri Dec 4 13:11:53 2020 +0100
CAMEL-15832: maven archetypes do not use deprecated
---
.../__artifactId__-component/src/main/java/__name__Endpoint.java | 3 ++-
.../resources/archetype-resources/src/main/java/__name__Endpoint.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
index 4204cf9..cf5425e 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/main/java/__name__Endpoint.java
@@ -18,6 +18,7 @@ package ${package};
import java.util.Map;
+import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -40,7 +41,7 @@ import ${package}.internal.${name}PropertiesHelper;
* TODO: Update one line description above what the component does.
*/
@UriEndpoint(firstVersion = "${version}", scheme = "${scheme}", title =
"${name}", syntax="${scheme}:name",
- consumerClass = ${name}Consumer.class, label = "custom")
+ category = {Category.API})
public class ${name}Endpoint extends AbstractApiEndpoint<${name}ApiName,
${name}Configuration> {
@UriPath @Metadata(required = true)
diff --git
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
index c6ff102..a71cf0b 100644
---
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
+++
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
@@ -16,6 +16,7 @@
##
package ${package};
+import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -33,7 +34,7 @@ import java.util.concurrent.ExecutorService;
* TODO: Update one line description above what the component does.
*/
@UriEndpoint(firstVersion = "${version}", scheme = "${scheme}", title =
"${name}", syntax="${scheme}:name",
- consumerClass = ${name}Consumer.class, label = "custom")
+ category = {Category.JAVA})
public class ${name}Endpoint extends DefaultEndpoint {
@UriPath @Metadata(required = true)
private String name;
[camel] branch master updated: CAMEL-15860: Use logger instead of stdio for camel-catalog-maven.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2356f9d CAMEL-15860: Use logger instead of stdio for
camel-catalog-maven.
2356f9d is described below
commit 2356f9dab233a21ca52c1e0032088dcfcf5c6887
Author: Claus Ibsen
AuthorDate: Fri Dec 4 13:02:21 2020 +0100
CAMEL-15860: Use logger instead of stdio for camel-catalog-maven.
---
catalog/camel-catalog-maven/pom.xml| 5 +
.../camel/catalog/maven/DefaultMavenArtifactProvider.java | 14 +-
.../apache/camel/catalog/maven/MavenVersionManager.java| 10 +++---
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/catalog/camel-catalog-maven/pom.xml
b/catalog/camel-catalog-maven/pom.xml
index 3c461c9..c9a0c72 100644
--- a/catalog/camel-catalog-maven/pom.xml
+++ b/catalog/camel-catalog-maven/pom.xml
@@ -44,6 +44,11 @@
${project.version}
+
+org.slf4j
+slf4j-api
+
+
org.apache.httpcomponents
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index c1e4077..c9c9f5d 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -25,6 +25,8 @@ import java.util.Set;
import groovy.grape.Grape;
import groovy.lang.GroovyClassLoader;
import org.apache.camel.catalog.CamelCatalog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static
org.apache.camel.catalog.maven.ComponentArtifactHelper.extractComponentJavaType;
import static
org.apache.camel.catalog.maven.ComponentArtifactHelper.loadComponentJSonSchema;
@@ -35,6 +37,7 @@ import static
org.apache.camel.catalog.maven.ComponentArtifactHelper.loadCompone
*/
public class DefaultMavenArtifactProvider implements MavenArtifactProvider {
+private static final Logger LOG =
LoggerFactory.getLogger(DefaultMavenArtifactProvider.class);
private String cacheDirectory;
private boolean log;
@@ -67,7 +70,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
try {
if (cacheDirectory != null) {
if (log) {
-System.out.println("DEBUG: Using cache directory: " +
cacheDirectory);
+LOG.debug("Using cache directory: {}", cacheDirectory);
}
System.setProperty("grape.root", cacheDirectory);
}
@@ -86,7 +89,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
param.put("transitive", false);
if (log) {
-System.out.println("Downloading " + groupId + ":" +
artifactId + ":" + version);
+LOG.info("Downloading " + groupId + ":" + artifactId + ":"
+ version);
}
Grape.grab(param);
@@ -98,8 +101,9 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
} catch (Exception e) {
if (log) {
-System.out.println("WARN: Error during add components from
artifact " + groupId + ":" + artifactId + ":"
- + version + " due " + e.getMessage());
+LOG.warn("Error during add components from artifact " +
groupId + ":" + artifactId + ":"
+ + version + " due " + e.getMessage(),
+e);
}
}
@@ -121,7 +125,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
String json = loadComponentJSonSchema(log,
classLoader, scheme);
if (json != null) {
if (log) {
-System.out.println("Adding component: " +
scheme);
+LOG.info("Adding component: {}", scheme);
}
camelCatalog.addComponent(scheme, javaType,
json);
names.add(scheme);
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index 3151894..5cfefa7 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++
[camel-examples] branch master updated: CAMEL-15914: camel-csimple - Generate source code whether its a predicate or expression.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/master by this push:
new c2a4b18 CAMEL-15914: camel-csimple - Generate source code whether its
a predicate or expression.
c2a4b18 is described below
commit c2a4b18de9659ee79ee829b01a06573b40d7e13a
Author: Claus Ibsen
AuthorDate: Fri Dec 4 12:18:41 2020 +0100
CAMEL-15914: camel-csimple - Generate source code whether its a predicate
or expression.
---
.../src/generated/java/org/apache/camel/example/CSimpleScript1.java | 5 +
.../src/generated/java/org/apache/camel/example/CSimpleScript2.java | 5 +
.../src/generated/java/org/apache/camel/example/CSimpleScript3.java | 5 +
3 files changed, 15 insertions(+)
diff --git
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
b/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
index 3aa5a49..770fc6a 100644
---
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
+++
b/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
@@ -16,6 +16,11 @@ public class CSimpleScript1 extends
org.apache.camel.language.csimple.CSimpleSup
}
@Override
+public boolean isPredicate() {
+return false;
+}
+
+@Override
public String getText() {
return "${random(20)}";
}
diff --git
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
b/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
index c14997d..1125619 100644
---
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
+++
b/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
@@ -16,6 +16,11 @@ public class CSimpleScript2 extends
org.apache.camel.language.csimple.CSimpleSup
}
@Override
+public boolean isPredicate() {
+return true;
+}
+
+@Override
public String getText() {
return "${body} > 10";
}
diff --git
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
b/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
index 486692d..c85d52d 100644
---
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
+++
b/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
@@ -16,6 +16,11 @@ public class CSimpleScript3 extends
org.apache.camel.language.csimple.CSimpleSup
}
@Override
+public boolean isPredicate() {
+return true;
+}
+
+@Override
public String getText() {
return "${body} > 5";
}
[camel] branch master updated: CAMEL-15914: camel-csimple - Generate source code whether its a predicate or expression.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5b82a17 CAMEL-15914: camel-csimple - Generate source code whether its
a predicate or expression.
5b82a17 is described below
commit 5b82a173db4cc51deafa1f8a082f3753b23091de
Author: Claus Ibsen
AuthorDate: Fri Dec 4 12:51:26 2020 +0100
CAMEL-15914: camel-csimple - Generate source code whether its a predicate
or expression.
---
.../language/csimple/CSimpleCodeGenerator.java | 6 +++
.../camel/language/csimple/CSimpleExpression.java | 5 +++
.../camel/language/csimple/CSimpleLanguage.java| 50 --
.../camel/language/csimple/HighPredicate.java | 5 +++
.../camel/language/csimple/MedPredicate.java | 5 +++
5 files changed, 48 insertions(+), 23 deletions(-)
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
index b336aa8..1d92fc4 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
@@ -103,6 +103,12 @@ public class CSimpleCodeGenerator {
sb.append("\n");
sb.append("@Override\n");
+sb.append("public boolean isPredicate() {\n");
+sb.append("return ").append(predicate).append(";\n");
+sb.append("}\n");
+sb.append("\n");
+
+sb.append("@Override\n");
sb.append("public String getText() {\n");
// \ should be escaped
String escaped = StringHelper.replaceAll(text, "\\", "");
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
index b33fbd3..46d383e 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
@@ -26,6 +26,11 @@ import org.apache.camel.Predicate;
public interface CSimpleExpression extends Expression, Predicate {
/**
+ * Whether this script is to be used as predicate only.
+ */
+boolean isPredicate();
+
+/**
* The csimple script as text
*/
String getText();
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
index 4c8eec4..d7210d6 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
@@ -20,9 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -51,15 +49,16 @@ public class CSimpleLanguage extends LanguageSupport
implements StaticService {
private static final Logger LOG =
LoggerFactory.getLogger(CSimpleLanguage.class);
-private final Map compiled;
+private final Map compiledPredicates = new
ConcurrentHashMap<>();
+private final Map compiledExpressions = new
ConcurrentHashMap<>();
+
/**
* If set, this implementation attempts to compile those expressions at
runtime, that are not yet available in
- * {@link #compiled}; otherwise no compilation attempts will be made at
runtime
+ * {@link #compiledPredicates}; otherwise no compilation attempts will be
made at runtime
*/
private final CompilationSupport compilationSupport;
public CSimpleLanguage() {
-this.compiled = new ConcurrentHashMap<>();
this.compilationSupport = new CompilationSupport();
}
@@ -69,7 +68,13 @@ public class CSimpleLanguage extends LanguageSupport
implements StaticService {
* @param compiled the compiled
*/
private CSimpleLanguage(Map compiled) {
-this.compiled = compiled;
+compiled.forEach((k, v) -> {
+if (v.isPredicate()) {
+this.compiledPredicates.put(k, v);
+} else {
+this.compiledExpressions.put(k, v);
+}
+});
this.compilationSupport = null;
}
@@ -130,11 +135,11 @@ public class CSimpleLanguage extends LanguageSupport
implements StaticService {
String text = expression.replaceAll("\n",
[camel-website] branch asf-site updated (7d0ed71 -> b836ae6)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard 7d0ed71 Website updated to e5c90a030ff2527b2b1da3ba19cde12bb8024250 discard 1ab0cb5 Updated the website to b19baea new 432245f Updated the website to b19baea new b836ae6 Website updated to 7844de47eba676b008dba17e389d99ce17731d75 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 (7d0ed71) \ N -- N -- N refs/heads/asf-site (b836ae6) 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: components/latest/languages/csimple-language.html |2 +- releases/ckc-0.6.1/index.html |4 +- releases/k-1.2.1/index.html |2 +- releases/k-runtime-1.5.0/index.html |2 +- releases/q-1.4.0/index.html |2 +- releases/release-2.18.0/index.html|2 +- releases/release-2.18.1/index.html|2 +- releases/release-2.18.2/index.html|2 +- releases/release-2.18.3/index.html|2 +- releases/release-2.18.4/index.html|2 +- releases/release-2.18.5/index.html|2 +- releases/release-2.19.0/index.html|2 +- releases/release-2.19.1/index.html|2 +- releases/release-2.19.2/index.html|2 +- releases/release-2.19.3/index.html|2 +- releases/release-2.19.4/index.html|2 +- releases/release-2.19.5/index.html|2 +- releases/release-2.20.0/index.html|2 +- releases/release-2.20.1/index.html|2 +- releases/release-2.20.2/index.html|2 +- releases/release-2.20.3/index.html|2 +- releases/release-2.20.4/index.html|2 +- releases/release-2.21.0/index.html|2 +- releases/release-2.21.1/index.html|2 +- releases/release-2.21.2/index.html|2 +- releases/release-2.21.3/index.html|2 +- releases/release-2.21.4/index.html|2 +- releases/release-2.21.5/index.html|2 +- releases/release-2.22.0/index.html|2 +- releases/release-2.22.1/index.html|2 +- releases/release-2.22.2/index.html|2 +- releases/release-2.22.3/index.html|2 +- releases/release-2.22.4/index.html|2 +- releases/release-2.22.5/index.html|2 +- releases/release-2.23.0/index.html|2 +- releases/release-2.23.1/index.html|2 +- releases/release-2.23.2/index.html|2 +- releases/release-2.23.3/index.html|2 +- releases/release-2.23.4/index.html|2 +- releases/release-2.24.0/index.html|2 +- releases/release-2.24.1/index.html|2 +- releases/release-2.24.2/index.html|2 +- releases/release-2.24.3/index.html|2 +- releases/release-2.25.0/index.html|2 +- releases/release-2.25.1/index.html|2 +- releases/release-2.25.2/index.html|2 +- releases/release-3.0.0-RC1/index.html |2 +- releases/release-3.0.0-RC2/index.html |2 +- releases/release-3.0.0-RC3/index.html |2 +- releases/release-3.0.0/index.html |2 +- releases/release-3.0.1/index.html |2 +- releases/release-3.1.0/index.html |2 +- releases/release-3.2.0/index.html |2 +- releases/release-3.3.0/index.html |2 +- releases/release-3.4.0/index.html |2 +- releases/release-3.4.1/index.html |2 +- releases/release-3.4.2/index.html |2 +- releases/release-3.4.3/index.html |2 +- releases/release-3.4.4/index.html |2 +-
[GitHub] [camel] Liroyd edited a comment on pull request #4720: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
Liroyd edited a comment on pull request #4720: URL: https://github.com/apache/camel/pull/4720#issuecomment-738732205 It's already done as parseString for camle-hystrix Will change for resilience4j and camel-microprofile-fault-tolerance This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti merged pull request #1844: fix: Fix kamelet.feature for YAKS version 0.1.0
astefanutti merged pull request #1844: URL: https://github.com/apache/camel-k/pull/1844 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch master updated (ecebb40 -> 6a36e54)
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from ecebb40 Updated CHANGELOG.md add 6a36e54 fix: Fix kamelet.feature for YAKS version 0.1.0 No new revisions were added by this update. Summary of changes: e2e/yaks/common/apache-kamelet-catalog/kamelet.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] Liroyd commented on pull request #4720: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
Liroyd commented on pull request #4720: URL: https://github.com/apache/camel/pull/4720#issuecomment-738732205 It's already done as parseString for camle-hystrix and camel-microprofile-fault-tolerance. Will change for resilience4j only This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch master updated: CAMEL-15913: remove debug output
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/master by this push:
new 7844de4 CAMEL-15913: remove debug output
7844de4 is described below
commit 7844de47eba676b008dba17e389d99ce17731d75
Author: Zoran Regvart
AuthorDate: Fri Dec 4 12:24:09 2020 +0100
CAMEL-15913: remove debug output
---
layouts/partials/releases/downloads.html | 2 --
1 file changed, 2 deletions(-)
diff --git a/layouts/partials/releases/downloads.html
b/layouts/partials/releases/downloads.html
index 0d09c9e..3195161 100644
--- a/layouts/partials/releases/downloads.html
+++ b/layouts/partials/releases/downloads.html
@@ -48,7 +48,6 @@
{{/* when version is specified, this is included from the release page */}}
{{ range $version := $versions }}
{{ range $kind, $v := $version }}
-{{ $v }}
{{ if eq $v $.Version }}
{{ $is_current_versions = true }}
{{ end }}
@@ -66,7 +65,6 @@
{{ else }}
{{/* no $.Version requested, we're rendering the downloads page, all
versions should be current */}}
{{ $is_current_versions = true }}
-
{{ end }}
{{/* the same version can be matched by two kinds (say be latest and lts at
the same time), this merges the multiple version entries into single */}}
[GitHub] [camel] orpiske opened a new pull request #4722: Migrates zookeeper related components to the new test-infra
orpiske opened a new pull request #4722: URL: https://github.com/apache/camel/pull/4722 Includes: - camel-zookeeper - camel-zookeeper-master - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #4720: CAMEL-15917: Resilience4j Property Component doesn't work for configu…
davsclaus commented on pull request #4720: URL: https://github.com/apache/camel/pull/4720#issuecomment-738719490 And we need this for all 3 circuit breakers camel-hystrix, camel-resilience4j, camel-microprofile-fault-tolerance This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
