[camel] branch master updated: CAMEL-15112: Deprecate camel-hystrix
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 88f46b1 CAMEL-15112: Deprecate camel-hystrix
88f46b1 is described below
commit 88f46b1ce46f5cdace73b2721a1cb96a290d42dd
Author: Claus Ibsen
AuthorDate: Tue May 26 16:25:25 2020 +0200
CAMEL-15112: Deprecate camel-hystrix
---
components/camel-hystrix/pom.xml | 2 +-
.../resources/META-INF/services/org/apache/camel/other.properties| 2 +-
components/camel-hystrix/src/generated/resources/hystrix.json| 2 +-
components/camel-hystrix/src/main/docs/hystrix.adoc | 5 +++--
.../resources/org/apache/camel/model/hystrixConfiguration.json | 2 +-
core/camel-core-engine/src/main/docs/modules/eips/nav.adoc | 2 +-
.../src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc | 4 ++--
.../src/main/docs/modules/eips/pages/hystrix-eip.adoc| 2 +-
.../main/java/org/apache/camel/model/CircuitBreakerDefinition.java | 4
.../main/java/org/apache/camel/model/HystrixConfigurationCommon.java | 1 +
.../java/org/apache/camel/model/HystrixConfigurationDefinition.java | 1 +
docs/components/modules/others/pages/hystrix.adoc| 5 +++--
12 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
index 6d9dba1..0117a4e 100644
--- a/components/camel-hystrix/pom.xml
+++ b/components/camel-hystrix/pom.xml
@@ -29,7 +29,7 @@
camel-hystrix
jar
-Camel :: Hystrix
+Camel :: Hystrix (deprecated)
Circuit Breaker EIP using Netflix Hystrix
diff --git
a/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 920748a..207d1e3 100644
---
a/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++
b/components/camel-hystrix/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=hystrix
groupId=org.apache.camel
artifactId=camel-hystrix
version=3.4.0-SNAPSHOT
-projectName=Camel :: Hystrix
+projectName=Camel :: Hystrix (deprecated)
projectDescription=Circuit Breaker EIP using Netflix Hystrix
diff --git a/components/camel-hystrix/src/generated/resources/hystrix.json
b/components/camel-hystrix/src/generated/resources/hystrix.json
index ccee1a4..0688c11 100644
--- a/components/camel-hystrix/src/generated/resources/hystrix.json
+++ b/components/camel-hystrix/src/generated/resources/hystrix.json
@@ -4,7 +4,7 @@
"name": "hystrix",
"title": "Hystrix",
"description": "Circuit Breaker EIP using Netflix Hystrix",
-"deprecated": false,
+"deprecated": true,
"firstVersion": "2.18.0",
"label": "eip,microservice",
"supportLevel": "Stable",
diff --git a/components/camel-hystrix/src/main/docs/hystrix.adoc
b/components/camel-hystrix/src/main/docs/hystrix.adoc
index 80ba9af..2ff57b8 100644
--- a/components/camel-hystrix/src/main/docs/hystrix.adoc
+++ b/components/camel-hystrix/src/main/docs/hystrix.adoc
@@ -1,10 +1,11 @@
[[hystrix-component]]
-= Hystrix Component
+= Hystrix Component (deprecated)
:docTitle: Hystrix
:artifactId: camel-hystrix
:description: Circuit Breaker EIP using Netflix Hystrix
:since: 2.18
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
*Since Camel {since}*
diff --git
a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
index 5852ec0..2faaab6 100644
---
a/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
+++
b/core/camel-core-engine/src/generated/resources/org/apache/camel/model/hystrixConfiguration.json
@@ -4,7 +4,7 @@
"name": "hystrixConfiguration",
"title": "Hystrix Configuration",
"description": "Hystrix Circuit Breaker EIP configuration",
-"deprecated": false,
+"deprecated": true,
"label": "eip,routing,circuitbreaker",
"javaType": "org.apache.camel.model.HystrixConfigurationDefinition",
"input": false,
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
index 8065aa4..54ad1c9 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
@@ -33,7 +33,7 @@
** xref:eips:from-eip.adoc[From]
** xref:eips:guaranteed-delivery.adoc[Guaranteed Delivery]
** xref:eips:hystrixConfiguration-eip.adoc[Hystrix Configuration]
- **
[camel] 03/03: 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 d731a6d65d4ba95af84807f172f84631c1aa98c3
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:39:48 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-s3-component.adoc | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
index a320865..a1f8ebf 100644
--- a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.2*
-
-
*{component-header}*
-The S3 component supports storing and retrieving objects from/to
+The AWS2 S3 component supports storing and retrieving objects from/to
https://aws.amazon.com/s3[Amazon's S3] service.
Prerequisites
[camel] branch master updated (19538b0 -> d731a6d)
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 19538b0 Regen docs new 10cfde1 Camel-AWS2-S3: Docs cleanup new a8a4ccb Camel-AWS2-S3: Fixed docs intro new d731a6d Regen docs 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: components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-s3-component.adoc | 5 + 2 files changed, 2 insertions(+), 8 deletions(-)
[camel] 01/03: Camel-AWS2-S3: Docs cleanup
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 10cfde1d825b042e8f1f28e995daf4af8301fb8e
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:37:02 2020 +0200
Camel-AWS2-S3: Docs cleanup
---
components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc | 3 ---
1 file changed, 3 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 06ee833..347667f 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
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.2*
-
-
*{component-header}*
The S3 component supports storing and retrieving objects from/to
[camel] 02/03: Camel-AWS2-S3: Fixed docs intro
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 a8a4ccbc20179330b78e4ba8e497b5f28083f197
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:37:26 2020 +0200
Camel-AWS2-S3: Fixed docs intro
---
components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 347667f..f23a970 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
@@ -11,7 +11,7 @@
*{component-header}*
-The S3 component supports storing and retrieving objects from/to
+The AWS2 S3 component supports storing and retrieving objects from/to
https://aws.amazon.com/s3[Amazon's S3] service.
Prerequisites
[camel] 01/02: Camel-AWS2-Translate: Fixed docs intro
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 4eaad665ce039011d52cf9e7a5831a60a245673f
Author: Andrea Cosentino
AuthorDate: Tue May 26 17:35:06 2020 +0200
Camel-AWS2-Translate: Fixed docs intro
---
.../camel-aws2-translate/src/main/docs/aws2-translate-component.adoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
b/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
index f7a0db0..9cf9cae 100644
---
a/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
+++
b/components/camel-aws2-translate/src/main/docs/aws2-translate-component.adoc
@@ -9,10 +9,9 @@
*Since Camel {since}*
-
*{component-header}*
-The Translate component supports translate a text in multiple languages.
+The AWS2 Translate component supports translate a text in multiple languages.
https://aws.amazon.com/translate/[AWS Translate] clusters instances.
Prerequisites
[camel] 02/03: Camel-AWS2-MSK: Fixed docs intro
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 2365429736e3c6ff47ed5f3e48662292eb697056
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:22:07 2020 +0200
Camel-AWS2-MSK: Fixed docs intro
---
components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
b/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
index ee72981..8b5c7913 100644
--- a/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
+++ b/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The AWS MSK component supports create, run, start, stop and terminate
+The AWS2 MSK component supports create, run, start, stop and terminate
https://aws.amazon.com/msk/[AWS MSK] instances.
Prerequisites
[camel] branch master updated (82d47cc -> 19538b0)
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 82d47cc Regen docs new 0323c26 Camel-AWS2-MSK: Cleanup new 2365429 Camel-AWS2-MSK: Fixed docs intro new 19538b0 Regen docs 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: components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-msk-component.adoc | 5 + 2 files changed, 2 insertions(+), 8 deletions(-)
[camel] 01/03: Camel-AWS2-MSK: Cleanup
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 0323c266631fd970300e31b7702346ee50d592b5
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:21:54 2020 +0200
Camel-AWS2-MSK: Cleanup
---
components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
b/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
index 1d46c25..ee72981 100644
--- a/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
+++ b/components/camel-aws2-msk/src/main/docs/aws2-msk-component.adoc
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
The AWS MSK component supports create, run, start, stop and terminate
[camel] 03/03: 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 19538b0e00e79cddb717f56ca2286e59b05ea197
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:25:14 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-msk-component.adoc | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-msk-component.adoc
b/docs/components/modules/ROOT/pages/aws2-msk-component.adoc
index a9c674f..2dbd5c9 100644
--- a/docs/components/modules/ROOT/pages/aws2-msk-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-msk-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
-The AWS MSK component supports create, run, start, stop and terminate
+The AWS2 MSK component supports create, run, start, stop and terminate
https://aws.amazon.com/msk/[AWS MSK] instances.
Prerequisites
[camel] branch master updated (88f46b1 -> 90d8f2e)
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 88f46b1 CAMEL-15112: Deprecate camel-hystrix new d1ec1a9 Camel-AWS2-SNS: Cleanup new 6b9e2e1 Camel-AWS2-SNS: Fixed docs intro new 90d8f2e Regen docs 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: components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-sns-component.adoc | 5 + 2 files changed, 2 insertions(+), 8 deletions(-)
[camel-quarkus] branch master updated (2b0fd99 -> 60d9b22)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 2b0fd99 Make sure all extensions present in the List of extensions page have an extension page add 60d9b22 Remove camel-rest workaround as the fic for the issue is included in Apache Camel 3.3.0 No new revisions were added by this update. Summary of changes: .../component/rest/deployment/RestProcessor.java | 72 --- .../component/rest/QuarkusRestComponent.java | 193 -- .../component/rest/QuarkusRestEndpoint.java| 199 --- .../component/rest/QuarkusRestProducer.java| 215 - .../camel/quarkus/component/rest/RestRecorder.java | 27 --- .../component/rest/graal/NoJAXBContext.java| 32 --- .../rest/graal/RestProducerSubstitution.java | 30 --- 7 files changed, 768 deletions(-) delete mode 100644 extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestComponent.java delete mode 100644 extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestEndpoint.java delete mode 100644 extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/QuarkusRestProducer.java delete mode 100644 extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/RestRecorder.java delete mode 100644 extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/graal/NoJAXBContext.java delete mode 100644 extensions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/graal/RestProducerSubstitution.java
[camel] 02/03: Camel-AWS2-SNS: Fixed docs intro
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 6b9e2e1541e6768fde27c2e214deba8595562649
Author: Andrea Cosentino
AuthorDate: Tue May 26 17:25:22 2020 +0200
Camel-AWS2-SNS: Fixed docs intro
---
components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
b/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
index 2eb0f6c..c118ad3 100644
--- a/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
+++ b/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The SNS component allows messages to be sent to an
+The AWS2 SNS component allows messages to be sent to an
https://aws.amazon.com/sns[Amazon Simple Notification] Topic. The
implementation of the Amazon API is provided by
the https://aws.amazon.com/sdkforjava/[AWS SDK].
[camel] 01/03: Camel-AWS2-SNS: Cleanup
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 d1ec1a903371377fca54a71baaf94c34e9e03c5e
Author: Andrea Cosentino
AuthorDate: Tue May 26 17:25:00 2020 +0200
Camel-AWS2-SNS: Cleanup
---
components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
b/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
index 2f35cda..2eb0f6c 100644
--- a/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
+++ b/components/camel-aws2-sns/src/main/docs/aws2-sns-component.adoc
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
The SNS component allows messages to be sent to an
[camel] 03/03: 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 90d8f2ef6c51aac24fd177df1da371ee03590ff2
Author: Andrea Cosentino
AuthorDate: Tue May 26 17:26:26 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-sns-component.adoc | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
b/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
index 06ff339..d787a39 100644
--- a/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-sns-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
-The SNS component allows messages to be sent to an
+The AWS2 SNS component allows messages to be sent to an
https://aws.amazon.com/sns[Amazon Simple Notification] Topic. The
implementation of the Amazon API is provided by
the https://aws.amazon.com/sdkforjava/[AWS SDK].
[camel] branch master updated: Camel-AWS2-SQS: Fixed Docs intro
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
The following commit(s) were added to refs/heads/master by this push:
new 555910f Camel-AWS2-SQS: Fixed Docs intro
555910f is described below
commit 555910f792ce0514d0b2131b0dbb224ad6df2c54
Author: Andrea Cosentino
AuthorDate: Tue May 26 17:28:14 2020 +0200
Camel-AWS2-SQS: Fixed Docs intro
---
components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
index b714359..267aad2 100644
--- a/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
+++ b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The sqs component supports sending and receiving messages to
+The AWS2 SQS component supports sending and receiving messages to
https://aws.amazon.com/sqs[Amazon's SQS] service.
Prerequisites
[camel] branch master updated: CAMEL-15081: Polished
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 c441098 CAMEL-15081: Polished
c441098 is described below
commit c4410982ad53ff9b00b83107cb6d0365988fe714
Author: Claus Ibsen
AuthorDate: Tue May 26 13:25:48 2020 +0200
CAMEL-15081: Polished
---
.../java/org/apache/camel/health/HealthCheck.java | 10 --
.../org/apache/camel/health/HealthCheckFilter.java | 1 +
.../apache/camel/health/HealthCheckRepository.java | 1 +
.../camel/health/HealthCheckResultBuilder.java | 2 +-
.../org/apache/camel/health/HealthCheckService.java | 3 ++-
.../impl/health/DefaultHealthCheckService.java | 21 +++--
.../impl/health/RoutesHealthCheckRepository.java| 4 +---
.../impl/health/DefaultHealthCheckServiceTest.java | 3 +--
8 files changed, 18 insertions(+), 27 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
index 6e037cb..d98dc01 100644
--- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
+++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
@@ -24,7 +24,11 @@ import org.apache.camel.Ordered;
import org.apache.camel.spi.HasGroup;
import org.apache.camel.spi.HasId;
+/**
+ * Health check
+ */
public interface HealthCheck extends HasGroup, HasId, Ordered {
+
enum State {
UP,
DOWN,
@@ -51,14 +55,16 @@ public interface HealthCheck extends HasGroup, HasId,
Ordered {
/**
* Invoke the check.
*
- * @see {@link #call(Map)}
+ * @see #call(Map)
*/
default Result call() {
return call(Collections.emptyMap());
}
/**
- * Invoke the check. The implementation is responsible to eventually
perform
+ * Invoke the check.
+ *
+ * The implementation is responsible to eventually perform
* the check according to the limitation of the third party system i.e.
* it should not be performed too often to avoid rate limiting. The options
* argument can be used to pass information specific to the check like
diff --git
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
index 88857d1..e9d5367 100644
---
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
+++
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
@@ -21,6 +21,7 @@ package org.apache.camel.health;
*/
@FunctionalInterface
public interface HealthCheckFilter {
+
/**
* Determine if the given {@link HealthCheck} has to be filtered out.
*
diff --git
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
index 680b7ed..39fdf75 100644
---
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
+++
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
@@ -22,6 +22,7 @@ import java.util.stream.Stream;
* A repository for health checks.
*/
public interface HealthCheckRepository {
+
/**
* Returns a sequential {@code Stream} with the known {@link HealthCheck}
* as its source.
diff --git
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
index 39e8c7d..6349fde 100644
---
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
+++
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
@@ -25,7 +25,7 @@ import org.apache.camel.Builder;
import org.apache.camel.util.ObjectHelper;
/**
- * A builder helper to create a result.
+ * A builder helper to create a {@link HealthCheck} result.
*/
public final class HealthCheckResultBuilder implements
Builder {
private HealthCheck check;
diff --git
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
index 3e1e3f9..b3e12a6 100644
---
a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
+++
b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
@@ -30,6 +30,7 @@ import org.apache.camel.Service;
* according to a schedule.
*/
public interface HealthCheckService extends Service, CamelContextAware {
+
/**
* Add a listener to invoke when the state of a check change.
*
@@ -54,7 +55,7 @@ public interface HealthCheckService extends Service,
CamelContextAware {
void setHealthCheckOptions(String id, Map
[camel-spring-boot] branch master updated (0c02773 -> 69786b9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 0c02773 Fixed ElasticsearchRest ITest new fae42b0 CAMEL-15081: Polished new 69786b9 Regen 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: .../apache/camel/springboot/catalog/components/kafka.json| 4 ++-- components-starter/camel-corda-starter/pom.xml | 12 components-starter/camel-iota-starter/pom.xml| 12 .../camel-kafka-starter/src/main/docs/kafka-starter.adoc | 2 +- .../kafka/springboot/KafkaComponentConfiguration.java| 6 -- .../boot/health/HealthCheckServiceAutoConfiguration.java | 2 +- docs/modules/ROOT/pages/kafka-starter.adoc | 2 +- 7 files changed, 9 insertions(+), 31 deletions(-)
[camel-spring-boot] 01/02: CAMEL-15081: Polished
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-spring-boot.git
commit fae42b01c1235e6af6437929cbd265b3b1f3455b
Author: Claus Ibsen
AuthorDate: Tue May 26 16:15:01 2020 +0200
CAMEL-15081: Polished
---
.../camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
index d748e62..5e46d7e 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
@@ -51,7 +51,7 @@ public class HealthCheckServiceAutoConfiguration {
Optional.ofNullable(configuration.getCheckInterval())
.map(TimePatternConverter::toMilliSeconds)
-.ifPresent(interval -> service.setCheckInterval(interval,
TimeUnit.MILLISECONDS));
+.ifPresent(interval -> service.setCheckInterval(interval));
configuration.getChecks().entrySet().stream()
.filter(entry -> Objects.nonNull(entry.getValue().getOptions()))
[camel-spring-boot] 02/02: Regen
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-spring-boot.git
commit 69786b9a8b19427b39221af0be38f365e0b4ef3c
Author: Claus Ibsen
AuthorDate: Tue May 26 16:15:07 2020 +0200
Regen
---
.../apache/camel/springboot/catalog/components/kafka.json| 4 ++--
components-starter/camel-corda-starter/pom.xml | 12
components-starter/camel-iota-starter/pom.xml| 12
.../camel-kafka-starter/src/main/docs/kafka-starter.adoc | 2 +-
.../kafka/springboot/KafkaComponentConfiguration.java| 6 --
docs/modules/ROOT/pages/kafka-starter.adoc | 2 +-
6 files changed, 8 insertions(+), 30 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index 69280d3..958623e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -103,7 +103,7 @@
"saslMechanism": { "kind": "property", "displayName": "Sasl Mechanism",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "GSSAPI", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The Simple Authentication and Security Layer
(SASL) Mechanism used. For the valid values see http:\/\/ [...]
"securityProtocol": { "kind": "property", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "PLAINTEXT", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Protocol used to communicate with brokers.
SASL_PLAINTEXT, PLAINTEXT and SSL are supported" },
"sslCipherSuites": { "kind": "property", "displayName": "Ssl Cipher
Suites", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "A list of cipher suites. This is a named
combination of authentication, encryption, MAC and key exchange algorithm used
to [...]
-"sslContextParameters": { "kind": "property", "displayName": "Ssl Context
Parameters", "group": "security", "label": "common,security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "SSL configuration using a Camel
SSLContextParameters object. If configured it's [...]
+"sslContextParameters": { "kind": "property", "displayName": "Ssl Context
Parameters", "group": "security", "label": "common,security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "SSL configuration using a Camel
SSLContextParameters object. If configured it's [...]
"sslEnabledProtocols": { "kind": "property", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "TLSv1.2", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and TLSv1 are enable [...]
"sslEndpointAlgorithm": { "kind": "property", "displayName": "Ssl Endpoint
Algorithm", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The endpoint identification algorithm to
validate server hostname using server certificate." },
"sslKeymanagerAlgorithm": { "kind": "property", "displayName": "Ssl
Keymanager Algorithm", "group":
[camel] branch master updated (d731a6d -> 84ee152)
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 d731a6d Regen docs new 235022e Camel-AWS2-SES: Fixed docs intro new 84ee152 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: components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-ses-component.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 01/02: Camel-AWS2-SES: Fixed docs intro
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 235022e3fc2d50fb24e5c3f9716b06e646db6b1d
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:47:51 2020 +0200
Camel-AWS2-SES: Fixed docs intro
---
components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc
b/components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc
index 6901e88..2fc940b 100644
--- a/components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc
+++ b/components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The ses component supports sending emails with
+The AWS2 SES component supports sending emails with
https://aws.amazon.com/ses[Amazon's SES] service.
Prerequisites
[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 84ee1528c6b6788fe5d20cd8e7b58d8c0523f8c1
Author: Andrea Cosentino
AuthorDate: Tue May 26 15:48:24 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-ses-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-ses-component.adoc
b/docs/components/modules/ROOT/pages/aws2-ses-component.adoc
index 0bbe3bf..7310d4b 100644
--- a/docs/components/modules/ROOT/pages/aws2-ses-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ses-component.adoc
@@ -13,7 +13,7 @@
*{component-header}*
-The ses component supports sending emails with
+The AWS2 SES component supports sending emails with
https://aws.amazon.com/ses[Amazon's SES] service.
Prerequisites
[camel] branch master updated (555910f -> 234c168)
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 555910f Camel-AWS2-SQS: Fixed Docs intro new 4eaad66 Camel-AWS2-Translate: Fixed docs intro new 234c168 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: .../camel-aws2-translate/src/main/docs/aws2-translate-component.adoc | 3 +-- docs/components/modules/ROOT/pages/aws2-sqs-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-translate-component.adoc | 3 +-- 3 files changed, 3 insertions(+), 5 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 234c168e71a3641aa9490c306adabbb896b37315
Author: Andrea Cosentino
AuthorDate: Tue May 26 17:37:32 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-sqs-component.adoc | 2 +-
docs/components/modules/ROOT/pages/aws2-translate-component.adoc | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
index 75e4120..dcabcc8 100644
--- a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
@@ -13,7 +13,7 @@
*{component-header}*
-The sqs component supports sending and receiving messages to
+The AWS2 SQS component supports sending and receiving messages to
https://aws.amazon.com/sqs[Amazon's SQS] service.
Prerequisites
diff --git a/docs/components/modules/ROOT/pages/aws2-translate-component.adoc
b/docs/components/modules/ROOT/pages/aws2-translate-component.adoc
index df4690e..9a0c233 100644
--- a/docs/components/modules/ROOT/pages/aws2-translate-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-translate-component.adoc
@@ -11,10 +11,9 @@
*Since Camel {since}*
-
*{component-header}*
-The Translate component supports translate a text in multiple languages.
+The AWS2 Translate component supports translate a text in multiple languages.
https://aws.amazon.com/translate/[AWS Translate] clusters instances.
Prerequisites
[camel] branch master updated (945dc38 -> 99f9a08)
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 945dc38 Regen docs new 7edb8bc Camel-AWS2-CW: Fixed docs intro new 99f9a08 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: components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-cw-component.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 01/02: Camel-AWS2-CW: Fixed docs intro
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 7edb8bc8d71f75a4332d0576305256388a546e7e
Author: Andrea Cosentino
AuthorDate: Tue May 26 08:48:35 2020 +0200
Camel-AWS2-CW: Fixed docs intro
---
components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
b/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
index 918f28c..f977b0c 100644
--- a/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
+++ b/components/camel-aws2-cw/src/main/docs/aws2-cw-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The CW component allows messages to be sent to an
+The AWS2 Cloudwatch component allows messages to be sent to an
https://aws.amazon.com/cloudwatch/[Amazon CloudWatch] metrics. The
implementation of the Amazon API is provided by
the https://aws.amazon.com/sdkforjava/[AWS SDK].
[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 99f9a084ea7ea4025504dfbeda2a82ce294bc80c
Author: Andrea Cosentino
AuthorDate: Tue May 26 08:49:06 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-cw-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-cw-component.adoc
b/docs/components/modules/ROOT/pages/aws2-cw-component.adoc
index af55f51..469c68a 100644
--- a/docs/components/modules/ROOT/pages/aws2-cw-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-cw-component.adoc
@@ -13,7 +13,7 @@
*{component-header}*
-The CW component allows messages to be sent to an
+The AWS2 Cloudwatch component allows messages to be sent to an
https://aws.amazon.com/cloudwatch/[Amazon CloudWatch] metrics. The
implementation of the Amazon API is provided by
the https://aws.amazon.com/sdkforjava/[AWS SDK].
[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 945dc38ae3c15adfcd4ed1b6b5009e7b7bbaf323
Author: Andrea Cosentino
AuthorDate: Tue May 26 08:42:48 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/amqp-component.adoc | 10 --
1 file changed, 10 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc
b/docs/components/modules/ROOT/pages/amqp-component.adoc
index 5f43275..d488c77 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -9,16 +9,6 @@
:supportLevel: Stable
:component-header: Both producer and consumer are supported
-// HEADER START
-*Both producer and consumer is supported*
-// HEADER END
-
-:artifactId: camel-amqp
-:description: Messaging with AMQP protocol using Apache QPid Client.
-:since: 1.2
-:supportLevel: Stable
-:component-header: Both producer and consumer are supported
-
*Since Camel {since}*
*{component-header}*
[camel] 01/02: Camel-AMQP: Fixed 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 3ead4da0bea8ee7efcd29f11c291ad2d2661409c
Author: Andrea Cosentino
AuthorDate: Tue May 26 08:40:28 2020 +0200
Camel-AMQP: Fixed docs
---
components/camel-amqp/src/main/docs/amqp-component.adoc | 10 --
1 file changed, 10 deletions(-)
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc
b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 35eecc9..42ed601 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -7,16 +7,6 @@
:supportLevel: Stable
:component-header: Both producer and consumer are supported
-// HEADER START
-*Both producer and consumer is supported*
-// HEADER END
-
-:artifactId: camel-amqp
-:description: Messaging with AMQP protocol using Apache QPid Client.
-:since: 1.2
-:supportLevel: Stable
-:component-header: Both producer and consumer are supported
-
*Since Camel {since}*
*{component-header}*
[camel] branch master updated (4bd14d0 -> 945dc38)
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 4bd14d0 CAMEL-14499: Polished new 3ead4da Camel-AMQP: Fixed docs new 945dc38 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: components/camel-amqp/src/main/docs/amqp-component.adoc | 10 -- docs/components/modules/ROOT/pages/amqp-component.adoc | 10 -- 2 files changed, 20 deletions(-)
[camel] branch master updated: CAMEL-15110: camel-core - ResourceHelper to have method to tell if the resource is classpath or not
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 3e17141 CAMEL-15110: camel-core - ResourceHelper to have method to
tell if the resource is classpath or not
3e17141 is described below
commit 3e17141d88983a0830dc21135bec536a53513b6b
Author: Claus Ibsen
AuthorDate: Tue May 26 09:34:44 2020 +0200
CAMEL-15110: camel-core - ResourceHelper to have method to tell if the
resource is classpath or not
---
.../java/org/apache/camel/util/ResourceHelperTest.java | 12
.../java/org/apache/camel/support/ResourceHelper.java| 16 +++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java
index 31b0869..bef5a3b 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java
@@ -320,6 +320,18 @@ public class ResourceHelperTest extends TestSupport {
}
@Test
+public void testIsClasspath() throws Exception {
+assertFalse(ResourceHelper.isClasspathUri("direct:foo"));
+assertFalse(ResourceHelper.isClasspathUri("file:foo/bar.properties"));
+assertFalse(ResourceHelper.isClasspathUri("http://camel.apache.org;));
+assertFalse(ResourceHelper.isClasspathUri(""));
+assertFalse(ResourceHelper.isClasspathUri(null));
+
+
assertTrue(ResourceHelper.isClasspathUri("classpath:foo/bar.properties"));
+assertTrue(ResourceHelper.isClasspathUri("foo/bar.properties"));
+}
+
+@Test
public void testGetScheme() throws Exception {
assertEquals("file:", ResourceHelper.getScheme("file:myfile.txt"));
assertEquals("classpath:",
ResourceHelper.getScheme("classpath:myfile.txt"));
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ResourceHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ResourceHelper.java
index 8046832..960a7cd 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ResourceHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ResourceHelper.java
@@ -42,6 +42,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.util.AntPathMatcher;
import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
@@ -249,13 +250,26 @@ public final class ResourceHelper {
}
/**
+ * Is the given uri a classpath uri?
+ *
+ * @param uri the uri
+ * @return true if the uri starts with classpath: or has
no scheme and therefore would otherwise be loaded from classpath by default.
+ */
+public static boolean isClasspathUri(String uri) {
+if (ObjectHelper.isEmpty(uri)) {
+return false;
+}
+return uri.startsWith("classpath:") || uri.indexOf(':') == -1;
+}
+
+/**
* Is the given uri a http uri?
*
* @param uri the uri
* @return true if the uri starts with http: or
https:
*/
public static boolean isHttpUri(String uri) {
-if (uri == null) {
+if (ObjectHelper.isEmpty(uri)) {
return false;
}
return uri.startsWith("http:") || uri.startsWith("https:");
[camel] 02/02: Camel-AWS2-ECS: Fixed docs intro
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 a7b9257108474f34afa59da33b427f663a48ff5c
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:10:39 2020 +0200
Camel-AWS2-ECS: Fixed docs intro
---
components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
b/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
index 8ef70d1..fe10992 100644
--- a/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
+++ b/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The ECS component supports create, delete, describe and list
+The AWS2 ECS component supports create, delete, describe and list
https://aws.amazon.com/ecs/[AWS ECS] clusters instances.
Prerequisites
[camel] 01/02: Camel-AWS2-ECS: Cleanup
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 bbc9cc81af5247d444c0f74a7089281460b9a89e
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:08:39 2020 +0200
Camel-AWS2-ECS: Cleanup
---
components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
b/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
index e88a982..8ef70d1 100644
--- a/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
+++ b/components/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
The ECS component supports create, delete, describe and list
[camel] branch master updated (e437a8c -> a7b92571)
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 e437a8c Regen docs new bbc9cc8 Camel-AWS2-ECS: Cleanup new a7b92571 Camel-AWS2-ECS: Fixed docs intro 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/camel-aws2-ecs/src/main/docs/aws2-ecs-component.adoc | 5 + 1 file changed, 1 insertion(+), 4 deletions(-)
[camel] branch master updated: Fixed potential NPE
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 378ecb3 Fixed potential NPE
378ecb3 is described below
commit 378ecb3477334e9fd4ccf3d2a3cd847cbcfc26e3
Author: Claus Ibsen
AuthorDate: Tue May 26 09:38:30 2020 +0200
Fixed potential NPE
---
.../java/org/apache/camel/main/DefaultConfigurationConfigurer.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 12b0ccc..da6b116 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -370,8 +370,11 @@ public final class DefaultConfigurationConfigurer {
LOG.info("Using HealthCheckRegistry: {}", healthCheckRegistry);
camelContext.setExtension(HealthCheckRegistry.class,
healthCheckRegistry);
} else {
+// okay attempt to inject this camel context into existing health
check (if any)
healthCheckRegistry = HealthCheckRegistry.get(camelContext);
-healthCheckRegistry.setCamelContext(camelContext);
+if (healthCheckRegistry != null) {
+healthCheckRegistry.setCamelContext(camelContext);
+}
}
Set hcrs =
registry.findByType(HealthCheckRepository.class);
if (!hcrs.isEmpty()) {
[camel-spring-boot] branch master updated (ea3c767 -> 0c02773)
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-spring-boot.git. from ea3c767 [create-pull-request] automated change new 6109809 Regen new 0c02773 Fixed ElasticsearchRest ITest 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-starter/camel-corda-starter/pom.xml | 12 components-starter/camel-iota-starter/pom.xml| 12 .../camel/itest/springboot/CamelElasticsearchRestTest.java | 3 --- 3 files changed, 24 insertions(+), 3 deletions(-)
[camel-spring-boot] 02/02: Fixed ElasticsearchRest ITest
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-spring-boot.git
commit 0c02773cc8083d45c99dbea82849daf329251cc7
Author: Andrea Cosentino
AuthorDate: Tue May 26 09:40:58 2020 +0200
Fixed ElasticsearchRest ITest
---
.../org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
index 61bd66a..e2b2e52 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
@@ -34,9 +34,6 @@ public class CamelElasticsearchRestTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelElasticsearchRestTest.class))
-
.dependency("org.elasticsearch.client:elasticsearch-rest-client-sniffer:7.1.1")
-
.dependency("org.elasticsearch.client:elasticsearch-rest-client:7.1.1")
-
.dependency("org.elasticsearch.client:elasticsearch-rest-high-level-client:7.1.1")
.build();
}
[camel-spring-boot] 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-spring-boot.git
commit 610980944c603ccca9af6d950fb69b1b5160d3d3
Author: Andrea Cosentino
AuthorDate: Tue May 26 09:35:46 2020 +0200
Regen
---
components-starter/camel-corda-starter/pom.xml | 12
components-starter/camel-iota-starter/pom.xml | 12
2 files changed, 24 insertions(+)
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 8559a29..9ae10f6 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
org.apache.camel
camel-corda
${camel-version}
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 0ccac9f..45084aa 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
org.apache.camel
camel-iota
${camel-version}
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+
[camel-quarkus] 01/01: Upgrade to Camel 3.4.0 - WIP
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 commit 4bb8049a099c97cc5faaa5cc531cad492b49e5ea Author: Peter Palaga AuthorDate: Mon May 18 21:53:01 2020 +0200 Upgrade to Camel 3.4.0 - WIP --- docs/modules/ROOT/pages/extensions/ahc-ws.adoc | 4 +- docs/modules/ROOT/pages/extensions/ahc.adoc| 2 +- .../modules/ROOT/pages/extensions/attachments.adoc | 2 +- docs/modules/ROOT/pages/extensions/avro-rpc.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-ec2.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-ecs.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-eks.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-iam.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-kms.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-sns.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-sqs.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-swf.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws2-ec2.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ecs.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-eks.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-iam.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-kms.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-msk.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ses.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-sns.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-sqs.adoc | 2 +- docs/modules/ROOT/pages/extensions/gson.adoc | 2 +- docs/modules/ROOT/pages/extensions/jackson.adoc| 2 +- docs/modules/ROOT/pages/extensions/johnzon.adoc| 2 +- docs/modules/ROOT/pages/extensions/xstream.adoc| 2 +- .../pages/list-of-camel-quarkus-extensions.adoc| 72 +++--- extensions-core/core/runtime/pom.xml | 4 ++ .../camel/quarkus/core/FastCamelContext.java | 5 -- .../component/qute/QuteEndpointConfigurer.java | 5 ++ .../org/apache/camel/component/qute/qute.json | 1 + .../apache/camel/component/qute/QuteEndpoint.java | 2 +- pom.xml| 2 +- poms/bom/pom.xml | 5 ++ 33 files changed, 79 insertions(+), 69 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/ahc-ws.adoc b/docs/modules/ROOT/pages/extensions/ahc-ws.adoc index 429eeb9..c362831 100644 --- a/docs/modules/ROOT/pages/extensions/ahc-ws.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc-ws.adoc @@ -11,8 +11,8 @@ Exchange data with external Websocket servers using Async Http Client. == What's inside -* https://camel.apache.org/components/latest/ahc-wss-component.html[AHC Secure Websocket (Secure) component], URI syntax: `ahc-wss:httpUri` -* https://camel.apache.org/components/latest/ahc-ws-component.html[AHC Websocket component], URI syntax: `ahc-ws:httpUri` +* https://camel.apache.org/components/latest/ahc-wss-component.html[Async HTTP Client (AHC) Secure Websocket (Secure) component], URI syntax: `ahc-wss:httpUri` +* https://camel.apache.org/components/latest/ahc-ws-component.html[Async HTTP Client (AHC) Websocket component], URI syntax: `ahc-ws:httpUri` Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/ahc.adoc b/docs/modules/ROOT/pages/extensions/ahc.adoc index fe8e992..23afcf1 100644 --- a/docs/modules/ROOT/pages/extensions/ahc.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc.adoc @@ -11,7 +11,7 @@ Call external HTTP services using Async Http Client. == What's inside -* https://camel.apache.org/components/latest/ahc-component.html[AHC component], URI syntax: `ahc:httpUri` +* https://camel.apache.org/components/latest/ahc-component.html[Async HTTP Client (AHC) component], URI syntax: `ahc:httpUri` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/attachments.adoc b/docs/modules/ROOT/pages/extensions/attachments.adoc index d47fc26..2555da8 100644 --- a/docs/modules/ROOT/pages/extensions/attachments.adoc +++ b/docs/modules/ROOT/pages/extensions/attachments.adoc @@ -7,7 +7,7 @@ [.badges] [.badge-key]##Since Camel Quarkus##[.badge-version]##0.3.0## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-supported]##supported## -Java Attachments support for Camel Message +Support for attachments on Camel messages == What's inside diff --git a/docs/modules/ROOT/pages/extensions/avro-rpc.adoc b/docs/modules/ROOT/pages/extensions/avro-rpc.adoc index b915289..8d601be 100644 --- a/docs/modules/ROOT/pages/extensions/avro-rpc.adoc +++ b/docs/modules/ROOT/pages/extensions/avro-rpc.adoc @@ -11,7 +11,7 @@ Produce or consume Apache Avro RPC services. == What's inside -*
[camel-quarkus] branch camel-master updated (de0cbcc -> 4bb8049)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard de0cbcc Upgrade to Camel 3.4.0 (WiP)
add 4c4b8c4 Added native support for avro dataformat #1180
add ab44739 Add MongoDB GridFS native support
add 35f77ad Restored Kudu IT tests and added a troubleshooting section
#1206
add a97b3d1 Disabled Kudu itests on JRE 8 as not supported
add 34298be Debezium PostgresSQL Connector native support #1191
add 6b01c12 Add support for MicroProfile Fault Tolerance
add 17c9d0d Use random port for quarkus.http.test-ssl-port
add 786c86b Fix #1232 Per-extension documentation pages
add 49cb943 Enable update-extension-doc-page mojo in newly scaffolded
extensions #1232
add 7d5d932 Automatically cancel redundant workflow runs
add f282a95 Register required AHC classes for runtime initialization
add 14dbc8e Fix CamelContextCustomizerTest compilation errors
add f70e74f Upgrade to Quarkus 1.5.0.CR1
add 16a2adb Fixup Debezium PostgresSQL Connector native support #1191
add e0ac7cc Handle cases where branch-commit property is empty due to bad
rebase
add ee95707 #1232 Migrate existing extension pages to
update-extension-doc-page mojo
add f9a50ce #1232 Generate missing extension pages using
update-extension-doc-page mojo
add 0ee95d5 Fix #1243 Document how quarkus-extemsion.yaml is generated
add 82de7b5 Re-generate quarkus-extension.yaml files
add 1053f6d Fix #1255 Document how extension pages are generated
add b6d8209 Split doc pages to user-guide and contributor-guide
directories and set redirects
add 015e13d Status badges on extension pages
add 2b0fd99 Make sure all extensions present in the List of extensions
page have an extension page
new 4bb8049 Upgrade to Camel 3.4.0 - WIP
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 (de0cbcc)
\
N -- N -- N refs/heads/camel-master (4bb8049)
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:
.github/test-categories.yaml | 2 +
.../workflows/cancel-previous-runs-cron.yaml | 28 +-
.github/workflows/ci-build.yaml| 4 +
docs/modules/ROOT/nav.adoc | 22 +-
.../ROOT/pages/{ => contributor-guide}/ci.adoc | 1 +
.../create-new-extension.adoc | 29 +-
.../contributor-guide/extension-documentation.adoc | 27 ++
.../contributor-guide/extension-metadata.adoc | 42 +++
.../index.adoc}| 5 +-
.../promote-jvm-to-native.adoc | 26 +-
.../{ => contributor-guide}/release-guide.adoc | 1 +
docs/modules/ROOT/pages/extensions/activemq.adoc | 28 ++
docs/modules/ROOT/pages/extensions/ahc-ws.adoc | 29 ++
docs/modules/ROOT/pages/extensions/ahc.adoc| 30 +-
docs/modules/ROOT/pages/extensions/amqp.adoc | 28 ++
.../modules/ROOT/pages/extensions/attachments.adoc | 28 ++
docs/modules/ROOT/pages/extensions/avro-rpc.adoc | 28 ++
docs/modules/ROOT/pages/extensions/avro.adoc | 47 +++
docs/modules/ROOT/pages/extensions/aws-ec2.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-ecs.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-eks.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-iam.adoc| 28 ++
.../modules/ROOT/pages/extensions/aws-kinesis.adoc | 29 ++
docs/modules/ROOT/pages/extensions/aws-kms.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-lambda.adoc | 28 ++
docs/modules/ROOT/pages/extensions/aws-s3.adoc | 28 ++
docs/modules/ROOT/pages/extensions/aws-sdb.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-sns.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-sqs.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws-swf.adoc| 28 ++
.../ROOT/pages/extensions/aws-translate.adoc | 28 ++
docs/modules/ROOT/pages/extensions/aws2-cw.adoc| 28 ++
docs/modules/ROOT/pages/extensions/aws2-ddb.adoc | 29 ++
docs/modules/ROOT/pages/extensions/aws2-ec2.adoc | 28
[camel] branch master updated (9238c16 -> cd91f10)
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 9238c16 Regen docs new d91eecc Camel-AWS2-DynamoDB Streams: Fixed docs intro new cd91f10 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: components/camel-aws2-ddb/src/main/docs/aws2-ddbstream-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-ddbstream-component.adoc | 2 +- 2 files changed, 2 insertions(+), 2 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 cd91f10550b68af9c3d54fb27170f40b6fdbd006
Author: Andrea Cosentino
AuthorDate: Tue May 26 10:38:25 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-ddbstream-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-ddbstream-component.adoc
b/docs/components/modules/ROOT/pages/aws2-ddbstream-component.adoc
index 6c261f3..bfa4d09 100644
--- a/docs/components/modules/ROOT/pages/aws2-ddbstream-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ddbstream-component.adoc
@@ -13,7 +13,7 @@
*{component-header}*
-The DynamoDB Stream component supports receiving messages from
+The AWS2 DynamoDB Stream component supports receiving messages from
Amazon DynamoDB Stream service.
Prerequisites
[camel] 01/02: Camel-AWS2-DynamoDB Streams: Fixed docs intro
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 d91eeccdf56e6f6e5e6dfa83b04405d153230b58
Author: Andrea Cosentino
AuthorDate: Tue May 26 10:37:40 2020 +0200
Camel-AWS2-DynamoDB Streams: Fixed docs intro
---
components/camel-aws2-ddb/src/main/docs/aws2-ddbstream-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-aws2-ddb/src/main/docs/aws2-ddbstream-component.adoc
b/components/camel-aws2-ddb/src/main/docs/aws2-ddbstream-component.adoc
index fe1d2ff..fb3369c 100644
--- a/components/camel-aws2-ddb/src/main/docs/aws2-ddbstream-component.adoc
+++ b/components/camel-aws2-ddb/src/main/docs/aws2-ddbstream-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The DynamoDB Stream component supports receiving messages from
+The AWS2 DynamoDB Stream component supports receiving messages from
Amazon DynamoDB Stream service.
Prerequisites
[camel-quarkus] branch camel-master updated (4bb8049 -> cae2ae3)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 4bb8049 Upgrade to Camel 3.4.0 - WIP new cae2ae3 Upgrade to Camel 3.4.0 - WIP 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 (4bb8049) \ N -- N -- N refs/heads/camel-master (cae2ae3) 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: .../src/test/java/org/apache/camel/component/qute/QuteEndpointTest.java | 1 + .../src/test/java/org/apache/camel/component/qute/QuteTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
[camel-quarkus] 01/01: Upgrade to Camel 3.4.0 - WIP
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 commit cae2ae3e534c16a08cb451bad9b9b98e58cd58ae Author: Peter Palaga AuthorDate: Mon May 18 21:53:01 2020 +0200 Upgrade to Camel 3.4.0 - WIP --- docs/modules/ROOT/pages/extensions/ahc-ws.adoc | 4 +- docs/modules/ROOT/pages/extensions/ahc.adoc| 2 +- .../modules/ROOT/pages/extensions/attachments.adoc | 2 +- docs/modules/ROOT/pages/extensions/avro-rpc.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-ec2.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-ecs.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-eks.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-iam.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-kms.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-sns.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-sqs.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws-swf.adoc| 2 +- docs/modules/ROOT/pages/extensions/aws2-ec2.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ecs.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-eks.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-iam.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-kms.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-msk.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ses.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-sns.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-sqs.adoc | 2 +- docs/modules/ROOT/pages/extensions/gson.adoc | 2 +- docs/modules/ROOT/pages/extensions/jackson.adoc| 2 +- docs/modules/ROOT/pages/extensions/johnzon.adoc| 2 +- docs/modules/ROOT/pages/extensions/xstream.adoc| 2 +- .../pages/list-of-camel-quarkus-extensions.adoc| 72 +++--- extensions-core/core/runtime/pom.xml | 4 ++ .../camel/quarkus/core/FastCamelContext.java | 5 -- .../component/qute/QuteEndpointConfigurer.java | 5 ++ .../org/apache/camel/component/qute/qute.json | 1 + .../apache/camel/component/qute/QuteEndpoint.java | 2 +- .../camel/component/qute/QuteEndpointTest.java | 1 + .../org/apache/camel/component/qute/QuteTest.java | 2 +- pom.xml| 2 +- poms/bom/pom.xml | 5 ++ 35 files changed, 81 insertions(+), 70 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/ahc-ws.adoc b/docs/modules/ROOT/pages/extensions/ahc-ws.adoc index 429eeb9..c362831 100644 --- a/docs/modules/ROOT/pages/extensions/ahc-ws.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc-ws.adoc @@ -11,8 +11,8 @@ Exchange data with external Websocket servers using Async Http Client. == What's inside -* https://camel.apache.org/components/latest/ahc-wss-component.html[AHC Secure Websocket (Secure) component], URI syntax: `ahc-wss:httpUri` -* https://camel.apache.org/components/latest/ahc-ws-component.html[AHC Websocket component], URI syntax: `ahc-ws:httpUri` +* https://camel.apache.org/components/latest/ahc-wss-component.html[Async HTTP Client (AHC) Secure Websocket (Secure) component], URI syntax: `ahc-wss:httpUri` +* https://camel.apache.org/components/latest/ahc-ws-component.html[Async HTTP Client (AHC) Websocket component], URI syntax: `ahc-ws:httpUri` Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/ahc.adoc b/docs/modules/ROOT/pages/extensions/ahc.adoc index fe8e992..23afcf1 100644 --- a/docs/modules/ROOT/pages/extensions/ahc.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc.adoc @@ -11,7 +11,7 @@ Call external HTTP services using Async Http Client. == What's inside -* https://camel.apache.org/components/latest/ahc-component.html[AHC component], URI syntax: `ahc:httpUri` +* https://camel.apache.org/components/latest/ahc-component.html[Async HTTP Client (AHC) component], URI syntax: `ahc:httpUri` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/attachments.adoc b/docs/modules/ROOT/pages/extensions/attachments.adoc index d47fc26..2555da8 100644 --- a/docs/modules/ROOT/pages/extensions/attachments.adoc +++ b/docs/modules/ROOT/pages/extensions/attachments.adoc @@ -7,7 +7,7 @@ [.badges] [.badge-key]##Since Camel Quarkus##[.badge-version]##0.3.0## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-supported]##supported## -Java Attachments support for Camel Message +Support for attachments on Camel messages == What's inside diff --git a/docs/modules/ROOT/pages/extensions/avro-rpc.adoc b/docs/modules/ROOT/pages/extensions/avro-rpc.adoc index b915289..8d601be 100644 --- a/docs/modules/ROOT/pages/extensions/avro-rpc.adoc +++ b/docs/modules/ROOT/pages/extensions/avro-rpc.adoc @@ -11,7 +11,7
[camel] 01/02: Upgrade Elasticsearch to version 7.6.2
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 8fe005577bddffb9d5b4a62064179f11621a900a Author: Andrea Cosentino AuthorDate: Tue May 26 09:11:21 2020 +0200 Upgrade Elasticsearch to version 7.6.2 --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index df05e4b..33f3c35 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -157,9 +157,9 @@ 8.0.16 2.1.5 3.8.1 - 7.3.2 - 7.3.2.0 -7.3.2 + 7.6.2 + 7.6.2.0 +7.6.2 1.3 1.7.0.CR3 2.18.0
[camel] branch master updated (99f9a08 -> 4dd3905)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 99f9a08 Regen docs add 4dd3905 CAMEL-15075: Add a note about Kafka only supports loading keystore from file system. No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/kafka/kafka.json| 4 ++-- .../camel-kafka/src/main/docs/kafka-component.adoc | 4 ++-- .../camel/component/kafka/KafkaConfiguration.java | 3 +++ .../component/dsl/KafkaComponentBuilderFactory.java| 3 +++ .../endpoint/dsl/KafkaEndpointBuilderFactory.java | 18 ++ 5 files changed, 28 insertions(+), 4 deletions(-)
[camel] branch master updated (4dd3905 -> cceb4e8)
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 4dd3905 CAMEL-15075: Add a note about Kafka only supports loading keystore from file system. new 8fe0055 Upgrade Elasticsearch to version 7.6.2 new cceb4e8 Sync Properties 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 | 6 +++--- parent/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
[camel] 02/02: Sync Properties
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 cceb4e8750362b5f3d3312f278cc2eaca88b5f4b Author: Andrea Cosentino AuthorDate: Tue May 26 09:17:54 2020 +0200 Sync Properties --- camel-dependencies/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 224b5b7..e1a131c 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -177,9 +177,9 @@ 3.1.3 2.1.5 3.8.1 - 7.3.2.0 - 7.3.2 -7.3.2 + 7.6.2.0 + 7.6.2 +7.6.2 1.3 1.7.0.CR3 2.18.0
[camel] 01/02: Camel-AWS2-DynamoDB: Fixed docs intro
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 95ebe7d99c39879d4fe90931648d30e7e512ec88
Author: Andrea Cosentino
AuthorDate: Tue May 26 10:34:32 2020 +0200
Camel-AWS2-DynamoDB: Fixed docs intro
---
components/camel-aws2-ddb/src/main/docs/aws2-ddb-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-ddb/src/main/docs/aws2-ddb-component.adoc
b/components/camel-aws2-ddb/src/main/docs/aws2-ddb-component.adoc
index f946570..c82f98a 100644
--- a/components/camel-aws2-ddb/src/main/docs/aws2-ddb-component.adoc
+++ b/components/camel-aws2-ddb/src/main/docs/aws2-ddb-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The DynamoDB component supports storing and retrieving data from/to
+The AWS2 DynamoDB component supports storing and retrieving data from/to
https://aws.amazon.com/dynamodb[Amazon's DynamoDB] service.
Prerequisites
[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 9238c16b7a59f61f44584eb44552f1255df0f651
Author: Andrea Cosentino
AuthorDate: Tue May 26 10:36:03 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-ddb-component.adoc | 2 +-
docs/components/modules/ROOT/pages/kafka-component.adoc| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-ddb-component.adoc
b/docs/components/modules/ROOT/pages/aws2-ddb-component.adoc
index f5f4b9b..befcf59 100644
--- a/docs/components/modules/ROOT/pages/aws2-ddb-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ddb-component.adoc
@@ -13,7 +13,7 @@
*{component-header}*
-The DynamoDB component supports storing and retrieving data from/to
+The AWS2 DynamoDB component supports storing and retrieving data from/to
https://aws.amazon.com/dynamodb[Amazon's DynamoDB] service.
Prerequisites
diff --git a/docs/components/modules/ROOT/pages/kafka-component.adoc
b/docs/components/modules/ROOT/pages/kafka-component.adoc
index 5c3c539..c5dcb5b 100644
--- a/docs/components/modules/ROOT/pages/kafka-component.adoc
+++ b/docs/components/modules/ROOT/pages/kafka-component.adoc
@@ -131,7 +131,7 @@ The Kafka component supports 97 options, which are listed
below.
| *saslMechanism* (security) | The Simple Authentication and Security Layer
(SASL) Mechanism used. For the valid values see
\http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI
| String
| *securityProtocol* (security) | Protocol used to communicate with brokers.
SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
| *sslCipherSuites* (security) | A list of cipher suites. This is a named
combination of authentication, encryption, MAC and key exchange algorithm used
to negotiate the security settings for a network connection using TLS or SSL
network protocol.By default all the available cipher suites are supported. | |
String
-| *sslContextParameters* (security) | SSL configuration using a Camel
SSLContextParameters object. If configured it's applied before the other SSL
endpoint parameters. | | SSLContextParameters
+| *sslContextParameters* (security) | SSL configuration using a Camel
SSLContextParameters object. If configured it's applied before the other SSL
endpoint parameters. NOTE: Kafka only supports loading keystore from file
locations, so prefix the location with file: in the KeyStoreParameters.resource
option. | | SSLContextParameters
| *sslEnabledProtocols* (security) | The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default. | TLSv1.2 |
String
| *sslEndpointAlgorithm* (security) | The endpoint identification algorithm to
validate server hostname using server certificate. | | String
| *sslKeymanagerAlgorithm* (security) | The algorithm used by key manager
factory for SSL connections. Default value is the key manager factory algorithm
configured for the Java Virtual Machine. | SunX509 | String
@@ -259,7 +259,7 @@ with the following path and query parameters:
| *saslMechanism* (security) | The Simple Authentication and Security Layer
(SASL) Mechanism used. For the valid values see
\http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI
| String
| *securityProtocol* (security) | Protocol used to communicate with brokers.
SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
| *sslCipherSuites* (security) | A list of cipher suites. This is a named
combination of authentication, encryption, MAC and key exchange algorithm used
to negotiate the security settings for a network connection using TLS or SSL
network protocol.By default all the available cipher suites are supported. | |
String
-| *sslContextParameters* (security) | SSL configuration using a Camel
SSLContextParameters object. If configured it's applied before the other SSL
endpoint parameters. | | SSLContextParameters
+| *sslContextParameters* (security) | SSL configuration using a Camel
SSLContextParameters object. If configured it's applied before the other SSL
endpoint parameters. NOTE: Kafka only supports loading keystore from file
locations, so prefix the location with file: in the KeyStoreParameters.resource
option. | | SSLContextParameters
| *sslEnabledProtocols* (security) | The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default. | TLSv1.2 |
String
| *sslEndpointAlgorithm* (security) | The endpoint identification algorithm to
validate server hostname using server certificate. | | String
| *sslKeymanagerAlgorithm* (security) | The algorithm used by key manager
factory for SSL connections. Default value is the key manager factory algorithm
configured for the Java Virtual Machine. | SunX509 | String
[camel] branch master updated (378ecb3 -> 9238c16)
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 378ecb3 Fixed potential NPE new 95ebe7d Camel-AWS2-DynamoDB: Fixed docs intro new 9238c16 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: components/camel-aws2-ddb/src/main/docs/aws2-ddb-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-ddb-component.adoc | 2 +- docs/components/modules/ROOT/pages/kafka-component.adoc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch master updated (cd91f10 -> e437a8c)
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 cd91f10 Regen docs new 446f103 Camel-AWS2-EC2: Fixed docs intro new e437a8c 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: components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-ec2-component.adoc | 2 +- 2 files changed, 2 insertions(+), 2 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 e437a8cdcabb882dd7d1bc2c60040d996a6a5e46
Author: Andrea Cosentino
AuthorDate: Tue May 26 10:51:56 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-ec2-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
b/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
index 323207f..c7b3a46 100644
--- a/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
@@ -13,7 +13,7 @@
*{component-header}*
-The EC2 component supports the ability to create, run, start, stop and
terminate
+The AWS2 EC2 component supports the ability to create, run, start, stop and
terminate
https://aws.amazon.com/ec2/[AWS EC2] instances.
Prerequisites
[camel] 01/02: Camel-AWS2-EC2: Fixed docs intro
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 446f103ca4c6aa76eedc08d9d1df1b63d6ea7964
Author: Andrea Cosentino
AuthorDate: Tue May 26 10:46:20 2020 +0200
Camel-AWS2-EC2: Fixed docs intro
---
components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
b/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
index 7d85394..23572d1 100644
--- a/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
+++ b/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The EC2 component supports the ability to create, run, start, stop and
terminate
+The AWS2 EC2 component supports the ability to create, run, start, stop and
terminate
https://aws.amazon.com/ec2/[AWS EC2] instances.
Prerequisites
[camel] 03/03: 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 39470c14b287b8a378246984f363269bf4b47df9
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:21:37 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-eks-component.adoc | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-eks-component.adoc
b/docs/components/modules/ROOT/pages/aws2-eks-component.adoc
index 23758a9..8c7f130 100644
--- a/docs/components/modules/ROOT/pages/aws2-eks-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-eks-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
-The EKS component supports create, delete, describe and list
+The AWS2 EKS component supports create, delete, describe and list
https://aws.amazon.com/eks/[AWS EKS] clusters instances.
Prerequisites
[camel] 02/03: Camel-AWS2-EKS: Fixed docs intro
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 817477c0d32a4c80c9ad23f655633d01af4569b5
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:20:26 2020 +0200
Camel-AWS2-EKS: Fixed docs intro
---
components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
b/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
index dae9655..e49fd82 100644
--- a/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
+++ b/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The EKS component supports create, delete, describe and list
+The AWS2 EKS component supports create, delete, describe and list
https://aws.amazon.com/eks/[AWS EKS] clusters instances.
Prerequisites
[camel] 01/03: Camel-AWS2-EKS: Cleanup
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 fe2081039712ea3ea37d829de70e677e6cfe698b
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:19:58 2020 +0200
Camel-AWS2-EKS: Cleanup
---
components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc | 3 ---
docs/components/modules/ROOT/pages/aws2-ecs-component.adoc | 5 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
b/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
index 1d87edb..dae9655 100644
--- a/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
+++ b/components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
The EKS component supports create, delete, describe and list
diff --git a/docs/components/modules/ROOT/pages/aws2-ecs-component.adoc
b/docs/components/modules/ROOT/pages/aws2-ecs-component.adoc
index be67d17..40c5427 100644
--- a/docs/components/modules/ROOT/pages/aws2-ecs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ecs-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
-The ECS component supports create, delete, describe and list
+The AWS2 ECS component supports create, delete, describe and list
https://aws.amazon.com/ecs/[AWS ECS] clusters instances.
Prerequisites
[camel] branch master updated (a7b92571 -> 39470c1)
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 a7b92571 Camel-AWS2-ECS: Fixed docs intro new fe20810 Camel-AWS2-EKS: Cleanup new 817477c Camel-AWS2-EKS: Fixed docs intro new 39470c1 Regen docs 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: components/camel-aws2-eks/src/main/docs/aws2-eks-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-ecs-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-eks-component.adoc | 5 + 3 files changed, 3 insertions(+), 12 deletions(-)
[camel] 04/04: 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 026cdfcae2d512808f723890617079b2cd0e05de
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:32:30 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-iam-component.adoc | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-iam-component.adoc
b/docs/components/modules/ROOT/pages/aws2-iam-component.adoc
index f9e9726..2bc314e 100644
--- a/docs/components/modules/ROOT/pages/aws2-iam-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-iam-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
-The KMS component supports create, run, start, stop and terminate
+The AWS2 IAM component supports create, run, start, stop and terminate
https://aws.amazon.com/iam/[AWS IAM] instances.
Prerequisites
[camel] branch master updated (39470c1 -> 026cdfc)
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 39470c1 Regen docs new 5603394 Camel-AWS2-IAM: Cleanup new 8edd24d Camel-AWS2-IAM: Fixed docs intro new 8562aa3 Camel-AWS2-IAM: Fixed docs intro new 026cdfc Regen docs 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: components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-iam-component.adoc | 5 + 2 files changed, 2 insertions(+), 8 deletions(-)
[camel] 02/04: Camel-AWS2-IAM: Fixed docs intro
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 8edd24dd443554c13263c5e1abf5448fb72e6ff7
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:23:30 2020 +0200
Camel-AWS2-IAM: Fixed docs intro
---
components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
b/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
index fb932c4..b6e1206 100644
--- a/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
+++ b/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The KMS component supports create, run, start, stop and terminate
+The AWS2 KMS component supports create, run, start, stop and terminate
https://aws.amazon.com/iam/[AWS IAM] instances.
Prerequisites
[camel] 01/04: Camel-AWS2-IAM: Cleanup
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 56033942666c36dda273d0fe66b6f0baa14d88e8
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:22:58 2020 +0200
Camel-AWS2-IAM: Cleanup
---
components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
b/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
index 61c3473..fb932c4 100644
--- a/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
+++ b/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
The KMS component supports create, run, start, stop and terminate
[camel] 03/04: Camel-AWS2-IAM: Fixed docs intro
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 8562aa368297835db4a7595d6d6f0dd10f84e2c1
Author: Andrea Cosentino
AuthorDate: Tue May 26 11:23:48 2020 +0200
Camel-AWS2-IAM: Fixed docs intro
---
components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
b/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
index b6e1206..1205164 100644
--- a/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
+++ b/components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The AWS2 KMS component supports create, run, start, stop and terminate
+The AWS2 IAM component supports create, run, start, stop and terminate
https://aws.amazon.com/iam/[AWS IAM] instances.
Prerequisites
[camel-karaf] branch master updated: Upgrade Elasticsearch to version 7.6.2
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-karaf.git The following commit(s) were added to refs/heads/master by this push: new 85f62ec Upgrade Elasticsearch to version 7.6.2 85f62ec is described below commit 85f62eceefc643179fd452742beb9662d3b1a617 Author: Andrea Cosentino AuthorDate: Tue May 26 11:11:39 2020 +0200 Upgrade Elasticsearch to version 7.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8459e7f..709f860 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ 1.0.0.Final 2.1.5_1 2.10.6 - 7.3.2_1 + 7.6.2_1 0.3.0 2.4.13_1 1.2.62_1
[camel] branch master updated (026cdfc -> 2de7973)
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 026cdfc Regen docs add 0a24b97 Camel-AWS2-Kinesis: Fixes docs intro add 7e5f660 Regen docs add c231c33 Camel-AWS2-Kinesis-Firehose: Fixed docs intro add 2de7973 Regen docs No new revisions were added by this update. Summary of changes: components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-component.adoc | 2 +- .../src/main/docs/aws2-kinesis-firehose-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
[camel] 01/03: Camel-AWS2-KMS: Cleanup
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 3218e0c34fdeaa6b51685750a5d7d5ce36da5f11
Author: Andrea Cosentino
AuthorDate: Tue May 26 12:24:22 2020 +0200
Camel-AWS2-KMS: Cleanup
---
components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
b/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
index caccacb..1c3301a 100644
--- a/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
+++ b/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
@@ -9,9 +9,6 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
The KMS component supports the ability to work with keys stored in
[camel] branch master updated (2de7973 -> c7b65fa)
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 2de7973 Regen docs new 3218e0c Camel-AWS2-KMS: Cleanup new 868856f Camel-AWS2-KMS: Fixed docs intro new c7b65fa Regen docs 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: components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc | 5 + docs/components/modules/ROOT/pages/aws2-kms-component.adoc | 5 + 2 files changed, 2 insertions(+), 8 deletions(-)
[camel] 03/03: 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 c7b65fa14c1d62d0cb4f3bb63782b90439332eb7
Author: Andrea Cosentino
AuthorDate: Tue May 26 12:36:36 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-kms-component.adoc | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-kms-component.adoc
b/docs/components/modules/ROOT/pages/aws2-kms-component.adoc
index b583e47..bcdd636 100644
--- a/docs/components/modules/ROOT/pages/aws2-kms-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-kms-component.adoc
@@ -11,12 +11,9 @@
*Since Camel {since}*
-*Since Camel 3.1*
-
-
*{component-header}*
-The KMS component supports the ability to work with keys stored in
+The AWS2 KMS component supports the ability to work with keys stored in
https://aws.amazon.com/kms/[AWS KMS] instances.
Prerequisites
[camel] 02/03: Camel-AWS2-KMS: Fixed docs intro
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 868856fc26d9ceb433ba2098a7e3d23a041edbf5
Author: Andrea Cosentino
AuthorDate: Tue May 26 12:36:00 2020 +0200
Camel-AWS2-KMS: Fixed docs intro
---
components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
b/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
index 1c3301a..af0c6d2 100644
--- a/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
+++ b/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
@@ -11,7 +11,7 @@
*{component-header}*
-The KMS component supports the ability to work with keys stored in
+The AWS2 KMS component supports the ability to work with keys stored in
https://aws.amazon.com/kms/[AWS KMS] instances.
Prerequisites
[camel-spring-boot] branch automatic-periodic-sync updated (c2467cc -> 8828a89)
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 c2467cc [create-pull-request] automated change add ea3c767 [create-pull-request] automated change add 6109809 Regen add 0c02773 Fixed ElasticsearchRest ITest add fae42b0 CAMEL-15081: Polished add 69786b9 Regen add 8828a89 [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 (c2467cc) \ N -- N -- N refs/heads/automatic-periodic-sync (8828a89) 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/kafka.json | 4 ++-- .../org/apache/camel/springboot/catalog/others/hystrix.json | 2 +- components-starter/README.adoc | 4 ++-- .../camel-kafka-starter/src/main/docs/kafka-starter.adoc| 2 +- .../component/kafka/springboot/KafkaComponentConfiguration.java | 6 -- .../spring/boot/health/HealthCheckServiceAutoConfiguration.java | 2 +- docs/modules/ROOT/pages/kafka-starter.adoc | 2 +- docs/modules/ROOT/pages/list.adoc | 4 ++-- .../apache/camel/itest/springboot/CamelElasticsearchRestTest.java | 3 --- 9 files changed, 14 insertions(+), 15 deletions(-)
[camel-kafka-connector] 01/02: Workaround for https://issues.apache.org/jira/browse/CAMEL-15063 until we bump camel to 3.4.0
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 5deca389fa635881bc382b00f1f4a2470a610a9b
Author: Andrea Tarocchi
AuthorDate: Tue May 26 23:57:57 2020 +0200
Workaround for https://issues.apache.org/jira/browse/CAMEL-15063 until we
bump camel to 3.4.0
---
...mel-kafka-connector-fix-dependencies.properties | 3 +++
.../salesforce/SalesforceComponentCKC.java | 23 ++
2 files changed, 26 insertions(+)
diff --git a/connectors/camel-kafka-connector-fix-dependencies.properties
b/connectors/camel-kafka-connector-fix-dependencies.properties
index d5666ee..0bac701 100644
--- a/connectors/camel-kafka-connector-fix-dependencies.properties
+++ b/connectors/camel-kafka-connector-fix-dependencies.properties
@@ -25,3 +25,6 @@ global=org.apache.camel.kafkaconnector:camel-kafka-connector
camel-sjms2=org.apache.activemq:activemq-client::compile
exclude_camel-sjms2=
additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
+
+#XXX: temporary workaround waiting for
https://issues.apache.org/jira/browse/CAMEL-15063 in camel 3.4.0
+additional_properties_camel-salesforce=camel.beans.salesforce=#class:org.apache.camel.component.salesforce.SalesforceComponentCKC
diff --git
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
new file mode 100644
index 000..2a19b42
--- /dev/null
+++
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
@@ -0,0 +1,23 @@
+package org.apache.camel.component.salesforce;
+
+import org.apache.camel.spi.PropertyConfigurer;
+
+//XXX: temporary workaround waiting for
https://issues.apache.org/jira/browse/CAMEL-15063 in camel 3.4.0
+public class SalesforceComponentCKC extends SalesforceComponent {
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+getConfig().setHttpClient(getHttpClient());
+}
+
+@Override
+public PropertyConfigurer getComponentPropertyConfigurer() {
+return new SalesforceComponentConfigurer();
+}
+
+@Override
+public PropertyConfigurer getEndpointPropertyConfigurer() {
+return new SalesforceEndpointConfigurer();
+}
+}
[camel-kafka-connector] 02/02: chore: connectors regen.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 613b143b94fa4b6fce13d3b79fc66fa28ddbd2bb
Author: Andrea Tarocchi
AuthorDate: Tue May 26 23:58:31 2020 +0200
chore: connectors regen.
---
.../component/salesforce/SalesforceComponentCKC.java | 16
.../salesforce/CamelSalesforceSinkTask.java | 1 +
.../salesforce/CamelSalesforceSourceTask.java| 1 +
3 files changed, 18 insertions(+)
diff --git
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
index 2a19b42..d6c9020 100644
---
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
+++
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java
@@ -1,3 +1,19 @@
+/*
+ * 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.salesforce;
import org.apache.camel.spi.PropertyConfigurer;
diff --git
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
index 17d3783..2840c2a 100644
---
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
+++
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkTask.java
@@ -34,6 +34,7 @@ public class CamelSalesforceSinkTask extends CamelSinkTask {
protected Map getDefaultConfig() {
return new HashMap() {{
put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF,
"salesforce");
+put("camel.beans.salesforce",
"#class:org.apache.camel.component.salesforce.SalesforceComponentCKC");
}};
}
}
\ No newline at end of file
diff --git
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
index 01e3b55..2d6f17d 100644
---
a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
+++
b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceTask.java
@@ -34,6 +34,7 @@ public class CamelSalesforceSourceTask extends
CamelSourceTask {
protected Map getDefaultConfig() {
return new HashMap() {{
put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF,
"salesforce");
+put("camel.beans.salesforce",
"#class:org.apache.camel.component.salesforce.SalesforceComponentCKC");
}};
}
}
\ No newline at end of file
[camel-kafka-connector] branch master updated (ce4861b -> 613b143)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from ce4861b Merge pull request #243 from apache/dependencies-camel new 5deca38 Workaround for https://issues.apache.org/jira/browse/CAMEL-15063 until we bump camel to 3.4.0 new 613b143 chore: connectors regen. 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: ...mel-kafka-connector-fix-dependencies.properties | 3 +++ .../salesforce/SalesforceComponentCKC.java | 22 +- .../salesforce/CamelSalesforceSinkTask.java| 1 + .../salesforce/CamelSalesforceSourceTask.java | 1 + 4 files changed, 18 insertions(+), 9 deletions(-) copy tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/RemoteKafkaService.java => connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentCKC.java (56%)
[camel-website] branch master updated: CDC blog post minor update
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 7bc7238 CDC blog post minor update 7bc7238 is described below commit 7bc7238c1b9cdfc786c552b94cd17a58cd4358f3 Author: Federico Valeri AuthorDate: Tue May 26 21:07:17 2020 +0200 CDC blog post minor update --- content/blog/CdcWithCamelAndDebezium/index.md | 58 --- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/content/blog/CdcWithCamelAndDebezium/index.md b/content/blog/CdcWithCamelAndDebezium/index.md index 9914bbc..fa5cbb2 100644 --- a/content/blog/CdcWithCamelAndDebezium/index.md +++ b/content/blog/CdcWithCamelAndDebezium/index.md @@ -8,7 +8,7 @@ preview: "CDC approaches based on Camel and Debezium." --- Change Data Capture (CDC) is a well-established software design pattern for a system that monitors and captures -the changes in data, so that other software can respond to those changes. +data changes, so that other software can respond to those events. Using a CDC engine like [Debezium](https://debezium.io) along with [Camel](https://camel.apache.org) integration framework, we can easily build data pipelines to bridge traditional data stores and new cloud-native event-driven @@ -51,41 +51,34 @@ represents the number of microseconds since Unix Epoch as the server time at whi Prerequisites: Postgres 11, OpenJDK 1.8 and Maven 3.5+. -[GET CODE HERE](https://github.com/fvaleri/cdc) +[GET CODE HERE](https://github.com/fvaleri/cdc/tree/blog) ### External systems setup -First of all, you need to start Postgres (the procedure depends on your specific OS). - -Then, there is a simple script to create and initialize the database. -This script can also be used to query the table and produce a stream of changes. -```sh -./run.sh --database -./run.sh --query -./run.sh --stream -``` - -Enable Postgres internal transaction log access (required by Debezium). +Enable transaction log access and start Postgres. ```sh # postgresql.conf: configure replication slot wal_level = logical max_wal_senders = 1 max_replication_slots = 1 # pg_hba.conf: allow localhost replication to debezium user -local replication cdcadmintrust -hostreplication cdcadmin127.0.0.1/32trust -hostreplication cdcadmin::1/128 trust -# add replication permission to user and enable previous values -psql cdcdb -ALTER ROLE cdcadmin WITH REPLICATION; -ALTER TABLE cdc.customers REPLICA IDENTITY FULL; -# restart Postgres +local cdcdb cdcadmintrust +hostcdcdb cdcadmin127.0.0.1/32trust +hostcdcdb cdcadmin::1/128 trust +``` + +There is a simple script to create and initialize the database. +This script can also be used to query the table and produce a stream of changes. +```sh +./run.sh --database +./run.sh --query +./run.sh --stream ``` -Start Artemis broker and open the [web console](http://localhost:8161/console) to check messages. +Then, start Artemis broker and open the [web console](http://localhost:8161/console) (login: admin/admin). ```sh ./run.sh --artemis -# check status +# status check ps -ef | grep "[A]rtemis" | wc -l ``` @@ -106,7 +99,7 @@ We need a Kafka cluster up and running (3 ZooKeeper + 3 Kafka). This step also d (debezium-connector-postgres, camel-sjms2-kafka-connector) and dependencies. ```sh ./run.sh --kafka -# check status +# status check ps -ef | grep "[Q]uorumPeerMain" | wc -l ps -ef | grep "[K]afka" | wc -l ``` @@ -115,7 +108,7 @@ Now we can start our 3-nodes KafkaConnect cluster in distributed mode (workers t values automatically discover each other and form a cluster). ```sh ./run.sh --connect -# check status +# status check ps -ef | grep "[C]onnectDistributed" | wc -l tail -n100 /tmp/kafka/logs/connect.log /tmp/kafka/bin/kafka-topics.sh --zookeeper localhost:2180 --list @@ -180,11 +173,12 @@ One thing to be aware of is that Debezium offers better performance because of t but there is no standard for it, so a change to the database implementation may require a rewrite of the corresponding plugin. This also means that every data source has its own procedure to enable access to its internal log. -KafkaConnect single message transformations (SMTs) can be chained (sort of Unix pipeline) and extended with custom implementations, -but they are actually designed for simple modifications. Long chains of SMTs are hard to maintain and reason about. Moreover, remember -that tranformations are syncronous and applied at each message, so you can really slowdown the streaming pipeline with heavy processing -or external service calls. +Connectors configuration allows you to transform message
[camel-website] branch master updated: update:show correct microdata for different documentation versions
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 35d0804 update:show correct microdata for different documentation versions 35d0804 is described below commit 35d0804d3043c1a3d4476f206b337bb4ce21fd9a Author: nayananga AuthorDate: Tue May 26 04:21:52 2020 +0530 update:show correct microdata for different documentation versions --- antora-ui-camel/src/partials/breadcrumbs-microdata.hbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs b/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs index 6fae727..2437add 100644 --- a/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs +++ b/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs @@ -1,5 +1,5 @@
[camel-website] branch master updated: Update articles.md
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-website.git The following commit(s) were added to refs/heads/master by this push: new bb1285d Update articles.md bb1285d is described below commit bb1285d48a3d6a1da16738326850c0ecd4ceea98 Author: Claus Ibsen AuthorDate: Tue May 26 20:33:52 2020 +0200 Update articles.md --- content/community/articles.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/community/articles.md b/content/community/articles.md index 690577b..e861fcd 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -2,7 +2,7 @@ title: "Articles" --- -### Camel Videos (Lang: English, French, Norwegian, Russian, Spannish) +### Camel Videos * [Camel K serverless Integration auf Kubernetes (**German**)](https://www.youtube.com/watch?v=ZY9s4zdm_Us) - 25 min video by Perdic8 team in Germany who introduces CamelK and show live demo on Windows how to install, run and use Camel K with their impressions. * [SouJava May 2020: Apache Camel 3 - The next generation of enterprise integration](https://www.youtube.com/watch?v=OP81rLuoq0I) - SouJava talk from May 2020 where Claus Ibsen and Andrea Cosentino presents an hour long session about Apache Camel, Camel v3 and goes more in depth with Camel K, Camel Quarkus and Camel Kafka Connector. At the end of the talk there is a 30 min additional QA session. @@ -175,6 +175,7 @@ These examples show usage of several different components and other concepts suc These examples show Camel combined with several tools (e.g. IDE), ESBs, Application Services, and other middleware products such as messaging or OSGi container. +* [Using Camel and NiFi in one solution](https://medium.com/@raymondmeester/using-camel-and-nifi-in-one-solution-c7668fafe451) blog post how to use Camel inside Apache Nifi. * [Wanna try our Apache Camel developer tools for Enterprise Integration Patterns?](http://macstrac.blogspot.com/2011/01/wanna-try-our-apache-camel-developer.html) _by James Strachan_ * [Using NetBeans 7.0 to create a new Apache Camel project](http://coders-unite.blogspot.com/2011/07/using-netbeans-70-to-create-new-project.html) shows how to start from scratch in NetBeans to setup a Apache Camel project (tutorial style with screenshots) * [Using NetBeans 7.0 to create a new Apache Camel project without Spring dependency](http://coders-unite.blogspot.com/2011/07/using-netbeans-70-to-create-apache.html) shows how to start from scratch in NetBeans to setup a Apache Camel project (tutorial style with screenshots) without any Spring dependency
[camel] branch master updated (234c168 -> 46f4c43)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 234c168 Regen docs add 46f4c43 CAMEL-15114: Simple language - Date function should make it easy to output the exchange created timestamp No new revisions were added by this update. Summary of changes: .../modules/languages/pages/simple-language.adoc | 9 +-- .../language/simple/SimpleExpressionBuilder.java | 31 ++- .../camel/language/simple/SimpleLanguage.java | 64 +- .../component/file/FileProducerExpressionTest.java | 2 +- .../apache/camel/language/FileLanguageTest.java| 8 +-- .../apache/camel/language/simple/SimpleTest.java | 17 +++--- 6 files changed, 38 insertions(+), 93 deletions(-)
[GitHub] [camel-website] djencks commented on pull request #371: CAMEL-14578: Reformat files at build time to force compliance with code standards
djencks commented on pull request #371: URL: https://github.com/apache/camel-website/pull/371#issuecomment-633649058 This looks good to me. I don't understand the netlify errors. 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] JiriOndrusek commented on pull request #1258: Debezium MySQL Connector native support #1192
JiriOndrusek commented on pull request #1258: URL: https://github.com/apache/camel-quarkus/pull/1258#issuecomment-634066299 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] ipolyzos commented on issue #1465: Kamel uninstall leftovers
ipolyzos commented on issue #1465: URL: https://github.com/apache/camel-k/issues/1465#issuecomment-634134118 Fix submitted. I can confirm now that on a clean namespace i.e $ kubectl get all,pvc,configmap,rolebindings,clusterrolebindings,secrets,sa,roles,clusterroles,crd -l 'app=camel-k' git:(master|✚2 No resources found in default namespace. When I try to uninstall a clean installation of Camel-k the CRD and ClusterRole are also removed i.e $ kamel install Camel K installed in namespace default $ kubectl get all,pvc,configmap,rolebindings,clusterrolebindings,secrets,sa,roles,clusterroles,crd -l 'app=camel-k' git:(kamel-uninstall-remove-crd-clusterrole|✚2 NAME READY STATUS RESTARTS AGE pod/camel-k-operator-89fb65586-npmb6 0/1 ContainerCreating 0 6s NAME READY UP-TO-DATE AVAILABLE AGE deployment.apps/camel-k-operator 0/1 10 6s NAME DESIRED CURRENT READY AGE replicaset.apps/camel-k-operator-89fb65586 1 1 0 6s NAME ROLEAGE rolebinding.rbac.authorization.k8s.io/camel-k-operator Role/camel-k-operator 6s rolebinding.rbac.authorization.k8s.io/camel-k-operator-events Role/camel-k-operator-events6s rolebinding.rbac.authorization.k8s.io/camel-k-operator-servicemonitors Role/camel-k-operator-servicemonitors 6s NAME SECRETS AGE serviceaccount/camel-k-operator 1 6s NAME CREATED AT role.rbac.authorization.k8s.io/camel-k-operator 2020-05-26T15:59:13Z role.rbac.authorization.k8s.io/camel-k-operator-events 2020-05-26T15:59:13Z role.rbac.authorization.k8s.io/camel-k-operator-servicemonitors 2020-05-26T15:59:13Z NAME CREATED AT clusterrole.rbac.authorization.k8s.io/camel-k:edit 2020-05-26T15:26:52Z NAME CREATED AT customresourcedefinition.apiextensions.k8s.io/builds.camel.apache.org 2020-05-26T15:26:52Z customresourcedefinition.apiextensions.k8s.io/camelcatalogs.camel.apache.org 2020-05-26T15:26:52Z customresourcedefinition.apiextensions.k8s.io/integrationkits.camel.apache.org 2020-05-26T15:26:52Z customresourcedefinition.apiextensions.k8s.io/integrationplatforms.camel.apache.org 2020-05-26T15:26:52Z customresourcedefinition.apiextensions.k8s.io/integrations.camel.apache.org 2020-05-26T15:26:52Z $ kamel uninstall Camel K Integration Platform removed from namespace default Camel K Config Maps removed from namespace default Camel K Operator removed from namespace default Camel K Role Bindings removed from namespace default Camel K Roles removed from namespace default Camel K Service Accounts removed from namespace default $ kubectl get all,pvc,configmap,rolebindings,clusterrolebindings,secrets,sa,roles,clusterroles,crd -l 'app=camel-k' git:(kamel-uninstall-remove-crd-clusterrole|✚3 No resources found in default namespace. 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] ipolyzos opened a new pull request #1466: #1465 remove crd and clusterrole on uninstall
ipolyzos opened a new pull request #1466: URL: https://github.com/apache/camel-k/pull/1466 Fix for #1465. It enables the removal of _**CRD**_ and _**ClusterRole**_ upon _kamel uninstall_. 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] davsclaus commented on issue #711: Cannot reinstall the kamel in minikube
davsclaus commented on issue #711: URL: https://github.com/apache/camel-k/issues/711#issuecomment-634198752 Yeah lets close this 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-spring-boot] oscerd merged pull request #77: [Github Actions] Periodic Sync Camel Spring Boot Master Branch
oscerd merged pull request #77: URL: https://github.com/apache/camel-spring-boot/pull/77 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] heiko-braun commented on issue #1468: Installation on a kind cluster
heiko-braun commented on issue #1468: URL: https://github.com/apache/camel-k/issues/1468#issuecomment-634181308 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] valdar opened a new pull request #244: Sf fix
valdar opened a new pull request #244: URL: https://github.com/apache/camel-kafka-connector/pull/244 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] aashnajena closed pull request #370: [CAMEL-14994] Improve Projects Page
aashnajena closed pull request #370: URL: https://github.com/apache/camel-website/pull/370 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] Nayananga opened a new pull request #372: update:show correct micro-data for different documentation versions
Nayananga opened a new pull request #372: URL: https://github.com/apache/camel-website/pull/372 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] ppalaga merged pull request #368: Status badges CSS for Camel Quarkus extension pages
ppalaga merged pull request #368: URL: https://github.com/apache/camel-website/pull/368 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] AemieJ commented on pull request #3860: CAMEL-14910: Bundling of the heavily distributed components
AemieJ commented on pull request #3860: URL: https://github.com/apache/camel/pull/3860#issuecomment-633900927 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] lburgazzoli opened a new pull request #1265: Remove camel-rest workaround as the fic for the issue is included in Apache Camel 3.3.0
lburgazzoli opened a new pull request #1265: URL: https://github.com/apache/camel-quarkus/pull/1265 [ ] An issue should be filed for the change unless this is a trivial change (fixing a typo or similar). One issue should ideally be fixed by not more than one commit and the other way round, each commit should fix just one issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful and properly spelled subject line and body. Copying the title of the associated issue is typically enough. Please include the issue number in the commit message prefixed by #. [ ] The pull request description should explain what the pull request does, how, and why. If the info is available in the associated issue or some other external document, a link is enough. [ ] Phrases like Fix # or Fixes # will auto-close the named issue upon merging the pull request. Using them is typically a good idea. [ ] Please run mvn process-resources -Pformat (and amend the changes if necessary) before sending the pull request. [ ] Contributor guide is your good friend: https://camel.apache.org/camel-quarkus/latest/contributor-guide.html 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 merged pull request #242: Fix CamelSinkAWSSQSITCase unreliability with blocking initialization
oscerd merged pull request #242: URL: https://github.com/apache/camel-kafka-connector/pull/242 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] zregvart commented on pull request #369: Add customized scrollbar for table and code snippets
zregvart commented on pull request #369: URL: https://github.com/apache/camel-website/pull/369#issuecomment-634287391 I would prefer if we don't target specific browser, this makes it hard for us to maintain in the future (we need to test those rules in many browsers/versions). I think this doesn't help much with the way we display tables (they're too wide), there has been some work in #271, I think it would be better to finish that work so by default we don't have horizontal scrollbars. 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] davsclaus closed issue #711: Cannot reinstall the kamel in minikube
davsclaus closed issue #711: URL: https://github.com/apache/camel-k/issues/711 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 a change in pull request #1258: Debezium MySQL Connector native support #1192
ppalaga commented on a change in pull request #1258: URL: https://github.com/apache/camel-quarkus/pull/1258#discussion_r430741951 ## File path: integration-tests/debezium/pom.xml ## @@ -39,9 +39,22 @@ - camel-quarkus-debezium-postgres-deployment,camel-quarkus-support-policy-deployment + camel-quarkus-debezium-postgres-deployment,camel-quarkus-debezium-mysql-deployment,camel-quarkus-support-policy-deployment + libs/mysql-connector-java-8.0.20.jar Review comment: ```suggestion libs/mysql-connector-java-8.0.20.jar ``` 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 commented on issue #1462: sanitized integration name on Windows contains whole path
nicolaferraro commented on issue #1462: URL: https://github.com/apache/camel-k/issues/1462#issuecomment-634025486 Yeah, we should try to fix it before next release. 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 issue #1266: Unregister unnecessary Camel configuration classes from reflection
ppalaga opened a new issue #1266: URL: https://github.com/apache/camel-quarkus/issues/1266 Should be possible after the upgrade to Camel 3.3.0 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] ppalaga commented on pull request #368: Status badges CSS for Camel Quarkus extension pages
ppalaga commented on pull request #368: URL: https://github.com/apache/camel-website/pull/368#issuecomment-633710062 Merged, as agreed with @oscerd . Let's revert in case there is any damage. 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] djencks commented on pull request #3860: CAMEL-14910: Bundling of the heavily distributed components
djencks commented on pull request #3860: URL: https://github.com/apache/camel/pull/3860#issuecomment-634127414 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
