[camel-quarkus] branch master updated (f64b94c -> c0c900e)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from f64b94c Merge pull request #722 from johnpoth/camel-box add c0c900e chore: regen No new revisions were added by this update. Summary of changes: .../org/apache/camel/quarkus/component/box/deployment/BoxProcessor.java | 1 - 1 file changed, 1 deletion(-)
[camel-spring-boot] branch master updated: 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 The following commit(s) were added to refs/heads/master by this push: new f8e5d23 Regen f8e5d23 is described below commit f8e5d23917ef591e079ad29c9aad64fbd612bfc5 Author: Claus Ibsen AuthorDate: Tue Feb 18 08:01:03 2020 +0100 Regen --- components-starter/README.adoc| 2 +- docs/modules/ROOT/pages/list.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components-starter/README.adoc b/components-starter/README.adoc index 60e3aa9..d6248e1 100644 --- a/components-starter/README.adoc +++ b/components-starter/README.adoc @@ -81,7 +81,7 @@ Number of Camel components: 323 in 257 JAR artifacts (1 deprecated) `aws2-eks:label` | 3.1 | The aws2-eks is used for managing Amazon EKS | link:https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 IAM] (camel-aws2-iam-starter) + -`aws2-iam:label` | 3.1 | The aws-iam is used for managing Amazon IAM +`aws2-iam:label` | 3.1 | The aws2-iam is used for managing Amazon IAM | link:https://camel.apache.org/components/latest/aws2-kms-component.html[AWS 2 KMS] (camel-aws2-kms-starter) + `aws2-kms:label` | 3.1 | The aws2-kms is used for managing Amazon KMS diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc index 60e3aa9..d6248e1 100644 --- a/docs/modules/ROOT/pages/list.adoc +++ b/docs/modules/ROOT/pages/list.adoc @@ -81,7 +81,7 @@ Number of Camel components: 323 in 257 JAR artifacts (1 deprecated) `aws2-eks:label` | 3.1 | The aws2-eks is used for managing Amazon EKS | link:https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 IAM] (camel-aws2-iam-starter) + -`aws2-iam:label` | 3.1 | The aws-iam is used for managing Amazon IAM +`aws2-iam:label` | 3.1 | The aws2-iam is used for managing Amazon IAM | link:https://camel.apache.org/components/latest/aws2-kms-component.html[AWS 2 KMS] (camel-aws2-kms-starter) + `aws2-kms:label` | 3.1 | The aws2-kms is used for managing Amazon KMS
[camel-spring-boot] branch master updated: Naming and comments changes on github action.
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 59a7d2c Naming and comments changes on github action.
59a7d2c is described below
commit 59a7d2cf613e15d1e403d6f94b5051377a4aa0c8
Author: Andrea Tarocchi
AuthorDate: Tue Feb 18 07:52:13 2020 +0100
Naming and comments changes on github action.
---
.github/workflows/automatic-sync-master.yml | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/automatic-sync-master.yml
b/.github/workflows/automatic-sync-master.yml
index c48d026..a01c8b0 100644
--- a/.github/workflows/automatic-sync-master.yml
+++ b/.github/workflows/automatic-sync-master.yml
@@ -19,14 +19,14 @@ name: Sync Camel Spring Boot Master Branch
on:
schedule:
-# Run every 10 minutes
+# Run at midnight every day
- cron: '0 0 * * *'
jobs:
build:
name: Sync Camel Spring Boot Master Branch
runs-on: ubuntu-latest
steps:
- - name: Checkout
+ - name: Checkout Camel project
uses: actions/checkout@v2
with:
repository: apache/camel
@@ -36,21 +36,21 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- - name: Build Project
+ - name: Build Camel Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
working-directory: ${{ github.workspace }}/camel
- - name: Checkout
+ - name: Checkout Camel-spring-boot project
uses: actions/checkout@v2
with:
ref: master
fetch-depth: 0
- - name: Build Project
+ - name: Build Camel-spring-boot Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
- name: Create Pull Request
uses: peter-evans/create-pull-request@v2.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- branch: periodic-sync
+ branch: automatic-periodic-sync
title: '[Github Actions] Periodic Sync Camel Spring Boot Master
Branch'
body: |
Periodic Sync of Camel Spring Boot Master Branch with main Camel
Master.
[camel] 01/02: Fix CS
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2132e6c6b8cdb4e0494cc6e0b96453d0473f971
Author: Guillaume Nodet
AuthorDate: Tue Feb 18 07:44:08 2020 +0100
Fix CS
---
.../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 297e806..d662e21 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -62,8 +62,8 @@ public class BeanInfo {
private static final Logger LOG = LoggerFactory.getLogger(BeanInfo.class);
private static final String CGLIB_CLASS_SEPARATOR = "$$";
private static final String[] EXCLUDED_METHOD_NAMES = new String[]{
-"clone", "equals", "finalize", "getClass", "hashCode", "notify",
"notifyAll", "wait", // java.lang.Object
-"getInvocationHandler", "getProxyClass", "isProxyClass",
"newProxyInstance" // java.lang.Proxy
+"clone", "equals", "finalize", "getClass", "hashCode", "notify",
"notifyAll", "wait", // java.lang.Object
+"getInvocationHandler", "getProxyClass", "isProxyClass",
"newProxyInstance" // java.lang.Proxy
};
private final CamelContext camelContext;
private final BeanComponent component;
[camel] branch master updated (dcef99c -> 2cc11fa)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from dcef99c Attempt to fix release problem new c2132e6 Fix CS new 2cc11fa 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: .../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 4 ++-- .../components/modules/ROOT/pages/microprofile-metrics-component.adoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 2cc11fa6b8537ce956a41ce72f968ae6cd239c87 Author: Guillaume Nodet AuthorDate: Tue Feb 18 07:45:02 2020 +0100 Regen --- docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc b/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc index b8fe143..305b522 100644 --- a/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc +++ b/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc @@ -62,7 +62,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *metricType* | *Required* Metric type. The value can be one of: concurrent gauge, counter, gauge, meter, histogram, timer, invalid | | MetricType +| *metricType* | *Required* Metric type. The value can be one of: concurrent gauge, counter, gauge, meter, histogram, timer, simple timer, invalid | | MetricType | *metricName* | *Required* Metric name | | String |===
[camel] branch master updated: Attempt to fix release problem
This is an automated email from the ASF dual-hosted git repository.
gnodet 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 dcef99c Attempt to fix release problem
dcef99c is described below
commit dcef99c5d689cec61c32c48a235177fb50dc896d
Author: Guillaume Nodet
AuthorDate: Tue Feb 18 07:32:57 2020 +0100
Attempt to fix release problem
---
components/camel-jasypt/pom.xml | 2 +-
platforms/karaf/commands/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index 78edd0e..2d0a6b4 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -101,7 +101,7 @@
org.apache.camel
camel-bundle-plugin
-
${camel-bundle-plugin-version}
+
${project.version}
manifest
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index f145eff..9656732 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -79,7 +79,7 @@
org.apache.camel
camel-bundle-plugin
-${camel-bundle-plugin-version}
+${project.version}
[camel-spring-boot] 01/01: Merge pull request #11 from apache/periodic-sync
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 160a87aa9c33b38031d90a74229af28db270576d Merge: a7bc2f0 d4c4035 Author: Andrea Cosentino AuthorDate: Tue Feb 18 07:31:35 2020 +0100 Merge pull request #11 from apache/periodic-sync [Github Actions] Periodic Sync Camel Spring Boot Master Branch .../org/apache/camel/springboot/catalog/components/aws2-iam.json | 4 ++-- .../org/apache/camel/springboot/catalog/components/aws2-ses.json | 2 +- .../camel-aws2-iam-starter/src/main/docs/aws2-iam-starter.adoc| 3 +-- .../component/aws2/iam/springboot/IAM2ComponentConfiguration.java | 8 .../camel-aws2-ses-starter/src/main/docs/aws2-ses-starter.adoc| 2 +- .../component/aws2/ses/springboot/Ses2ComponentConfiguration.java | 2 +- docs/modules/ROOT/pages/aws2-iam-starter.adoc | 3 +-- docs/modules/ROOT/pages/aws2-ses-starter.adoc | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-)
[camel-spring-boot] branch master updated (a7bc2f0 -> 160a87a)
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 a7bc2f0 Fixed github action path and schedule time: once per day at midnight add d4c4035 [create-pull-request] automated change new 160a87a Merge pull request #11 from apache/periodic-sync 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: .../org/apache/camel/springboot/catalog/components/aws2-iam.json | 4 ++-- .../org/apache/camel/springboot/catalog/components/aws2-ses.json | 2 +- .../camel-aws2-iam-starter/src/main/docs/aws2-iam-starter.adoc| 3 +-- .../component/aws2/iam/springboot/IAM2ComponentConfiguration.java | 8 .../camel-aws2-ses-starter/src/main/docs/aws2-ses-starter.adoc| 2 +- .../component/aws2/ses/springboot/Ses2ComponentConfiguration.java | 2 +- docs/modules/ROOT/pages/aws2-iam-starter.adoc | 3 +-- docs/modules/ROOT/pages/aws2-ses-starter.adoc | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-)
[GitHub] [camel-spring-boot] oscerd merged pull request #11: [Github Actions] Periodic Sync Camel Spring Boot Master Branch
oscerd merged pull request #11: [Github Actions] Periodic Sync Camel Spring Boot Master Branch URL: https://github.com/apache/camel-spring-boot/pull/11 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 With regards, Apache Git Services
[camel] branch master updated: Attempt to fix release problem
This is an automated email from the ASF dual-hosted git repository.
gnodet 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 3e11162 Attempt to fix release problem
3e11162 is described below
commit 3e11162321dd244525fb499d832640aedb882c3f
Author: Guillaume Nodet
AuthorDate: Tue Feb 18 07:27:03 2020 +0100
Attempt to fix release problem
---
.../main/resources/archetype-resources/__artifactId__-component/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
catalog/pom.xml | 2 +-
components/pom.xml | 2 +-
core/camel-caffeine-lrucache/pom.xml| 2 +-
core/pom.xml| 2 +-
parent/pom.xml | 1 -
platforms/commands/commands-core/pom.xml| 2 +-
tests/pom.xml | 2 +-
tests/test-bundles/pom.xml | 2 +-
tooling/camel-tooling-model/pom.xml | 2 +-
tooling/camel-tooling-util/pom.xml | 2 +-
tooling/camel-util-json/pom.xml | 2 +-
tooling/openapi-rest-dsl-generator/pom.xml | 2 +-
tooling/spi-annotations/pom.xml | 2 +-
tooling/swagger-rest-dsl-generator/pom.xml | 2 +-
18 files changed, 17 insertions(+), 18 deletions(-)
diff --git
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 05cddf7..98cf35c 100644
---
a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++
b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -242,7 +242,7 @@
org.apache.camel
camel-bundle-plugin
-${camel-bundle-plugin-version}
+${camelVersion}
Camel Component for ${componentName}
diff --git
a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index 15c785e..d8e7812 100644
---
a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -109,7 +109,7 @@
org.apache.camel
camel-bundle-plugin
-${camel-bundle-plugin-version}
+${camelVersion}
false
diff --git
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index a726c96..641bae8 100644
---
a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -147,7 +147,7 @@
org.apache.camel
camel-bundle-plugin
-${camel-bundle-plugin-version}
+${camelVersion}
${groupId}.${artifactId}
diff --git
a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
index 5350ba8..a82a18b 100644
---
a/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
@@ -104,7 +104,7 @@
org.apache.camel
camel-bundle-plugin
-${camel-bundle-plugin-version}
+${camelVersion}
${groupId}.${artifactId}
diff --git a/catalog/pom.xml b/catalog/pom.xml
index ed26c65..6bea544 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -61,7 +61,7 @@
org.apache.camel
camel-bundle-plugin
-${camel-bundle-plugin-version}
+${project.version}
diff --git a/components/pom.xml b/components/pom.xml
index 32c82a3..157b01e 100644
--- a/components/pom.xml
+++
[camel-spring-boot] branch periodic-sync created (now d4c4035)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. at d4c4035 [create-pull-request] automated change No new revisions were added by this update.
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request #11: [Github Actions] Periodic Sync Camel Spring Boot Master Branch
github-actions[bot] opened a new pull request #11: [Github Actions] Periodic Sync Camel Spring Boot Master Branch URL: https://github.com/apache/camel-spring-boot/pull/11 Periodic Sync of Camel Spring Boot Master Branch with main Camel Master. see https://github.com/apache/camel-spring-boot/blob/master/.github/workflows/automatic-sync-master.yml This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-spring-boot] branch master updated: Fixed github action path and schedule time: once per day at midnight
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new a7bc2f0 Fixed github action path and schedule time: once per day at
midnight
a7bc2f0 is described below
commit a7bc2f0b5d8f9427f9d72b024ff32f1e264f6a0e
Author: Andrea Tarocchi
AuthorDate: Tue Feb 18 01:45:12 2020 +0100
Fixed github action path and schedule time: once per day at midnight
---
.github/workflows/automatic-sync-master.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/automatic-sync-master.yml
b/.github/workflows/automatic-sync-master.yml
index d49bd96..c48d026 100644
--- a/.github/workflows/automatic-sync-master.yml
+++ b/.github/workflows/automatic-sync-master.yml
@@ -20,7 +20,7 @@ name: Sync Camel Spring Boot Master Branch
on:
schedule:
# Run every 10 minutes
-- cron: '10 * * * *'
+- cron: '0 0 * * *'
jobs:
build:
name: Sync Camel Spring Boot Master Branch
@@ -42,12 +42,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
- path: camel-spring-boot
ref: master
fetch-depth: 0
- name: Build Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
-working-directory: ${{ github.workspace }}/camel-spring-boot
- name: Create Pull Request
uses: peter-evans/create-pull-request@v2.4.1
with:
[camel-spring-boot] branch master updated: Fixed reference to env var syntax for github actions.
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 0854e66 Fixed reference to env var syntax for github actions.
0854e66 is described below
commit 0854e66389c604c832c0955b01cd1812a26980d3
Author: Andrea Tarocchi
AuthorDate: Tue Feb 18 00:47:45 2020 +0100
Fixed reference to env var syntax for github actions.
---
.github/workflows/automatic-sync-master.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/automatic-sync-master.yml
b/.github/workflows/automatic-sync-master.yml
index 7eadc9b..d49bd96 100644
--- a/.github/workflows/automatic-sync-master.yml
+++ b/.github/workflows/automatic-sync-master.yml
@@ -38,6 +38,7 @@ jobs:
java-version: 1.8
- name: Build Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
+working-directory: ${{ github.workspace }}/camel
- name: Checkout
uses: actions/checkout@v2
with:
@@ -46,6 +47,7 @@ jobs:
fetch-depth: 0
- name: Build Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
+working-directory: ${{ github.workspace }}/camel-spring-boot
- name: Create Pull Request
uses: peter-evans/create-pull-request@v2.4.1
with:
[camel-spring-boot] branch master updated: More tweeking of github actions.
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 3fa49ba More tweeking of github actions.
3fa49ba is described below
commit 3fa49ba7416ab5704f6f3550647f7380ac481b8d
Author: Andrea Tarocchi
AuthorDate: Tue Feb 18 00:38:43 2020 +0100
More tweeking of github actions.
---
.github/workflows/automatic-sync-master.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/automatic-sync-master.yml
b/.github/workflows/automatic-sync-master.yml
index 7575bfe..7eadc9b 100644
--- a/.github/workflows/automatic-sync-master.yml
+++ b/.github/workflows/automatic-sync-master.yml
@@ -38,7 +38,6 @@ jobs:
java-version: 1.8
- name: Build Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
-working-directory: $GITHUB_WORKSPACE/camel
- name: Checkout
uses: actions/checkout@v2
with:
@@ -47,12 +46,11 @@ jobs:
fetch-depth: 0
- name: Build Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
-working-directory: $GITHUB_WORKSPACE/camel-spring-boot
- name: Create Pull Request
uses: peter-evans/create-pull-request@v2.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- branch:
+ branch: periodic-sync
title: '[Github Actions] Periodic Sync Camel Spring Boot Master
Branch'
body: |
Periodic Sync of Camel Spring Boot Master Branch with main Camel
Master.
[GitHub] [camel-spring-boot] valdar merged pull request #10: Updated github action configuration to checkout version 2.
valdar merged pull request #10: Updated github action configuration to checkout version 2. URL: https://github.com/apache/camel-spring-boot/pull/10 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 With regards, Apache Git Services
[camel-spring-boot] branch master updated: Updated github action configuration to checkout version 2.
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-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 6e4565b Updated github action configuration to checkout version 2. 6e4565b is described below commit 6e4565b947f0b19f7485085174bbad085a6dcc73 Author: Andrea Tarocchi AuthorDate: Tue Feb 18 00:28:37 2020 +0100 Updated github action configuration to checkout version 2. --- .github/workflows/automatic-sync-master.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index a6accd8..7575bfe 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -38,14 +38,16 @@ jobs: java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests -working-directory: /home/runner/work/camel-spring-boot/camel +working-directory: $GITHUB_WORKSPACE/camel - name: Checkout uses: actions/checkout@v2 with: path: camel-spring-boot + ref: master fetch-depth: 0 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests +working-directory: $GITHUB_WORKSPACE/camel-spring-boot - name: Create Pull Request uses: peter-evans/create-pull-request@v2.4.1 with:
[camel-spring-boot] branch master updated: Bumped version of checkout action and removed unecessary step.
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-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new de2d120 Bumped version of checkout action and removed unecessary step. de2d120 is described below commit de2d120f9258f5400389ecd86d1e2c4cec8de336 Author: Andrea Tarocchi AuthorDate: Mon Feb 17 23:41:30 2020 +0100 Bumped version of checkout action and removed unecessary step. --- .github/workflows/automatic-sync-master.yml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 28fe03e..a6accd8 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout -uses: actions/checkout@v1 +uses: actions/checkout@v2 with: repository: apache/camel ref: master @@ -40,14 +40,10 @@ jobs: run: ./mvnw -V --no-transfer-progress clean install -DskipTests working-directory: /home/runner/work/camel-spring-boot/camel - name: Checkout -uses: actions/checkout@v1 +uses: actions/checkout@v2 with: path: camel-spring-boot fetch-depth: 0 - - name: Set Up Java -uses: actions/setup-java@v1 -with: - java-version: 1.8 - name: Build Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests - name: Create Pull Request
[GitHub] [camel-spring-boot] valdar merged pull request #9: Bumped version of checkout action and removed unecessary step.
valdar merged pull request #9: Bumped version of checkout action and removed unecessary step. URL: https://github.com/apache/camel-spring-boot/pull/9 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 With regards, Apache Git Services
[camel-spring-boot] branch master updated: tweeked github action checkout config.
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-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 34bad87 tweeked github action checkout config. 34bad87 is described below commit 34bad876cf0aa12c0c106edbf2f96397e0f5abba Author: Andrea Tarocchi AuthorDate: Mon Feb 17 22:06:00 2020 +0100 tweeked github action checkout config. --- .github/workflows/automatic-sync-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 0453389..28fe03e 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v1 with: path: camel-spring-boot - ref: master + fetch-depth: 0 - name: Set Up Java uses: actions/setup-java@v1 with:
[GitHub] [camel-spring-boot] valdar merged pull request #8: tweeked github action checkout config.
valdar merged pull request #8: tweeked github action checkout config. URL: https://github.com/apache/camel-spring-boot/pull/8 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 With regards, Apache Git Services
[GitHub] [camel-spring-boot] valdar opened a new pull request #8: tweeked github action checkout config.
valdar opened a new pull request #8: tweeked github action checkout config. URL: https://github.com/apache/camel-spring-boot/pull/8 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 With regards, Apache Git Services
[GitHub] [camel-spring-boot] valdar merged pull request #7: attempt to fix github action to sync with main Camel repo
valdar merged pull request #7: attempt to fix github action to sync with main Camel repo URL: https://github.com/apache/camel-spring-boot/pull/7 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 With regards, Apache Git Services
[camel-spring-boot] branch master updated: attempt to fix github action to sync with main Camel repo
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new d18a254 attempt to fix github action to sync with main Camel repo
d18a254 is described below
commit d18a254d2334194f7e03d9149a534892c887d090
Author: Andrea Tarocchi
AuthorDate: Mon Feb 17 21:02:58 2020 +0100
attempt to fix github action to sync with main Camel repo
---
.github/workflows/automatic-sync-master.yml | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/automatic-sync-master.yml
b/.github/workflows/automatic-sync-master.yml
index 406937b..0453389 100644
--- a/.github/workflows/automatic-sync-master.yml
+++ b/.github/workflows/automatic-sync-master.yml
@@ -23,7 +23,7 @@ on:
- cron: '10 * * * *'
jobs:
build:
-name: Build
+name: Sync Camel Spring Boot Master Branch
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -43,16 +43,19 @@ jobs:
uses: actions/checkout@v1
with:
path: camel-spring-boot
+ ref: master
- name: Set Up Java
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
- - name: GitHub Pull Request Action
-uses: repo-sync/pull-request@v2.0.1
+ - name: Create Pull Request
+uses: peter-evans/create-pull-request@v2.4.1
with:
- source_branch: master
- destination_branch: master
- pr_title: Automatic sync branch master to camel-master
- github_token: ${{ secrets.GITHUB_TOKEN }}
+ token: ${{ secrets.GITHUB_TOKEN }}
+ branch:
+ title: '[Github Actions] Periodic Sync Camel Spring Boot Master
Branch'
+ body: |
+Periodic Sync of Camel Spring Boot Master Branch with main Camel
Master.
+see
https://github.com/apache/camel-spring-boot/blob/master/.github/workflows/automatic-sync-master.yml
[GitHub] [camel-spring-boot] valdar opened a new pull request #7: attempt to fix github action to sync with main Camel repo
valdar opened a new pull request #7: attempt to fix github action to sync with main Camel repo URL: https://github.com/apache/camel-spring-boot/pull/7 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 With regards, Apache Git Services
[camel] branch master updated: Upgrade elytron
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 3eeef31 Upgrade elytron 3eeef31 is described below commit 3eeef317784b391889fe0d145b16db5888ca14f4 Author: Claus Ibsen AuthorDate: Mon Feb 17 20:40:18 2020 +0100 Upgrade elytron --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e5dbb59..b9469b0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -649,7 +649,7 @@ 0.8.0 3.0.5.Final 0.9.4_5 -1.11.0.CR3 +1.11.2.Final 2.24.1 4.4.1 5.2.1
[camel] branch master updated (d4ef673 -> aa0050e)
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 d4ef673 CAMEL-14582: camel-bean - Optimize excluded methods new fe74dad Upgrade Hibernate new aa0050e Upgrade microprofile specs 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-microprofile-config/pom.xml | 2 +- components/camel-microprofile-health/pom.xml | 15 +++ components/camel-microprofile-metrics/pom.xml | 2 +- .../microprofile/metrics/microprofile-metrics.json| 2 +- .../src/main/docs/microprofile-metrics-component.adoc | 2 +- parent/pom.xml| 14 +++--- 6 files changed, 18 insertions(+), 19 deletions(-)
[camel] 02/02: Upgrade microprofile specs
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
commit aa0050e42aa857b66ecdfeeedf7008bb35664fe6
Author: Claus Ibsen
AuthorDate: Mon Feb 17 20:32:28 2020 +0100
Upgrade microprofile specs
---
components/camel-microprofile-config/pom.xml | 2 +-
components/camel-microprofile-health/pom.xml | 15 +++
components/camel-microprofile-metrics/pom.xml | 2 +-
.../microprofile/metrics/microprofile-metrics.json| 2 +-
.../src/main/docs/microprofile-metrics-component.adoc | 2 +-
parent/pom.xml| 12 ++--
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/components/camel-microprofile-config/pom.xml
b/components/camel-microprofile-config/pom.xml
index 4bb6dd5..c05ecb1 100644
--- a/components/camel-microprofile-config/pom.xml
+++ b/components/camel-microprofile-config/pom.xml
@@ -59,7 +59,7 @@
-io.smallrye
+io.smallrye.config
smallrye-config
${smallrye-config-version}
test
diff --git a/components/camel-microprofile-health/pom.xml
b/components/camel-microprofile-health/pom.xml
index edc9ccb..627a780 100644
--- a/components/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile-health/pom.xml
@@ -51,6 +51,12 @@
${microprofile-health-version}
provided
+
+
+javax.enterprise
+cdi-api
+${cdi-api-2.0-version}
+
@@ -66,18 +72,11 @@
test
-io.smallrye
+io.smallrye.config
smallrye-config
${smallrye-config-version}
test
-
-
-javax.enterprise
-cdi-api
-${cdi-api-2.0-version}
-test
-
diff --git a/components/camel-microprofile-metrics/pom.xml
b/components/camel-microprofile-metrics/pom.xml
index afdaf57..b824900 100644
--- a/components/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile-metrics/pom.xml
@@ -60,7 +60,7 @@
test
-io.smallrye
+io.smallrye.config
smallrye-config
${smallrye-config-version}
test
diff --git
a/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
b/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
index a55a023..94e96dc 100644
---
a/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
+++
b/components/camel-microprofile-metrics/src/generated/resources/org/apache/camel/component/microprofile/metrics/microprofile-metrics.json
@@ -24,7 +24,7 @@
"metricRegistry": { "kind": "property", "displayName": "Metric Registry",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.eclipse.microprofile.metrics.MetricRegistry", "deprecated":
false, "secret": false, "description": "Use a custom MetricRegistry." }
},
"properties": {
-"metricType": { "kind": "path", "displayName": "Metric Type", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.eclipse.microprofile.metrics.MetricType", "enum": [ "concurrent gauge",
"counter", "gauge", "meter", "histogram", "timer", "invalid" ], "deprecated":
false, "deprecationNote": "", "secret": false, "description": "Metric type" },
+"metricType": { "kind": "path", "displayName": "Metric Type", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.eclipse.microprofile.metrics.MetricType", "enum": [ "concurrent gauge",
"counter", "gauge", "meter", "histogram", "timer", "simple timer", "invalid" ],
"deprecated": false, "deprecationNote": "", "secret": false, "description":
"Metric type" },
"metricName": { "kind": "path", "displayName": "Metric Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Metric name" },
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Action to use when using the timer type" },
"counterIncrement": { "kind": "parameter", "displayName": "Counter
Increment", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "java.lang.Long", "deprecated": false,
[camel] branch master updated: CAMEL-14582: camel-bean - Optimize excluded methods
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 d4ef673 CAMEL-14582: camel-bean - Optimize excluded methods
d4ef673 is described below
commit d4ef6735148a5c4e2de94f0b588765e1fd4b09e0
Author: Claus Ibsen
AuthorDate: Mon Feb 17 19:14:18 2020 +0100
CAMEL-14582: camel-bean - Optimize excluded methods
---
.../org/apache/camel/component/bean/BeanInfo.java | 30 ++
1 file changed, 8 insertions(+), 22 deletions(-)
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 899b03e..297e806 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.bean;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -62,7 +61,10 @@ import org.slf4j.LoggerFactory;
public class BeanInfo {
private static final Logger LOG = LoggerFactory.getLogger(BeanInfo.class);
private static final String CGLIB_CLASS_SEPARATOR = "$$";
-private static final List EXCLUDED_METHODS = new ArrayList<>();
+private static final String[] EXCLUDED_METHOD_NAMES = new String[]{
+"clone", "equals", "finalize", "getClass", "hashCode", "notify",
"notifyAll", "wait", // java.lang.Object
+"getInvocationHandler", "getProxyClass", "isProxyClass",
"newProxyInstance" // java.lang.Proxy
+};
private final CamelContext camelContext;
private final BeanComponent component;
private final Class type;
@@ -78,22 +80,6 @@ public class BeanInfo {
private boolean publicConstructors;
private boolean publicNoArgConstructors;
-static {
-// exclude all java.lang.Object methods as we dont want to invoke them
-
EXCLUDED_METHODS.addAll(Arrays.asList(Object.class.getDeclaredMethods()));
-// exclude all java.lang.reflect.Proxy methods as we dont want to
invoke them
-
EXCLUDED_METHODS.addAll(Arrays.asList(Proxy.class.getDeclaredMethods()));
-// Remove private methods
-EXCLUDED_METHODS.removeIf(m -> Modifier.isPrivate(m.getModifiers()));
-try {
-// but keep toString as this method is okay
-
EXCLUDED_METHODS.remove(Object.class.getDeclaredMethod("toString"));
-EXCLUDED_METHODS.remove(Proxy.class.getDeclaredMethod("toString"));
-} catch (Throwable e) {
-// ignore
-}
-}
-
public BeanInfo(CamelContext camelContext, Class type) {
this(camelContext, type, createParameterMappingStrategy(camelContext));
}
@@ -886,10 +872,10 @@ public class BeanInfo {
* @return true if valid, false to skip the method
*/
protected boolean isValidMethod(Class clazz, Method method) {
-// must not be in the excluded list
-for (Method excluded : EXCLUDED_METHODS) {
-if
(org.apache.camel.util.ObjectHelper.isOverridingMethod(excluded, method)) {
-// the method is overriding an excluded method so its not valid
+// method name must not be in the excluded list
+String name = method.getName();
+for (String s : EXCLUDED_METHOD_NAMES) {
+if (name.equals(s)) {
return false;
}
}
[camel] branch master updated (4060fca -> 4751018)
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 4060fca Fixed Camel-Kubernetes Karaf feature new e237081 Camel-AWS2-SQS: Pointing to the correct SB starter adoc new 4751018 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-sqs/src/main/docs/aws2-sqs-component.adoc | 2 +- docs/components/modules/ROOT/pages/aws2-sqs-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 475101888bd54915997cb24d7cf6f0170052c92a Author: Andrea Cosentino AuthorDate: Mon Feb 17 19:53:07 2020 +0100 Regen docs --- docs/components/modules/ROOT/pages/aws2-sqs-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc index 7575681..03ce139 100644 --- a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc @@ -349,4 +349,4 @@ The other one will use a NullMessageDeduplicationIdStrategy, that will use the b In case of send batch message operation, you'll need to use the `useContentBasedDeduplication` and on the Queue you're pointing you'll need to enable the `content based deduplication` option. -include::camel-spring-boot::page$aws-sqs-starter.adoc[] +include::camel-spring-boot::page$aws2-sqs-starter.adoc[]
[camel] 01/02: Camel-AWS2-SQS: Pointing to the correct SB starter adoc
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 e237081d7b6ddaa81ee11d5bc49f1742747705cf Author: Andrea Cosentino AuthorDate: Mon Feb 17 19:47:29 2020 +0100 Camel-AWS2-SQS: Pointing to the correct SB starter adoc --- 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 15e8b3d..47d0df9 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 @@ -348,4 +348,4 @@ The other one will use a NullMessageDeduplicationIdStrategy, that will use the b In case of send batch message operation, you'll need to use the `useContentBasedDeduplication` and on the Queue you're pointing you'll need to enable the `content based deduplication` option. -include::camel-spring-boot::page$aws-sqs-starter.adoc[] +include::camel-spring-boot::page$aws2-sqs-starter.adoc[]
[camel] 01/02: Upgrade Kubernetes client and model to version 4.8.0
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8f7e24f9f0a0f7cb4ebb30ae056a10fd06e86397
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 19:34:13 2020 +0100
Upgrade Kubernetes client and model to version 4.8.0
---
.../kubernetes/producer/KubernetesHPAProducerTest.java | 10 +-
parent/pom.xml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index 9c6203f..23950c5 100644
---
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -47,7 +47,7 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
@Test
public void listTest() throws Exception {
-
server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers")
+
server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers")
.andReturn(200, new
HorizontalPodAutoscalerListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
List result =
template.requestBody("direct:list", "", List.class);
@@ -56,7 +56,7 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
@Test
public void listByLabelsTest() throws Exception {
-
server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
+
server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers?labelSelector="
+ toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new
PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", new Processor() {
@@ -79,8 +79,8 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
HorizontalPodAutoscaler hpa1 = new
HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
HorizontalPodAutoscaler hpa2 = new
HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa2").withNamespace("ns1").and().build();
-
server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200,
hpa1).once();
-
server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200,
hpa2).once();
+
server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200,
hpa1).once();
+
server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200,
hpa2).once();
Exchange ex = template.request("direct:getHPA", new Processor() {
@Override
@@ -98,7 +98,7 @@ public class KubernetesHPAProducerTest extends
KubernetesTestSupport {
@Test
public void deleteHPATest() throws Exception {
HorizontalPodAutoscaler hpa1 = new
HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
-
server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200,
hpa1).once();
+
server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200,
hpa1).once();
Exchange ex = template.request("direct:deleteHPA", new Processor() {
diff --git a/parent/pom.xml b/parent/pom.xml
index c46b20b..babe690 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -407,8 +407,8 @@
2.4.0_1
4.2.8
7.32.0.Final
-4.7.1
-4.7.1
+4.8.0
+4.8.0
1.10.0
2.3.0_3
1.8
[camel] branch master updated (21c61e6 -> 4060fca)
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 21c61e6 Regen docs new 8f7e24f Upgrade Kubernetes client and model to version 4.8.0 new 4060fca Fixed Camel-Kubernetes Karaf feature 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: .../kubernetes/producer/KubernetesHPAProducerTest.java | 10 +- parent/pom.xml | 4 ++-- platforms/karaf/features/src/main/resources/features.xml | 1 + 3 files changed, 8 insertions(+), 7 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 21c61e63d0d2aa5e1c50091a0833316fe7f6c8d5 Author: Andrea Cosentino AuthorDate: Mon Feb 17 19:19:42 2020 +0100 Regen docs --- docs/components/modules/ROOT/pages/aws2-iam-component.adoc | 2 +- docs/components/modules/ROOT/pages/index.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/components/modules/ROOT/pages/aws2-iam-component.adoc b/docs/components/modules/ROOT/pages/aws2-iam-component.adoc index ca0a3f8..5422f12 100644 --- a/docs/components/modules/ROOT/pages/aws2-iam-component.adoc +++ b/docs/components/modules/ROOT/pages/aws2-iam-component.adoc @@ -90,7 +90,7 @@ with the following path and query parameters: | *proxyHost* (producer) | To define a proxy host when instantiating the IAM client | | String | *proxyPort* (producer) | To define a proxy port when instantiating the IAM client | | Integer | *proxyProtocol* (producer) | To define a proxy protocol when instantiating the IAM client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol -| *region* (producer) | The region in which IAM client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String +| *region* (producer) | The region in which IAM client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *secretKey* (producer) | Amazon AWS Secret Key | | String | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc index 422f78a..94add1a 100644 --- a/docs/components/modules/ROOT/pages/index.adoc +++ b/docs/components/modules/ROOT/pages/index.adoc @@ -58,7 +58,7 @@ Number of Components: 328 in 262 JAR artifacts (1 deprecated) | xref:aws2-eks-component.adoc[AWS 2 EKS] (camel-aws2-eks) | 3.1 | The aws2-eks is used for managing Amazon EKS -| xref:aws2-iam-component.adoc[AWS 2 IAM] (camel-aws2-iam) | 3.1 | The aws-iam is used for managing Amazon IAM +| xref:aws2-iam-component.adoc[AWS 2 IAM] (camel-aws2-iam) | 3.1 | The aws2-iam is used for managing Amazon IAM | xref:aws2-kms-component.adoc[AWS 2 KMS] (camel-aws2-kms) | 3.1 | The aws2-kms is used for managing Amazon KMS
[camel] branch master updated (49f1bbb -> 21c61e6)
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 49f1bbb camel-core - optimize. Avoid using regexp patterns on patterns that are not regexp anyway. This reduced memory in JDK8 new 963ee9d Camel-Aws2-IAM: Update some descriptions new 21c61e6 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: .../resources/org/apache/camel/component/aws2/iam/aws2-iam.json| 4 ++-- components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc| 2 +- .../java/org/apache/camel/component/aws2/iam/IAM2Component.java| 2 +- .../org/apache/camel/component/aws2/iam/IAM2Configuration.java | 7 --- .../java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java | 2 +- .../apache/camel/builder/component/ComponentsBuilderFactory.java | 2 +- .../builder/component/dsl/Aws2IamComponentBuilderFactory.java | 4 ++-- core/camel-componentdsl/src/generated/resources/metadata.json | 2 +- docs/components/modules/ROOT/pages/aws2-iam-component.adoc | 2 +- docs/components/modules/ROOT/pages/index.adoc | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-)
[camel] 01/02: Camel-Aws2-IAM: Update some descriptions
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 963ee9d033de9eee9bbbc7a15c97522dc1baa29b
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 19:15:40 2020 +0100
Camel-Aws2-IAM: Update some descriptions
---
.../resources/org/apache/camel/component/aws2/iam/aws2-iam.json| 4 ++--
components/camel-aws2-iam/src/main/docs/aws2-iam-component.adoc| 2 +-
.../java/org/apache/camel/component/aws2/iam/IAM2Component.java| 2 +-
.../org/apache/camel/component/aws2/iam/IAM2Configuration.java | 7 ---
.../java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java | 2 +-
.../apache/camel/builder/component/ComponentsBuilderFactory.java | 2 +-
.../builder/component/dsl/Aws2IamComponentBuilderFactory.java | 4 ++--
core/camel-componentdsl/src/generated/resources/metadata.json | 2 +-
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git
a/components/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
b/components/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
index 0d7c0e1..dea40a0 100644
---
a/components/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
+++
b/components/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
@@ -5,7 +5,7 @@
"extendsScheme": "",
"syntax": "aws2-iam:label",
"title": "AWS 2 IAM",
-"description": "The aws-iam is used for managing Amazon IAM",
+"description": "The aws2-iam is used for managing Amazon IAM",
"label": "cloud,management",
"deprecated": false,
"async": false,
@@ -35,7 +35,7 @@
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.iam.IAM2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the IAM client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.iam.IAM2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the IAM client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass": "org.apache.camel.component.aws2.iam.IAM2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the IAM client" },
-"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.iam.IAM2Configuration", "configurationField":
"configuration", "description": "The region in which IAM client needs to work.
When using this parameter, the configuration will expect the capitalized name
of the region (for example AP_E [...]
+"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.iam.IAM2Configuration", "configurationField":
"configuration", "description": "The region in which IAM client needs to work.
When using this parameter, the configuration will expect the lowercase name of
the region (for example ap-eas [...]
"secretKey": { "kind": "parameter", "displayName": "Secret Key", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass": "org.apache.camel.component.aws2.iam.IAM2Configuration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
"synchronous": { "kind": "parameter", "displayName":
[GitHub] [camel-quarkus] aldettinger opened a new issue #729: Create dataformat-json itests from jackson itests
aldettinger opened a new issue #729: Create dataformat-json itests from jackson itests URL: https://github.com/apache/camel-quarkus/issues/729 The idea is that dataformat-json will generalize all json marshaling related itests from jackson itests. 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 With regards, Apache Git Services
[camel-spring-boot] branch master updated: Fix CS and RAT plugin check
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 The following commit(s) were added to refs/heads/master by this push: new 92bba8a Fix CS and RAT plugin check 92bba8a is described below commit 92bba8adc1caa5750df7062f84f0a34446af805b Author: Claus Ibsen AuthorDate: Mon Feb 17 17:14:20 2020 +0100 Fix CS and RAT plugin check --- .../JSR356WebSocketContextListenerAutoConfiguration.java | 16 pom.xml | 3 ++- .../camel/springboot/maven/StarterGeneratorMojo.java | 16 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/components-starter/camel-websocket-jsr356-starter/src/main/java/org/apache/camel/websocket/jsr356/springboot/JSR356WebSocketContextListenerAutoConfiguration.java b/components-starter/camel-websocket-jsr356-starter/src/main/java/org/apache/camel/websocket/jsr356/springboot/JSR356WebSocketContextListenerAutoConfiguration.java index 152e841..89dff62 100644 --- a/components-starter/camel-websocket-jsr356-starter/src/main/java/org/apache/camel/websocket/jsr356/springboot/JSR356WebSocketContextListenerAutoConfiguration.java +++ b/components-starter/camel-websocket-jsr356-starter/src/main/java/org/apache/camel/websocket/jsr356/springboot/JSR356WebSocketContextListenerAutoConfiguration.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.websocket.jsr356.springboot; import javax.servlet.ServletContext; diff --git a/pom.xml b/pom.xml index 512531c..7ce52e1 100644 --- a/pom.xml +++ b/pom.xml @@ -316,7 +316,8 @@ false -**/generated.txt +**/*.mvel +**/catalog/*.properties **/*.json **/README **/README.txt diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java index d990c6c..a52372e 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.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.springboot.maven; import java.io.File;
[camel] branch master updated: camel-core - optimize. Avoid using regexp patterns on patterns that are not regexp anyway. This reduced memory in JDK8
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 49f1bbb camel-core - optimize. Avoid using regexp patterns on
patterns that are not regexp anyway. This reduced memory in JDK8
49f1bbb is described below
commit 49f155db1ee540fb6b6c455e37a3810c7c52
Author: Claus Ibsen
AuthorDate: Mon Feb 17 16:58:48 2020 +0100
camel-core - optimize. Avoid using regexp patterns on patterns that are not
regexp anyway. This reduced memory in JDK8
---
.../apache/camel/impl/engine/DefaultStreamCachingStrategy.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
index 44d88bb..bf01555 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
@@ -22,7 +22,6 @@ import java.lang.management.MemoryMXBean;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import java.util.regex.Matcher;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -34,6 +33,7 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.FilePathResolver;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -244,12 +244,12 @@ public class DefaultStreamCachingStrategy extends
ServiceSupport implements Came
protected String defaultManagementName(String path) {
// must quote the names to have it work as literal replacement
-String name = Matcher.quoteReplacement(camelContext.getName());
+String name = camelContext.getName();
// replace tokens
String answer = path;
-answer = answer.replaceFirst("#camelId#", name);
-answer = answer.replaceFirst("#name#", name);
+answer = StringHelper.replaceAll(answer, "#camelId#", name);
+answer = StringHelper.replaceAll(answer, "#name#", name);
// replace custom
answer = customResolveManagementName(answer);
return answer;
@@ -258,7 +258,7 @@ public class DefaultStreamCachingStrategy extends
ServiceSupport implements Came
protected String customResolveManagementName(String pattern) {
if (pattern.contains("#uuid#")) {
String uuid = UUID.randomUUID().toString();
-pattern = pattern.replaceFirst("#uuid#", uuid);
+pattern = StringHelper.replaceAll(pattern, "#uuid#", uuid);
}
return FilePathResolver.resolvePath(pattern);
}
[camel-quarkus] branch master updated: Resolves #162 adds camel-box support
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-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 5f82c11 Resolves #162 adds camel-box support
new f64b94c Merge pull request #722 from johnpoth/camel-box
5f82c11 is described below
commit 5f82c11f00278d6f744484afd8c84a8f343087f1
Author: John Poth
AuthorDate: Tue Feb 4 16:52:19 2020 +0100
Resolves #162 adds camel-box support
---
.github/workflows/pr-build.yaml| 1 +
.../pages/list-of-camel-quarkus-extensions.adoc| 5 +-
extensions/box/deployment/pom.xml | 81 +
.../component/box/deployment/BoxProcessor.java | 100
extensions/box/pom.xml | 39 +++
extensions/box/runtime/pom.xml | 82 +
.../main/resources/META-INF/quarkus-extension.yaml | 27 +
extensions/pom.xml | 1 +
extensions/readme.adoc | 5 +-
integration-tests/box/README.adoc | 17 +++
integration-tests/box/pom.xml | 129 +
.../quarkus/component/box/it/BoxResource.java | 100
.../quarkus/component/box/it/BoxRouteBuilder.java | 41 +++
.../box/src/main/resources/application.properties | 35 ++
.../camel/quarkus/component/box/it/BoxIT.java | 29 +
.../camel/quarkus/component/box/it/BoxTest.java| 55 +
integration-tests/pom.xml | 1 +
poms/bom-deployment/pom.xml| 5 +
poms/bom/pom.xml | 10 ++
19 files changed, 761 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index c9fd9ed..50e96ee 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -409,6 +409,7 @@ jobs:
-Dnative \
-Ddocker \
-DskipTests \
+-pl :camel-quarkus-integration-test-box \
-pl :camel-quarkus-integration-test-salesforce \
-pl :camel-quarkus-integration-test-slack \
-pl :camel-quarkus-integration-test-twitter
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index b884fda..c88fe48 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -18,7 +18,7 @@ In case you are missing some Camel feature in the list:
== Camel Components
// components: START
-Number of Camel components: 64 in 55 JAR artifacts (0 deprecated)
+Number of Camel components: 65 in 56 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -72,6 +72,9 @@ Number of Camel components: 64 in 55 JAR artifacts (0
deprecated)
|
link:https://camel.apache.org/components/latest/bean-validator-component.html[Bean
Validator] (camel-quarkus-bean-validator) +
`bean-validator:label` | 1.0.0-M1 | The Validator component performs bean
validation of the message body using the Java Bean Validation API.
+| link:https://camel.apache.org/components/latest/box-component.html[Box]
(camel-quarkus-box) +
+`box:apiName/methodName` | 1.2.0 | For uploading downloading and managing
files folders groups collaborations etc on box DOT com.
+
| link:https://camel.apache.org/components/latest/class-component.html[Class]
(camel-quarkus-bean) +
`class:beanName` | 0.2.0 | The class component is for invoking Java classes
(Java beans) from Camel.
diff --git a/extensions/box/deployment/pom.xml
b/extensions/box/deployment/pom.xml
new file mode 100644
index 000..b5f5af6
--- /dev/null
+++ b/extensions/box/deployment/pom.xml
@@ -0,0 +1,81 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-box-parent
+1.1.0-SNAPSHOT
+../pom.xml
+
+
+camel-quarkus-box-deployment
+Camel Quarkus :: Box :: Deployment
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom-deployment
+${project.version}
+pom
+import
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-core-deployment
+
+
+org.jsoup
+jsoup
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-box
+
+
+
+
+
+
[GitHub] [camel-quarkus] oscerd closed issue #162: support camel-box
oscerd closed issue #162: support camel-box URL: https://github.com/apache/camel-quarkus/issues/162 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 With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd merged pull request #722: Resolves #162 adds camel-box support
oscerd merged pull request #722: Resolves #162 adds camel-box support URL: https://github.com/apache/camel-quarkus/pull/722 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 With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd closed issue #715: improve camel-jira integration test
oscerd closed issue #715: improve camel-jira integration test URL: https://github.com/apache/camel-quarkus/issues/715 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 With regards, Apache Git Services
[camel-quarkus] branch master updated: Improve Jira extension - Use RuntimeInitializedClassBuildItem instead of configuring additionalBuildArgs - Use application.properties for test configuration
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-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new d5165e7 Improve Jira extension - Use RuntimeInitializedClassBuildItem
instead of configuring additionalBuildArgs - Use application.properties for
test configuration
new 05ce2f6 Merge pull request #728 from jamesnetherton/jira-improvements
d5165e7 is described below
commit d5165e7588fb5cd25748b3258f3d0010241f052f
Author: James Netherton
AuthorDate: Mon Feb 17 13:26:10 2020 +
Improve Jira extension
- Use RuntimeInitializedClassBuildItem instead of configuring
additionalBuildArgs
- Use application.properties for test configuration
Fixes #715
---
.../component/jira/deployment/JiraProcessor.java | 6 +++
extensions/jira/runtime/pom.xml| 18 -
integration-tests/jira/README.adoc | 17
integration-tests/jira/pom.xml | 35 ++--
.../quarkus/component/jira/it/JiraResource.java| 46 +++---
.../component/jira/it/JiraRouteBuilder.java| 41 ---
.../jira/src/main/resources/application.properties | 26
.../camel/quarkus/component/jira/it/JiraIT.java| 7 +++-
.../camel/quarkus/component/jira/it/JiraTest.java | 31 +--
poms/bom/pom.xml | 24 +++
10 files changed, 115 insertions(+), 136 deletions(-)
diff --git
a/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
b/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
index 89be59f..54deed1 100644
---
a/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
+++
b/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.jira.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class JiraProcessor {
@@ -34,4 +35,9 @@ class JiraProcessor {
return new FeatureBuildItem(FEATURE);
}
+@BuildStep
+RuntimeInitializedClassBuildItem configureRuntimeInitializedClasses() {
+return new
RuntimeInitializedClassBuildItem("com.google.api.client.auth.oauth.OAuthParameters");
+}
+
}
diff --git a/extensions/jira/runtime/pom.xml b/extensions/jira/runtime/pom.xml
index bfd3b3a..92e9eb8 100644
--- a/extensions/jira/runtime/pom.xml
+++ b/extensions/jira/runtime/pom.xml
@@ -75,24 +75,6 @@
org.apache.camel
camel-jira
-
-
-javax.ws.rs
-jsr311-api
-
-
-com.google.code.findbugs
-jsr305
-
-
-org.apache.httpcomponents
-httpclient-cache
-
-
-commons-logging
-commons-logging
-
-
org.apache.camel.quarkus
diff --git a/integration-tests/jira/README.adoc
b/integration-tests/jira/README.adoc
new file mode 100644
index 000..e4208c6
--- /dev/null
+++ b/integration-tests/jira/README.adoc
@@ -0,0 +1,17 @@
+== Camel Quarkus Jira Integration Tests
+
+To run `camel-quarkus-jira` integration tests, you need a running Jira
instance to test against.
+
+A simple way of doing this is to use the
https://hub.docker.com/r/atlassian/jira-software[Jira Docker image].
+
+Set the following environment variables:
+
+[source,shell]
+
+export JIRA_ISSUES_PROJECT_KEY=TEST
+export JIRA_URL=http://localhost:8080/
+export JIRA_USERNAME=my-jira-username
+export JIRA_PASSWORD=my-jira-password
+
+
+
diff --git a/integration-tests/jira/pom.xml b/integration-tests/jira/pom.xml
index c0bcaf5..ff60c32 100644
--- a/integration-tests/jira/pom.xml
+++ b/integration-tests/jira/pom.xml
@@ -47,14 +47,6 @@
camel-quarkus-jira
-org.apache.camel.quarkus
-camel-quarkus-direct
-
-
-org.apache.camel.quarkus
-camel-quarkus-log
-
-
io.quarkus
quarkus-resteasy
@@ -102,6 +94,9 @@
native
+
+native
+
@@ -121,30 +116,6 @@
[GitHub] [camel-quarkus] oscerd merged pull request #728: Improve Jira extension
oscerd merged pull request #728: Improve Jira extension URL: https://github.com/apache/camel-quarkus/pull/728 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 With regards, Apache Git Services
[camel] branch master updated (2766be3 -> 8c53a06)
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 2766be3 CAMEL-14542: camel-core - Optimize simple language add 8c53a06 CAMEL-14542: camel-core - Optimize simple language No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/language/simple/BaseSimpleParser.java| 2 +- .../src/main/java/org/apache/camel/language/simple/SimpleLanguage.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
[camel] branch master updated (8c64a52 -> 2766be3)
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 8c64a52 CAMEL-14569: camel-zookeeper - Use test containers for testing add ac6dcba camel-core - optimize. Avoid using regexp patterns on patterns that are not regexp anyway. This reduced memory in JDK8 add a1e84f5 CAMEL-14580: Avoid ProcessorReifier tangle in DefaultCamelContext. add 2766be3 CAMEL-14542: camel-core - Optimize simple language No new revisions were added by this update. Summary of changes: .../impl/engine/BaseExecutorServiceManager.java| 2 +- .../impl/engine/DefaultManagementNameStrategy.java | 9 +- .../camel/language/simple/SimpleTokenizer.java | 146 ++--- .../language/simple/types/SimpleTokenType.java | 2 +- .../org/apache/camel/reifier/ProcessorReifier.java | 10 +- .../core/osgi/OsgiManagementNameStrategy.java | 14 +- .../java/org/apache/camel/util/StringHelper.java | 2 +- .../apache/camel/util/concurrent/ThreadHelper.java | 10 +- 8 files changed, 89 insertions(+), 106 deletions(-)
[GitHub] [camel-quarkus] lburgazzoli merged pull request #727: Update quarkus to v1.3.0.Alpha2
lburgazzoli merged pull request #727: Update quarkus to v1.3.0.Alpha2 URL: https://github.com/apache/camel-quarkus/pull/727 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 With regards, Apache Git Services
[camel-quarkus] branch master updated (4241a4b -> 1b0c058)
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 4241a4b Fix #598 Use quarkus.package.type=native instead of the native-image mojo add 467ece2 Update quarkus to v1.3.0.Alpha2 add 1b0c058 Fix MongoDbProcessor according to the latest changes in the mongodb extension No new revisions were added by this update. Summary of changes: .../mongodb/deployment/MongoDbProcessor.java | 22 ++ pom.xml| 2 +- 2 files changed, 19 insertions(+), 5 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton closed issue #708: Restore the testing of the font option when switching to camel 3.1.0
jamesnetherton closed issue #708: Restore the testing of the font option when switching to camel 3.1.0 URL: https://github.com/apache/camel-quarkus/issues/708 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 With regards, Apache Git Services
[GitHub] [camel-quarkus] jamesnetherton commented on issue #708: Restore the testing of the font option when switching to camel 3.1.0
jamesnetherton commented on issue #708: Restore the testing of the font option when switching to camel 3.1.0 URL: https://github.com/apache/camel-quarkus/issues/708#issuecomment-587025368 I've applied the change & verified that this works fine on the `camel-master` branch. 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 With regards, Apache Git Services
[camel] branch master updated: CAMEL-14569: camel-zookeeper - Use test containers for testing
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli 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 8c64a52 CAMEL-14569: camel-zookeeper - Use test containers for testing
8c64a52 is described below
commit 8c64a52b93ca409fa54d4f10e9de8e57f82b9920
Author: lburgazzoli
AuthorDate: Mon Feb 17 13:03:34 2020 +0100
CAMEL-14569: camel-zookeeper - Use test containers for testing
---
components/camel-zookeeper/pom.xml | 92 +++--
.../component/zookeeper/ConsumeChildrenTest.java | 2 +-
.../camel/component/zookeeper/ConsumeDataTest.java | 4 +-
.../component/zookeeper/ZooKeeperContainer.java| 94 +
.../zookeeper/ZooKeeperManagedEndpointTest.java| 38 +---
.../component/zookeeper/ZooKeeperProducerTest.java | 64 +++---
.../component/zookeeper/ZooKeeperTestSupport.java | 219 ++---
.../zookeeper/ZookeeperConnectionManagerTest.java | 2 +-
.../cloud/SpringZooKeeperServiceCallRouteTest.java | 48 +++--
.../cloud/ZooKeeperServiceCallRouteTest.java | 18 +-
.../cloud/ZooKeeperServiceDiscoveryTest.java | 15 +-
.../ZooKeeperServiceRegistrationTestBase.java | 17 +-
.../ZooKeeperClusteredRoutePolicyFactoryMain.java | 2 +-
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 22 +--
.../cluster/ZooKeeperClusteredRoutePolicyTest.java | 22 +--
.../zookeeper/cluster/ZooKeeperMasterMain.java | 2 +-
.../zookeeper/cluster/ZooKeeperMasterTest.java | 22 +--
.../src/test/resources/log4j2.properties | 2 +-
.../cloud/SpringZooKeeperServiceCallRouteTest.xml | 2 +-
...ingZooKeeperClusteredRouteConfigurationTest.xml | 13 +-
20 files changed, 344 insertions(+), 356 deletions(-)
diff --git a/components/camel-zookeeper/pom.xml
b/components/camel-zookeeper/pom.xml
index d52c3af..64c43ba 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -136,7 +136,7 @@
org.apache.camel
-camel-test-spring
+camel-testcontainers-spring
test
@@ -157,20 +157,82 @@
-
-
-
-maven-surefire-plugin
-
-false
-true
-1
-true
-
600
-
-
-
-
+
+
+
+zookeeper-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
+
+
+
+zookeeper-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+false
+true
+1
+true
+
600
+
+
+
+
+
+
+
+
+zookeeper-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+false
+true
+1
+true
+
600
+
+
+
+
+
+
+
diff --git
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
index 26ba9cc..95c3cef 100644
---
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
+++
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
@@ -36,7 +36,7 @@ public class ConsumeChildrenTest extends ZooKeeperTestSupport
{
protected RouteBuilder[] createRouteBuilders() throws Exception {
return new RouteBuilder[] {new RouteBuilder() {
public void
[camel] branch master updated (cd84646 -> c724b2c)
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 cd84646 CAMEL-14580: Typo add 7229ca5 Camel-AWS2-SES: Fixed region description add c724b2c Regen docs No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/component/aws2/ses/aws2-ses.json | 2 +- components/camel-aws2-ses/src/main/docs/aws2-ses-component.adoc | 2 +- .../java/org/apache/camel/component/aws2/ses/Ses2Configuration.java | 2 +- docs/components/modules/ROOT/pages/aws2-ses-component.adoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
[camel-spring-boot] branch master updated: Run the gh action every 10 minutes
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 The following commit(s) were added to refs/heads/master by this push: new b73b946 Run the gh action every 10 minutes b73b946 is described below commit b73b9462a786f7694044e86c50262ddbb0b4b5ed Author: Andrea Cosentino AuthorDate: Mon Feb 17 14:43:14 2020 +0100 Run the gh action every 10 minutes --- .github/workflows/automatic-sync-master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-sync-master.yml b/.github/workflows/automatic-sync-master.yml index 87cbce0..406937b 100644 --- a/.github/workflows/automatic-sync-master.yml +++ b/.github/workflows/automatic-sync-master.yml @@ -19,8 +19,8 @@ name: Sync Camel Spring Boot Master Branch on: schedule: -# Run every day at midnight -- cron: '0 0 * * *' +# Run every 10 minutes +- cron: '10 * * * *' jobs: build: name: Build
[camel-spring-boot] branch master updated: 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
The following commit(s) were added to refs/heads/master by this push:
new 2408af3 Regen
2408af3 is described below
commit 2408af3fa04e2f77a604917710363bce59661317
Author: Claus Ibsen
AuthorDate: Mon Feb 17 14:38:49 2020 +0100
Regen
---
.../apache/camel/springboot/catalog/components/aws2-ses.json | 2 +-
components-starter/README.adoc | 5 -
.../src/main/docs/aws2-ses-starter.adoc | 3 +--
.../aws2/ses/springboot/Ses2ComponentConfiguration.java | 8
components-starter/camel-corda-starter/pom.xml | 12
.../camel/spring/boot/CamelConfigurationProperties.java | 10 ++
docs/modules/ROOT/pages/aws2-ses-starter.adoc| 3 +--
docs/modules/ROOT/pages/list.adoc| 5 -
8 files changed, 25 insertions(+), 23 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json
index 85bc450..8f5a2bc 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json
@@ -33,7 +33,7 @@
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
SES client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the SES client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the SES client" },
-"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField":
"configuration", "description": "The region in which SES client needs to work.
When using this parameter, the configuration will expect the capitalized name
of the region (for example AP_E [...]
+"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField":
"configuration", "description": "The region in which ECS client needs to work.
When using this parameter, the configuration will expect the lowercase name of
the region (for example ap-eas [...]
"replyToAddresses": { "kind": "parameter", "displayName": "Reply To
Addresses", "group": "producer", "label": "", "required": false, "type":
"array", "javaType": "java.util.List", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField":
"configuration", "description": "List of reply-to email address(es) for the
message, override it using 'CamelAwsSesReplyToAddresses' header." },
"returnPath": { "kind": "parameter", "displayName": "Return Path",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration",
"configurationField": "configuration", "description": "The email address to
which bounce notifications are to be forwarded, override it using
'CamelAwsSesReturnPath' header." },
"subject": { "kind": "parameter", "displayName": "Subject",
[camel] branch master updated (8422ab4 -> cd84646)
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 8422ab4 Camel-AWS2-SES: Regen
add bafe9c8 CAMEL-14580: Avoid ProcessorReifier tangle in
DefaultCamelContext.
add cd84646 CAMEL-14580: Typo
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/ExtendedCamelContext.java | 11 +++
.../{DataFormatName.java => ReifierStrategy.java} | 10 ++
.../camel/impl/engine/AbstractCamelContext.java| 22 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 5 +++--
.../org/apache/camel/reifier/ProcessorReifier.java | 15 ---
5 files changed, 45 insertions(+), 18 deletions(-)
copy core/camel-api/src/main/java/org/apache/camel/spi/{DataFormatName.java =>
ReifierStrategy.java} (74%)
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request #728: Improve Jira extension
jamesnetherton opened a new pull request #728: Improve Jira extension URL: https://github.com/apache/camel-quarkus/pull/728 Fixes #715 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 With regards, Apache Git Services
[GitHub] [camel-quarkus] johnpoth commented on issue #722: Resolves #162 adds camel-box support
johnpoth commented on issue #722: Resolves #162 adds camel-box support URL: https://github.com/apache/camel-quarkus/pull/722#issuecomment-586988669 @oscerd @ppalaga addressed comments, thanks for reviewing ! 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 With regards, Apache Git Services
[camel-spring-boot] 04/04: Added a test for aws2-sqs starter
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 5079141fa3d88022aea868faaf1bd1ebdd6535f5
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 14:00:21 2020 +0100
Added a test for aws2-sqs starter
---
.../camel/itest/springboot/CamelAws2SqsTest.java | 48 ++
1 file changed, 48 insertions(+)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAws2SqsTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAws2SqsTest.java
new file mode 100644
index 000..2c42356
--- /dev/null
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAws2SqsTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelAws2SqsTest extends AbstractSpringBootTestSupport {
+
+@Deployment
+public static Archive createSpringBootPackage() throws Exception {
+return ArquillianPackager.springBootPackage(createTestConfig());
+}
+
+public static ITestConfig createTestConfig() {
+return new ITestConfigBuilder()
+.module(inferModuleName(CamelAws2SqsTest.class))
+.build();
+}
+
+@Test
+public void componentTests() throws Exception {
+this.runComponentTest(config);
+this.runModuleUnitTestsIfEnabled(config);
+}
+
+
+}
[camel-spring-boot] 01/04: 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 c0a6a57d6360d379a763e136e363e5d851813124
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 13:08:50 2020 +0100
Regen
---
.../camel/springboot/catalog/components/corda.json | 7 --
components-starter/camel-corda-starter/pom.xml | 12
.../src/main/docs/corda-starter.adoc | 18 ++---
.../springboot/CordaComponentConfiguration.java| 83 --
docs/modules/ROOT/pages/corda-starter.adoc | 1 -
tooling/camel-spring-boot-dependencies/pom.xml | 5 ++
6 files changed, 56 insertions(+), 70 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
index 99cbc7a..5416623 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
@@ -27,15 +27,8 @@
"properties": {
"node": { "kind": "path", "displayName": "Node", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "The url for the corda node" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled b [...]
-"pageSpecification": { "kind": "parameter", "displayName": "Page
Specification", "group": "consumer", "label": "consumer", "required": false,
"type": "object", "javaType":
"net.corda.core.node.services.vault.PageSpecification", "deprecated": false,
"secret": false, "defaultValue": "200", "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "PageSpecification allows specification of a
page number (starting f [...]
-"processSnapshot": { "kind": "parameter", "displayName": "Process
Snapshot", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "Whether to process snapshots or not" },
-"sort": { "kind": "parameter", "displayName": "Sort", "group": "consumer",
"label": "consumer", "required": false, "type": "object", "javaType":
"net.corda.core.node.services.vault.Sort", "enum": [ "ASC", "DESC" ],
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "Sort allows specification of a set of entity
attribute names and their associated directionality and nu [...]
-"contractStateClass": { "kind": "parameter", "displayName": "Contract
State Class", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "string", "javaType":
"java.lang.Class", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "A contract state (or just state) contains
opaque data used by a [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when
[camel-spring-boot] branch master updated (071f439 -> 5079141)
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 071f439 CAMEL-14565: Add docs for missing option
new c0a6a57 Regen
new c4cac5c Regen again
new cb5085f Added a starter for AWS2-SQS
new 5079141 Added a test for aws2-sqs starter
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:
.../camel/springboot/catalog/components.properties | 1 +
.../components/{aws-sqs.json => aws2-sqs.json} | 84 +++---
.../pom.xml| 4 +-
.../src/main/docs/aws2-sqs-starter.adoc| 72 +++
.../Sqs2ComponentAutoConfiguration.java} | 32 -
.../springboot/Sqs2ComponentConfiguration.java}| 51 +++--
.../src/main/resources/META-INF/LICENSE.txt| 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides| 2 +-
components-starter/camel-corda-starter/pom.xml | 12
components-starter/pom.xml | 1 +
docs/modules/ROOT/pages/aws2-sqs-starter.adoc | 72 +++
docs/modules/ROOT/pages/corda-starter.adoc | 19 +++--
...CamelAws2EcsTest.java => CamelAws2SqsTest.java} | 4 +-
tooling/camel-spring-boot-dependencies/pom.xml | 10 +++
16 files changed, 265 insertions(+), 101 deletions(-)
copy
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/{aws-sqs.json
=> aws2-sqs.json} (71%)
copy components-starter/{camel-aws2-cw-starter =>
camel-aws2-sqs-starter}/pom.xml (96%)
create mode 100644
components-starter/camel-aws2-sqs-starter/src/main/docs/aws2-sqs-starter.adoc
copy
components-starter/{camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
=>
camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java}
(85%)
copy
components-starter/{camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
=>
camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java}
(92%)
copy {tooling/camel-spring-boot-docs-maven-plugin =>
components-starter/camel-aws2-sqs-starter}/src/main/resources/META-INF/LICENSE.txt
(100%)
copy {tooling/camel-spring-boot-docs-maven-plugin =>
components-starter/camel-aws2-sqs-starter}/src/main/resources/META-INF/NOTICE.txt
(100%)
copy components-starter/{camel-any23-starter =>
camel-aws2-sqs-starter}/src/main/resources/META-INF/spring.factories (94%)
copy components-starter/{camel-ahc-ws-starter =>
camel-aws2-sqs-starter}/src/main/resources/META-INF/spring.provides (97%)
create mode 100644 docs/modules/ROOT/pages/aws2-sqs-starter.adoc
copy
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelAws2EcsTest.java
=> CamelAws2SqsTest.java} (92%)
[camel-spring-boot] 02/04: Regen again
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 c4cac5c0fea6db3e1153a942e7ab1695b39dc5b5
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 13:20:55 2020 +0100
Regen again
---
.../camel/springboot/catalog/components/corda.json | 7 ++
.../src/main/docs/corda-starter.adoc | 18 +++--
.../springboot/CordaComponentConfiguration.java| 83 ++
docs/modules/ROOT/pages/corda-starter.adoc | 18 +++--
4 files changed, 77 insertions(+), 49 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
index 5416623..99cbc7a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
@@ -27,8 +27,15 @@
"properties": {
"node": { "kind": "path", "displayName": "Node", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "The url for the corda node" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled b [...]
+"pageSpecification": { "kind": "parameter", "displayName": "Page
Specification", "group": "consumer", "label": "consumer", "required": false,
"type": "object", "javaType":
"net.corda.core.node.services.vault.PageSpecification", "deprecated": false,
"secret": false, "defaultValue": "200", "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "PageSpecification allows specification of a
page number (starting f [...]
+"processSnapshot": { "kind": "parameter", "displayName": "Process
Snapshot", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "Whether to process snapshots or not" },
+"sort": { "kind": "parameter", "displayName": "Sort", "group": "consumer",
"label": "consumer", "required": false, "type": "object", "javaType":
"net.corda.core.node.services.vault.Sort", "enum": [ "ASC", "DESC" ],
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "Sort allows specification of a set of entity
attribute names and their associated directionality and nu [...]
+"contractStateClass": { "kind": "parameter", "displayName": "Contract
State Class", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "string", "javaType":
"java.lang.Class", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.corda.CordaConfiguration", "configurationField":
"configuration", "description": "A contract state (or just state) contains
opaque data used by a [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
+"flowLogicArguments": { "kind": "parameter", "displayName": "Flow
[camel-spring-boot] 03/04: Added a starter for AWS2-SQS
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 cb5085f8afdade30cb512da6c8c1aca7cd79
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 13:24:26 2020 +0100
Added a starter for AWS2-SQS
---
.../camel/springboot/catalog/components.properties | 1 +
.../springboot/catalog/components/aws2-sqs.json| 91 +++
components-starter/camel-aws2-sqs-starter/pom.xml | 61 +++
.../src/main/docs/aws2-sqs-starter.adoc| 72 +++
.../springboot/Sqs2ComponentAutoConfiguration.java | 128 +
.../sqs/springboot/Sqs2ComponentConfiguration.java | 609 +
.../src/main/resources/META-INF/LICENSE.txt| 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/META-INF/spring.factories | 19 +
.../src/main/resources/META-INF/spring.provides| 17 +
components-starter/pom.xml | 1 +
docs/modules/ROOT/pages/aws2-sqs-starter.adoc | 72 +++
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
13 files changed, 1290 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index a99ee53..567c4b6 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -48,6 +48,7 @@ aws2-mq
aws2-msk
aws2-ses
aws2-sns
+aws2-sqs
aws2-translate
azure-blob
azure-queue
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
new file mode 100644
index 000..290ccf1
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
@@ -0,0 +1,91 @@
+{
+ "component": {
+"kind": "component",
+"scheme": "aws2-sqs",
+"extendsScheme": "",
+"syntax": "aws2-sqs:queueNameOrArn",
+"title": "AWS 2 Simple Queue Service",
+"description": "The aws2-sqs component is used for sending and receiving
messages to Amazon's SQS service.",
+"label": "cloud,messaging",
+"deprecated": false,
+"async": false,
+"consumerOnly": false,
+"producerOnly": false,
+"lenientProperties": false,
+"javaType": "org.apache.camel.component.aws2.sqs.Sqs2Component",
+"firstVersion": "3.1.0",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-aws2-sqs-starter",
+"version": "3.1.0-SNAPSHOT"
+ },
+ "componentProperties": {
+"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Amazon AWS Access Key" },
+"region": { "kind": "property", "displayName": "Region", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Specify the queue region which could be used with queueOwnerAWSAccountId to
build the service URL." },
+"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Amazon AWS Secret Key" },
+"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by [...]
+"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
+"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced",
[camel] branch master updated (638314b -> 8422ab4)
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 638314b CAMEL-14553 - Create an AWS-SQS component based on SDK v2, final regen add 848bb1a Regen add fbd8bf6 Camel-AWS2-SES: Added better description add 6d34169 Camel-AWS2-SES: Regen docs add 8422ab4 Camel-AWS2-SES: Regen No new revisions were added by this update. Summary of changes: .../apache/camel/component/aws2/ses/aws2-ses.json | 2 +- .../src/main/docs/aws2-ses-component.adoc | 4 ++-- .../camel/component/aws2/ses/Ses2Component.java| 3 +++ .../component/aws2/ses/Ses2Configuration.java | 7 --- .../modules/ROOT/pages/aws2-ses-component.adoc | 4 ++-- .../modules/ROOT/pages/corda-component.adoc| 24 ++ 6 files changed, 28 insertions(+), 16 deletions(-)
[camel] branch master updated (1ad92f0 -> 638314b)
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 1ad92f0 CAMEL-14570: camel-zookeeper-master - Use testcontainers for testing new cff4110 CAMEL-14553 - Create an AWS-SQS component based on SDK v2 new 4f3067b CAMEL-14553 - Create an AWS-SQS component based on SDK v2, docs new fec9921 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen docs new 7712dcc CAMEL-14553 - Create an AWS-SQS component based on SDK v2, added component to kit new 9cb69db CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen new 6edfe84 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed CS new c76c2ce CAMEL-14553 - Create an AWS-SQS component based on SDK v2, added note about OSGi support new fdba5c2 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed descriptions new 27b8c51 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen docs new 638314b CAMEL-14553 - Create an AWS-SQS component based on SDK v2, final regen The 10 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/src/main/descriptors/common-bin.xml | 1 + bom/camel-bom/pom.xml | 5 + components/camel-aws2-sqs/pom.xml | 86 .../aws2/sqs/Sqs2ComponentConfigurer.java | 35 ++ .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 131 + .../services/org/apache/camel/component.properties | 7 + .../services/org/apache/camel/component/aws2-sqs | 2 + .../org/apache/camel/configurer/aws2-sqs-component | 2 + .../org/apache/camel/configurer/aws2-sqs-endpoint | 2 + .../apache/camel/component/aws2/sqs/aws2-sqs.json | 91 .../src/main/docs/aws2-sqs-component.adoc | 351 + .../aws2/sqs/ConstantMessageGroupIdStrategy.java | 28 + .../ExchangeIdMessageDeduplicationIdStrategy.java | 28 + .../aws2/sqs/ExchangeIdMessageGroupIdStrategy.java | 28 + .../aws2/sqs/MessageDeduplicationIdStrategy.java | 25 + .../component/aws2/sqs/MessageGroupIdStrategy.java | 25 + .../sqs/NullMessageDeduplicationIdStrategy.java| 28 + .../sqs/PropertyValueMessageGroupIdStrategy.java | 28 + .../camel/component/aws2/sqs/Sqs2Component.java| 142 + .../aws2/sqs/Sqs2ComponentVerifierExtension.java | 84 +++ .../component/aws2/sqs/Sqs2Configuration.java | 573 + .../camel/component/aws2/sqs/Sqs2Constants.java| 33 ++ .../camel/component/aws2/sqs/Sqs2Consumer.java | 334 .../camel/component/aws2/sqs/Sqs2Endpoint.java | 391 ++ .../aws2/sqs/Sqs2HeaderFilterStrategy.java | 30 ++ .../camel/component/aws2/sqs/Sqs2Operations.java | 22 + .../camel/component/aws2/sqs/Sqs2Producer.java | 308 +++ .../component/aws2/sqs/AmazonSQSClientMock.java| 225 .../component/aws2/sqs/SqsBatchConsumerTest.java | 79 +++ .../aws2/sqs/SqsComponentClientRegistryTest.java | 41 ++ .../aws2/sqs/SqsComponentConfigurationTest.java| 304 +++ .../component/aws2/sqs/SqsComponentSpringTest.java | 133 + .../camel/component/aws2/sqs/SqsComponentTest.java | 105 .../sqs/SqsComponentVerifierExtensionTest.java | 71 +++ .../aws2/sqs/SqsConcurrentConsumerTest.java| 90 .../component/aws2/sqs/SqsConfigurationTest.java | 48 ++ .../aws2/sqs/SqsConsumerIdleMessageTest.java | 55 ++ .../sqs/SqsDoesNotExtendMessageVisibilityTest.java | 72 +++ .../aws2/sqs/SqsEndpointExplicitQueueUrlTest.java | 48 ++ .../component/aws2/sqs/SqsProducerBatchTest.java | 76 +++ .../component/aws2/sqs/SqsProducerDeleteTest.java | 67 +++ .../aws2/sqs/SqsProducerListQueuesTest.java| 68 +++ .../integration/SqsComponentIntegrationTest.java | 109 .../SqsConsumerMessageIntegrationTest.java | 72 +++ .../SqsProducerBatchSendFifoIntegrationTest.java | 76 +++ .../SqsProducerBatchSendIntegrationTest.java | 75 +++ .../SqsProducerDeleteMessageIntegrationTest.java | 67 +++ .../src/test/resources/log4j2.properties | 28 + .../aws2/sqs/SqsComponentSpringTest-context.xml| 51 ++ components/pom.xml | 1 + core/camel-allcomponents/pom.xml | 4 + .../component/ComponentsBuilderFactory.java| 12 + .../dsl/Aws2SqsComponentBuilderFactory.java| 181 +++ .../src/generated/resources/metadata.json | 20 + docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/aws2-sqs-component.adoc | 352 + docs/components/modules/ROOT/pages/index.adoc | 4
[camel] 06/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6edfe849d1a22151ff75f7504430448f17bbacc6
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 12:51:38 2020 +0100
CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed CS
---
.../camel/component/aws2/sqs/Sqs2Component.java| 1 -
.../aws2/sqs/Sqs2ComponentVerifierExtension.java | 1 -
.../component/aws2/sqs/Sqs2Configuration.java | 3 +-
.../camel/component/aws2/sqs/Sqs2Consumer.java | 4 +--
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 38 ++
.../camel/component/aws2/sqs/Sqs2Producer.java | 5 ++-
.../component/aws2/sqs/AmazonSQSClientMock.java| 28
.../component/aws2/sqs/SqsBatchConsumerTest.java | 1 -
.../aws2/sqs/SqsComponentClientRegistryTest.java | 2 --
.../aws2/sqs/SqsComponentConfigurationTest.java| 14
.../component/aws2/sqs/SqsComponentSpringTest.java | 7 ++--
.../camel/component/aws2/sqs/SqsComponentTest.java | 1 -
.../aws2/sqs/SqsConcurrentConsumerTest.java| 1 -
.../component/aws2/sqs/SqsConfigurationTest.java | 2 --
.../aws2/sqs/SqsConsumerIdleMessageTest.java | 3 +-
.../sqs/SqsDoesNotExtendMessageVisibilityTest.java | 1 -
.../aws2/sqs/SqsEndpointExplicitQueueUrlTest.java | 4 ---
.../component/aws2/sqs/SqsProducerBatchTest.java | 1 -
.../component/aws2/sqs/SqsProducerDeleteTest.java | 2 --
.../aws2/sqs/SqsProducerListQueuesTest.java| 2 --
.../SqsProducerDeleteMessageIntegrationTest.java | 4 +--
21 files changed, 49 insertions(+), 76 deletions(-)
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index 6acad08..e6dac5b 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -24,7 +24,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sqs.SqsClient;
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
index f0d79c0..631c8c1 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentVerifierExtension.java
@@ -22,7 +22,6 @@ import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExt
import org.apache.camel.component.extension.verifier.ResultBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.exception.SdkClientException;
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
index df0e194..84dee97 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.sqs;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.sqs.SqsClient;
@@ -406,7 +405,7 @@ public class Sqs2Configuration implements Cloneable {
public void setQueueUrl(String queueUrl) {
this.queueUrl = queueUrl;
}
-
+
public Protocol getProxyProtocol() {
return proxyProtocol;
}
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
index 84c67db..1d9111d 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
@@ -36,7 +36,6 @@ import
[camel] 04/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, added component to kit
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 7712dccb844f23aac55b015ef8a3b627ff5a3c29
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 12:10:58 2020 +0100
CAMEL-14553 - Create an AWS-SQS component based on SDK v2, added component
to kit
---
apache-camel/src/main/descriptors/common-bin.xml | 1 +
bom/camel-bom/pom.xml| 5 +
components/pom.xml | 1 +
parent/pom.xml | 5 +
4 files changed, 12 insertions(+)
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 10673fa..8ecf544 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -96,6 +96,7 @@
org.apache.camel:camel-aws2-msk
org.apache.camel:camel-aws2-ses
org.apache.camel:camel-aws2-sns
+org.apache.camel:camel-aws2-sqs
org.apache.camel:camel-aws2-translate
org.apache.camel:camel-azure
org.apache.camel:camel-barcode
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index c290e94..69fb17b 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -273,6 +273,11 @@
org.apache.camel
+camel-aws2-sqs
+${project.version}
+
+
+org.apache.camel
camel-aws2-translate
${project.version}
diff --git a/components/pom.xml b/components/pom.xml
index a0edbc2..32c82a3 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -134,6 +134,7 @@
camel-aws2-mq
camel-aws2-ses
camel-aws2-sns
+camel-aws2-sqs
camel-aws2-translate
camel-aws-xray
camel-azure
diff --git a/parent/pom.xml b/parent/pom.xml
index cda7e1f..c46b20b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1086,6 +1086,11 @@
org.apache.camel
+camel-aws2-sqs
+${project.version}
+
+
+org.apache.camel
camel-aws2-translate
${project.version}
[camel] 05/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9cb69db216a9d4812a6d324b3413d7621cce5c33 Author: Andrea Cosentino AuthorDate: Mon Feb 17 12:38:11 2020 +0100 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen --- docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/aws2-sqs-component.adoc | 347 + docs/components/modules/ROOT/pages/index.adoc | 4 +- 3 files changed, 351 insertions(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 2338cd9..d08cc76 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -55,6 +55,7 @@ * xref:aws2-msk-component.adoc[AWS 2 MSK Component] * xref:aws2-ses-component.adoc[AWS 2 Simple Email Service Component] * xref:aws2-sns-component.adoc[AWS 2 Simple Notification System Component] +* xref:aws2-sqs-component.adoc[AWS 2 Simple Queue Service Component] * xref:aws2-translate-component.adoc[AWS 2 Translate Component] * xref:azure-blob-component.adoc[Azure Storage Blob Service Component] * xref:azure-queue-component.adoc[Azure Storage Queue Service Component] diff --git a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc new file mode 100644 index 000..ef9c41e --- /dev/null +++ b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc @@ -0,0 +1,347 @@ +[[aws2-sqs-component]] += AWS 2 Simple Queue Service Component +:page-source: components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc + +*Since Camel 3.1* + +// HEADER START +*Both producer and consumer is supported* +// HEADER END + +The sqs component supports sending and receiving messages to +https://aws.amazon.com/sqs[Amazon's SQS] service. + +Prerequisites + +You must have a valid Amazon Web Services developer account, and be +signed up to use Amazon SQS. More information is available at +https://aws.amazon.com/sqs[Amazon SQS]. + +== URI Format + +[source,java] +-- +aws2-sqs://queueNameOrArn[?options] +-- + +The queue will be created if they don't already exists. + + You can append query options to the URI in the following format, +?options=value=value&... + +== URI Options + + +// component options: START +The AWS 2 Simple Queue Service component supports 7 options, which are listed below. + + + +[width="100%",cols="2,5,^1,2",options="header"] +|=== +| Name | Description | Default | Type +| *accessKey* (common) | Amazon AWS Access Key | | String +| *region* (common) | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. | | String +| *secretKey* (common) | Amazon AWS Secret Key | | String +| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean +| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] +| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean +| *configuration* (advanced) | The AWS SQS default configuration | | Sqs2Configuration +|=== +// component options: END + + + + + + + + +// endpoint options: START +The AWS 2 Simple Queue Service endpoint is configured using URI syntax: + + +aws2-sqs:queueNameOrArn + + +with the following path and query parameters: + +=== Path Parameters (1 parameters): + + +[width="100%",cols="2,5,^1,2",options="header"] +|=== +| Name | Description | Default | Type +| *queueNameOrArn* | *Required* Queue name or ARN | | String +|=== + + +=== Query Parameters (58 parameters): + + +[width="100%",cols="2,5,^1,2",options="header"] +|=== +| Name | Description | Default | Type +| *amazonAWSHost* (common) | The hostname of the Amazon AWS cloud. | amazonaws.com | String +| *amazonSQSClient* (common) | To use the AmazonSQS as client | | SqsClient +| *autoCreateQueue* (common) | Setting the autocreation
[camel] 03/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, 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 fec9921f6371d9df4da7c800ff9b4decca7315df Author: Andrea Cosentino AuthorDate: Mon Feb 17 12:09:37 2020 +0100 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen docs --- .../camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) 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 c1001cf..2afff6a 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 @@ -1,7 +1,7 @@ [[aws2-sqs-component]] = AWS 2 Simple Queue Service Component -*Since Camel 2.6* +*Since Camel 3.1* // HEADER START *Both producer and consumer is supported* @@ -31,7 +31,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS Simple Queue Service component supports 7 options, which are listed below. +The AWS 2 Simple Queue Service component supports 7 options, which are listed below. @@ -44,7 +44,7 @@ The AWS Simple Queue Service component supports 7 options, which are listed belo | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -| *configuration* (advanced) | The AWS SQS default configuration | | SqsConfiguration +| *configuration* (advanced) | The AWS SQS default configuration | | Sqs2Configuration |=== // component options: END @@ -56,10 +56,10 @@ The AWS Simple Queue Service component supports 7 options, which are listed belo // endpoint options: START -The AWS Simple Queue Service endpoint is configured using URI syntax: +The AWS 2 Simple Queue Service endpoint is configured using URI syntax: -aws-sqs:queueNameOrArn +aws2-sqs:queueNameOrArn with the following path and query parameters: @@ -81,7 +81,7 @@ with the following path and query parameters: |=== | Name | Description | Default | Type | *amazonAWSHost* (common) | The hostname of the Amazon AWS cloud. | amazonaws.com | String -| *amazonSQSClient* (common) | To use the AmazonSQS as client | | AmazonSQS +| *amazonSQSClient* (common) | To use the AmazonSQS as client | | SqsClient | *autoCreateQueue* (common) | Setting the autocreation of the queue | true | boolean | *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to map headers to/from Camel. | | HeaderFilterStrategy | *protocol* (common) | The underlying protocol used to communicate with SQS | https | String @@ -110,7 +110,7 @@ with the following path and query parameters: | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *messageDeduplicationIdStrategy* (producer) | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. The value can be one of: useExchangeId, useContentBasedDeduplication | useExchangeId | MessageDeduplicationIdStrategy | *messageGroupIdStrategy* (producer) | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options:
[camel] 02/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, 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 4f3067b760414c8fb7cb2cabc09f86b4617f0d16
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 11:53:50 2020 +0100
CAMEL-14553 - Create an AWS-SQS component based on SDK v2, docs
---
...-sqs-component.adoc => aws2-sqs-component.adoc} | 41 +++---
1 file changed, 13 insertions(+), 28 deletions(-)
diff --git a/components/camel-aws2-sqs/src/main/docs/aws-sqs-component.adoc
b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
similarity index 93%
rename from components/camel-aws2-sqs/src/main/docs/aws-sqs-component.adoc
rename to components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
index 0ef2a20..c1001cf 100644
--- a/components/camel-aws2-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
@@ -1,5 +1,5 @@
-[[aws-sqs-component]]
-= AWS Simple Queue Service Component
+[[aws2-sqs-component]]
+= AWS 2 Simple Queue Service Component
*Since Camel 2.6*
@@ -20,7 +20,7 @@ https://aws.amazon.com/sqs[Amazon SQS].
[source,java]
--
-aws-sqs://queueNameOrArn[?options]
+aws2-sqs://queueNameOrArn[?options]
--
The queue will be created if they don't already exists. +
@@ -196,27 +196,12 @@ see by others.
=== Advanced AmazonSQS configuration
If your Camel Application is running behind a firewall or if you need to
-have more control over the AmazonSQS instance configuration, you can
+have more control over the SqsClient instance configuration, you can
create your own instance:
[source,java]
---
-AWSCredentials awsCredentials = new BasicAWSCredentials("myAccessKey",
"mySecretKey");
-
-ClientConfiguration clientConfiguration = new ClientConfiguration();
-clientConfiguration.setProxyHost("http://myProxyHost;);
-clientConfiguration.setProxyPort(8080);
-
-AmazonSQS client = new AmazonSQSClient(awsCredentials, clientConfiguration);
-
-registry.bind("client", client);
---
-
-and refer to it in your Camel aws-sqs component configuration:
-
-[source,java]
-
-from("aws-sqs://MyQueue?amazonSQSClient=#client=5000=5")
+from("aws2-sqs://MyQueue?amazonSQSClient=#client=5000=5")
.to("mock:result");
-
@@ -228,7 +213,7 @@ mapping with the SQSConfiguration option.
[source,java]
-
-from("aws-sqs://MyQueue?amazonSQSClient=#client=5000=5")
+from("aws2-sqs://MyQueue?amazonSQSClient=#client=5000=5")
.to("mock:result");
-
@@ -262,7 +247,7 @@ Maven users will need to add the following dependency to
their pom.xml.
---
org.apache.camel
-camel-aws-sqs
+camel-aws2-sqs
${camel-version}
---
@@ -283,7 +268,7 @@ of the route, use a Filter:
[source,java]
--
-from("aws-sqs://MyQueue?amazonSQSClient=#client=5000=false=false")
+from("aws2-sqs://MyQueue?amazonSQSClient=#client=5000=false=false")
.filter("${header.login} == true")
.to("mock:result");
--
@@ -305,7 +290,7 @@ You can set a `SendMessageBatchRequest` or an `Iterable`
--
from("direct:start")
- .setHeader(SqsConstants.SQS_OPERATION,
constant("sendBatchMessage")).to("aws-sqs://camel-1?accessKey=RAW(xxx)=RAW(xxx)=EU_WEST_1");
+ .setHeader(SqsConstants.SQS_OPERATION,
constant("sendBatchMessage")).to("aws2-sqs://camel-1?accessKey=RAW(xxx)=RAW(xxx)=EU_WEST_1");
--
As result you'll get an exchange containing a `SendMessageBatchResult`
instance, that you can examinate to check what messages were successfull and
what not.
@@ -319,7 +304,7 @@ Use deleteMessage operation to delete a single message.
You'll need to set a rec
from("direct:start")
.setHeader(SqsConstants.SQS_OPERATION, constant("deleteMessage"))
.setHeader(SqsConstants.RECEIPT_HANDLE, constant("123456"))
-
.to("aws-sqs://camel-1?accessKey=RAW(xxx)=RAW(xxx)=EU_WEST_1");
+
.to("aws2-sqs://camel-1?accessKey=RAW(xxx)=RAW(xxx)=EU_WEST_1");
[camel] 10/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, final regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 638314bdd3b02dc001fd302bed78fb19aef26404 Author: Andrea Cosentino AuthorDate: Mon Feb 17 13:04:12 2020 +0100 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, final regen --- docs/components/modules/ROOT/pages/aws2-sqs-component.adoc | 7 ++- docs/components/modules/ROOT/pages/index.adoc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc index ef9c41e..7575681 100644 --- a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc @@ -17,6 +17,11 @@ You must have a valid Amazon Web Services developer account, and be signed up to use Amazon SQS. More information is available at https://aws.amazon.com/sqs[Amazon SQS]. +[NOTE] + +The AWS2 SQS component is not supported in OSGI + + == URI Format [source,java] @@ -88,7 +93,7 @@ with the following path and query parameters: | *protocol* (common) | The underlying protocol used to communicate with SQS | https | String | *proxyProtocol* (common) | To define a proxy protocol when instantiating the SQS client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String -| *region* (common) | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String +| *region* (common) | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *attributeNames* (consumer) | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *concurrentConsumers* (consumer) | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | int diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc index 7fd56c3..422f78a 100644 --- a/docs/components/modules/ROOT/pages/index.adoc +++ b/docs/components/modules/ROOT/pages/index.adoc @@ -70,7 +70,7 @@ Number of Components: 328 in 262 JAR artifacts (1 deprecated) | xref:aws2-sns-component.adoc[AWS 2 Simple Notification System] (camel-aws2-sns) | 3.1 | The aws2-sns component is used for sending messages to an Amazon Simple Notification Topic. -| xref:aws2-sqs-component.adoc[AWS 2 Simple Queue Service] (camel-aws2-sqs) | 3.1 | The aws-sqs component is used for sending and receiving messages to Amazon's SQS service. +| xref:aws2-sqs-component.adoc[AWS 2 Simple Queue Service] (camel-aws2-sqs) | 3.1 | The aws2-sqs component is used for sending and receiving messages to Amazon's SQS service. | xref:aws2-translate-component.adoc[AWS 2 Translate] (camel-aws2-translate) | 3.1 | The aws2-translate component is used for managing Amazon Translate
[camel] 08/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed descriptions
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 fdba5c21d7f1b977418116f82abae3c2af13a04a
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 12:55:34 2020 +0100
CAMEL-14553 - Create an AWS-SQS component based on SDK v2, fixed
descriptions
---
.../java/org/apache/camel/component/aws2/sqs/Sqs2Component.java | 3 +++
.../org/apache/camel/component/aws2/sqs/Sqs2Configuration.java| 8
.../java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java| 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index e6dac5b..049ce0e 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -27,6 +27,9 @@ import org.apache.camel.support.DefaultComponent;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sqs.SqsClient;
+/**
+ * For working with Amazon SQS SDK v2.
+ */
@Component("aws2-sqs")
public class Sqs2Component extends DefaultComponent {
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
index 84dee97..0ccdeb9 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
@@ -372,10 +372,10 @@ public class Sqs2Configuration implements Cloneable {
}
/**
- * Specify the queue region which could be used with queueOwnerAWSAccountId
- * to build the service URL. When using this parameter, the configuration
- * will expect the capitalized name of the region (for example AP_EAST_1)
- * You'll need to use the name Regions.EU_WEST_1.name()
+ * The region in which ECS client needs to work. When using this
+ * parameter, the configuration will expect the lowercase name of the
+ * region (for example ap-east-1) You'll need to use the name
+ * Region.EU_WEST_1.id()
*/
public void setRegion(String region) {
this.region = region;
diff --git
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index fbcab87..3fcebce 100644
---
a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++
b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -56,7 +56,7 @@ import
software.amazon.awssdk.services.sqs.model.QueueAttributeName;
import software.amazon.awssdk.services.sqs.model.SetQueueAttributesRequest;
/**
- * The aws-sqs component is used for sending and receiving messages to Amazon's
+ * The aws2-sqs component is used for sending and receiving messages to
Amazon's
* SQS service.
*/
@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-sqs", title = "AWS 2
Simple Queue Service", syntax = "aws2-sqs:queueNameOrArn", label =
"cloud,messaging")
[camel] 09/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, 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 27b8c5165a77bb554e209df96a5accb6dbb4b342
Author: Andrea Cosentino
AuthorDate: Mon Feb 17 12:56:23 2020 +0100
CAMEL-14553 - Create an AWS-SQS component based on SDK v2, regen docs
---
.../resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json | 4 ++--
components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc | 2 +-
.../org/apache/camel/builder/component/ComponentsBuilderFactory.java | 2 +-
.../camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java | 4 ++--
core/camel-componentdsl/src/generated/resources/metadata.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
b/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
index 69b07ad..656a55f 100644
---
a/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
+++
b/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
@@ -5,7 +5,7 @@
"extendsScheme": "",
"syntax": "aws2-sqs:queueNameOrArn",
"title": "AWS 2 Simple Queue Service",
-"description": "The aws-sqs component is used for sending and receiving
messages to Amazon's SQS service.",
+"description": "The aws2-sqs component is used for sending and receiving
messages to Amazon's SQS service.",
"label": "cloud,messaging",
"deprecated": false,
"async": false,
@@ -36,7 +36,7 @@
"protocol": { "kind": "parameter", "displayName": "Protocol", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "defaultValue":
"https", "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The underlying protocol used to communicate
with SQS" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the SQS client" },
"queueOwnerAWSAccountId": { "kind": "parameter", "displayName": "Queue
Owner AWSAccount Id", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Specify the queue owner aws account id when
you need to connect the queue with different account owner." },
-"region": { "kind": "parameter", "displayName": "Region", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Specify the queue region which could be used
with queueOwnerAWSAccountId to build the service URL. When using this
parameter, the configuration will expect t [...]
+"region": { "kind": "parameter", "displayName": "Region", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The region in which ECS client needs to work.
When using this parameter, the configuration will expect the lowercase name of
the region (for example ap-east- [...]
"attributeNames": { "kind": "parameter", "displayName": "Attribute Names",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "A list of attribute
names to receive when consuming. Multiple names can be separated by comma." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred
[camel] 07/10: CAMEL-14553 - Create an AWS-SQS component based on SDK v2, added note about OSGi support
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 c76c2cef8a26c3124d7a08532a6cb0f0cea922fd Author: Andrea Cosentino AuthorDate: Mon Feb 17 12:52:53 2020 +0100 CAMEL-14553 - Create an AWS-SQS component based on SDK v2, added note about OSGi support --- components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc | 5 + 1 file changed, 5 insertions(+) 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 2afff6a..4c4f9a0 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 @@ -16,6 +16,11 @@ You must have a valid Amazon Web Services developer account, and be signed up to use Amazon SQS. More information is available at https://aws.amazon.com/sqs[Amazon SQS]. +[NOTE] + +The AWS2 SQS component is not supported in OSGI + + == URI Format [source,java]
[camel] branch master updated: CAMEL-14570: camel-zookeeper-master - Use testcontainers for testing
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli 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 1ad92f0 CAMEL-14570: camel-zookeeper-master - Use testcontainers for
testing
1ad92f0 is described below
commit 1ad92f06b880995f2266fa40842cb50d8f8b00a0
Author: lburgazzoli
AuthorDate: Mon Feb 17 12:07:17 2020 +0100
CAMEL-14570: camel-zookeeper-master - Use testcontainers for testing
---
components/camel-zookeeper-master/pom.xml | 93 +-
.../MasterEndpointFailoverTest.java| 16 +-
.../zookeepermaster/MasterEndpointTest.java| 36 --
.../zookeepermaster/MasterQuartzEndpointTest.java | 35 --
.../component/zookeepermaster/ZKContainer.java | 65
.../zookeepermaster/ZKServerFactoryBean.java | 230 -
.../component/zookeepermaster/group/GroupTest.java | 370 -
.../zookeepermaster/MasterEndpointTest-context.xml | 20 +-
.../MasterQuartzEndpointTest-context.xml | 20 +-
9 files changed, 395 insertions(+), 490 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml
b/components/camel-zookeeper-master/pom.xml
index 3e35c2d..bf629f9 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -115,11 +115,13 @@
test
+
org.apache.camel
-camel-test-spring
+camel-testcontainers-spring
test
+
org.apache.logging.log4j
log4j-api
@@ -138,20 +140,81 @@
-
-
-
-maven-surefire-plugin
-
-false
-true
-1
-true
-
600
-
-
-
-
+
+
+zookeeper-master-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
+
+
+
+zookeeper-master-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+false
+true
+1
+true
+
600
+
+
+
+
+
+
+
+
+zookeeper-master-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+false
+true
+1
+true
+
600
+
+
+
+
+
+
+
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
index 85366fb..0fbefa7 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
@@ -42,17 +42,15 @@ public class MasterEndpointFailoverTest {
protected MockEndpoint result1Endpoint;
protected MockEndpoint result2Endpoint;
protected AtomicInteger messageCounter = new AtomicInteger(1);
-protected ZKServerFactoryBean serverFactoryBean = new
ZKServerFactoryBean();
+protected ZKContainer zkContainer = new ZKContainer();
protected CuratorFactoryBean zkClientBean = new CuratorFactoryBean();
@Before
public void beforeRun() throws Exception {
-System.out.println("Starting ZK server!");
-serverFactoryBean.setPort(9004);
-serverFactoryBean.afterPropertiesSet();
+zkContainer.start();
[camel] branch master updated (30ddacd -> 5747ab0)
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 30ddacd CAMEL-14580: Add option allow-adding-new-routes to not allow adding new routes at runtime which we can use to optimize camel and reduce memory footprint. Only for single JVM Camel applications. add 5747ab0 Remove commented out code which has been reworked to no longer be needed No new revisions were added by this update. Summary of changes: .../apache/camel/model/RouteDefinitionHelper.java | 9 +-- .../org/apache/camel/reifier/ChoiceReifier.java| 7 -- .../org/apache/camel/reifier/ProcessorReifier.java | 28 -- 3 files changed, 1 insertion(+), 43 deletions(-)
[GitHub] [camel-quarkus] davsclaus opened a new issue #726: camel-quarkus - Optimize to not allow adding new routes
davsclaus opened a new issue #726: camel-quarkus - Optimize to not allow adding new routes URL: https://github.com/apache/camel-quarkus/issues/726 Lets make camel-quarkus optimized OOTB and set this as false by default https://issues.apache.org/jira/browse/CAMEL-14580 # optimize to not allow adding new routes at runtime which reduces memory footprint with 10kb camel.main.allow-adding-new-routes = false 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 With regards, Apache Git Services
[camel] branch master updated (7d98feb -> 30ddacd)
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 7d98feb CAMEL-14565: Add docs for missing option add 30ddacd CAMEL-14580: Add option allow-adding-new-routes to not allow adding new routes at runtime which we can use to optimize camel and reduce memory footprint. Only for single JVM Camel applications. No new revisions were added by this update. Summary of changes: .../org/apache/camel/ExtendedCamelContext.java | 20 .../camel/impl/engine/AbstractCamelContext.java| 30 + .../camel/impl/AbstractModelCamelContext.java | 9 + .../org/apache/camel/impl/DefaultCamelContext.java | 8 - .../org/apache/camel/reifier/ProcessorReifier.java | 9 + .../camel/main/DefaultConfigurationConfigurer.java | 10 +++--- .../camel/main/DefaultConfigurationProperties.java | 38 ++ .../src/main/java/org/apache/camel/main/Main.java | 1 + 8 files changed, 120 insertions(+), 5 deletions(-)
[camel-examples] branch master updated: Polished tiny example
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 50e9993 Polished tiny example
50e9993 is described below
commit 50e999379385082abd49c04f1083334a4d5847f8
Author: Claus Ibsen
AuthorDate: Mon Feb 17 12:50:30 2020 +0100
Polished tiny example
---
.../src/main/java/org/apache/camel/example/MyRouteBuilder.java | 2 --
.../camel-example-main-tiny/src/main/resources/application.properties | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
b/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
index e9c2b1c..26971ba 100644
---
a/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
+++
b/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
@@ -24,8 +24,6 @@ public class MyRouteBuilder extends RouteBuilder {
public void configure() throws Exception {
from("timer:foo?period={{myPeriod}}")
.bean("myBean", "hello")
-.log("${body}")
-.bean("myBean", "bye")
.log("${body}");
}
}
diff --git
a/examples/camel-example-main-tiny/src/main/resources/application.properties
b/examples/camel-example-main-tiny/src/main/resources/application.properties
index 7f12394..a9bf65b 100644
--- a/examples/camel-example-main-tiny/src/main/resources/application.properties
+++ b/examples/camel-example-main-tiny/src/main/resources/application.properties
@@ -20,6 +20,9 @@
camel.main.name = MyCoolCamel
camel.main.jmx-enabled = false
+# optimize to not allow adding new routes at runtime which reduces memory
footprint with 10kb
+camel.main.allow-adding-new-routes = false
+
# enable tracing
### camel.main.tracing = true
[camel-quarkus] 28/34: Upgarde to Camel 3.1.0 - WIP (ConfigurerResolver, reifiers)
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 d00d1de54632be1f5915b39bc8e17496f2c85cf1
Author: Peter Palaga
AuthorDate: Wed Feb 12 17:35:10 2020 +0100
Upgarde to Camel 3.1.0 - WIP (ConfigurerResolver, reifiers)
---
.../camel/quarkus/core/DisabledPredicateValidatorReifier.java | 6 +++---
.../org/apache/camel/quarkus/core/DisabledValidateReifier.java | 6 +++---
.../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 7 +++
.../src/main/java/org/apache/camel/quarkus/core/FastModel.java | 2 +-
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
index 29a9eae..ef4c206 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
@@ -24,12 +24,12 @@ import org.apache.camel.spi.Validator;
public class DisabledPredicateValidatorReifier extends
ValidatorReifier {
-public DisabledPredicateValidatorReifier(ValidatorDefinition definition) {
-super((PredicateValidatorDefinition) definition);
+public DisabledPredicateValidatorReifier(CamelContext camelContext,
ValidatorDefinition definition) {
+super(camelContext, (PredicateValidatorDefinition) definition);
}
@Override
-protected Validator doCreateValidator(CamelContext context) {
+protected Validator doCreateValidator() {
throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-core-xml");
}
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
index 6eb8f75..4d796f8 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
@@ -24,12 +24,12 @@ import org.apache.camel.spi.RouteContext;
public class DisabledValidateReifier extends
ProcessorReifier {
-public DisabledValidateReifier(ProcessorDefinition definition) {
-super((ValidateDefinition) definition);
+public DisabledValidateReifier(RouteContext routeContext,
ProcessorDefinition definition) {
+super(routeContext, (ValidateDefinition) definition);
}
@Override
-public Processor createProcessor(RouteContext routeContext) throws
Exception {
+public Processor createProcessor() throws Exception {
throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-core-xml");
}
}
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index 576499e..35ebb10 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -42,6 +42,7 @@ import
org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
import org.apache.camel.impl.engine.DefaultCamelContextNameStrategy;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.impl.engine.DefaultComponentResolver;
+import org.apache.camel.impl.engine.DefaultConfigurerResolver;
import org.apache.camel.impl.engine.DefaultDataFormatResolver;
import org.apache.camel.impl.engine.DefaultEndpointRegistry;
import org.apache.camel.impl.engine.DefaultInflightRepository;
@@ -76,6 +77,7 @@ import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.ConfigurerResolver;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.EndpointRegistry;
import org.apache.camel.spi.ExecutorServiceManager;
@@ -386,6 +388,11 @@ public class FastCamelContext extends AbstractCamelContext
implements CatalogCam
}
@Override
+protected ConfigurerResolver createConfigurerResolver() {
+return new DefaultConfigurerResolver();
+}
+
+@Override
public void setTypeConverterRegistry(TypeConverterRegistry
typeConverterRegistry) {
super.setTypeConverterRegistry(typeConverterRegistry);
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java
[camel-quarkus] 05/34: Use camel-quarkus-support-httpclient in slack extension
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 be3ff25bfb497224e8e12d42e994d783643fa59f
Author: James Netherton
AuthorDate: Wed Feb 12 08:00:03 2020 +
Use camel-quarkus-support-httpclient in slack extension
---
extensions/slack/deployment/pom.xml | 4
.../camel/quarkus/component/slack/deployment/SlackProcessor.java | 8
extensions/slack/runtime/pom.xml | 4
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/extensions/slack/deployment/pom.xml
b/extensions/slack/deployment/pom.xml
index 2e8fe49..30851b6 100644
--- a/extensions/slack/deployment/pom.xml
+++ b/extensions/slack/deployment/pom.xml
@@ -52,6 +52,10 @@
org.apache.camel.quarkus
+
camel-quarkus-support-httpclient-deployment
+
+
+org.apache.camel.quarkus
camel-quarkus-slack
diff --git
a/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
b/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
index 199bcdb..fbc8054 100644
---
a/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
+++
b/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
@@ -19,7 +19,6 @@ package org.apache.camel.quarkus.component.slack.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
class SlackProcessor {
@@ -34,11 +33,4 @@ class SlackProcessor {
ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
-
-@BuildStep
-NativeImageResourceBuildItem suffixListResource() {
-// Required by org.apache.http.conn.util.PublicSuffixMatcher
-return new
NativeImageResourceBuildItem("mozilla/public-suffix-list.txt");
-}
-
}
diff --git a/extensions/slack/runtime/pom.xml b/extensions/slack/runtime/pom.xml
index 79a0ae0..d794bb2 100644
--- a/extensions/slack/runtime/pom.xml
+++ b/extensions/slack/runtime/pom.xml
@@ -55,6 +55,10 @@
camel-quarkus-support-commons-logging
+org.apache.camel.quarkus
+camel-quarkus-support-httpclient
+
+
org.apache.camel
camel-slack
[camel-quarkus] 24/34: Upgarde to Camel 3.1.0 - WIP (catalog)
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 220e0ba72932d9871f64dbbb673b503d5020e1ed
Author: lburgazzoli
AuthorDate: Thu Feb 6 17:02:47 2020 +0100
Upgarde to Camel 3.1.0 - WIP (catalog)
---
catalog/camel-quarkus-catalog/pom.xml | 27 +-
.../catalog/quarkus/QuarkusRuntimeProvider.java| 5 ++--
.../quarkus/QuarkusRuntimeProviderTest.java| 14 +--
extensions/core/runtime/pom.xml| 4
.../camel/quarkus/core/FastCamelContext.java | 7 ++
poms/bom/pom.xml | 10
6 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/catalog/camel-quarkus-catalog/pom.xml
b/catalog/camel-quarkus-catalog/pom.xml
index a234169..eb6e3d0 100644
--- a/catalog/camel-quarkus-catalog/pom.xml
+++ b/catalog/camel-quarkus-catalog/pom.xml
@@ -22,8 +22,9 @@
org.apache.camel.quarkus
-catalog
+camel-quarkus-build-parent
1.1.0-SNAPSHOT
+../../poms/build-parent/pom.xml
camel-catalog-quarkus
@@ -35,33 +36,27 @@
org.apache.camel
camel-catalog
-${camel.version}
-junit
-junit
-4.12
+org.jboss.logging
+jboss-logging
test
-
-
-org.apache.logging.log4j
-log4j-api
-2.12.1
+org.jboss.slf4j
+slf4j-jboss-logging
test
+
-org.apache.logging.log4j
-log4j-core
-2.12.1
+org.junit.jupiter
+junit-jupiter-api
test
-org.apache.logging.log4j
-log4j-slf4j-impl
-2.12.1
+org.junit.jupiter
+junit-jupiter-engine
test
diff --git
a/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
b/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
index b1c37c6..d8a72bf 100644
---
a/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
+++
b/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
@@ -22,11 +22,12 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.catalog.CamelCatalog;
-import org.apache.camel.catalog.CatalogHelper;
import org.apache.camel.catalog.RuntimeProvider;
+import org.apache.camel.catalog.impl.CatalogHelper;
/**
- * A Quarkus based {@link RuntimeProvider} which only includes the supported
Camel components, data formats, and languages
+ * A Quarkus based {@link RuntimeProvider} which only includes the supported
Camel components, data formats, and
+ * languages
* which can be installed in Quarkus using the Camel extensions.
*/
public class QuarkusRuntimeProvider implements RuntimeProvider {
diff --git
a/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
b/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
index 2c6b1d1..eb0f52d 100644
---
a/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
+++
b/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
@@ -20,19 +20,19 @@ import java.util.List;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class QuarkusRuntimeProviderTest {
static CamelCatalog catalog;
-@BeforeClass
+@BeforeAll
public static void createCamelCatalog() {
catalog = new DefaultCamelCatalog();
catalog.setRuntimeProvider(new QuarkusRuntimeProvider());
diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml
index 906fd04..f0ab723 100644
--- a/extensions/core/runtime/pom.xml
+++ b/extensions/core/runtime/pom.xml
@@ -90,6 +90,10 @@
org.apache.camel
+
[camel-quarkus] 26/34: cleanup core extension pom
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 5fd8cedfef3726299df372b8cc1d63f8aa2c1689 Author: lburgazzoli AuthorDate: Fri Feb 7 12:51:33 2020 +0100 cleanup core extension pom --- extensions/core/runtime/pom.xml | 6 -- 1 file changed, 6 deletions(-) diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml index f7706ec..c91b25f 100644 --- a/extensions/core/runtime/pom.xml +++ b/extensions/core/runtime/pom.xml @@ -77,12 +77,6 @@ org.apache.camel camel-core-engine - - -org.apache.camel -camel-xml-jaxp - - org.apache.camel
[camel-quarkus] 07/34: Fix #696 Test HTTPS with the HTTP clients
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 e8e5dc4732d1a7057df5b4585942550bb72f8454
Author: Peter Palaga
AuthorDate: Tue Feb 11 07:52:52 2020 +0100
Fix #696 Test HTTPS with the HTTP clients
---
.../quarkus/component/http/it/HttpResource.java| 30 +++
.../camel/quarkus/component/http/it/HttpTest.java | 29 +++
.../camel/quarkus/test/TrustStoreResource.java | 58 ++
3 files changed, 117 insertions(+)
diff --git
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
index 871fc1a..732a8e1 100644
---
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
+++
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
@@ -55,6 +55,16 @@ public class HttpResource {
.request(String.class);
}
+@Path("/ahc/get-https")
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public String getHttps() {
+return producerTemplate
+
.to("ahc:https://restcountries.eu/rest/v2/alpha/cz?bridgeEndpoint=true;)
+.withHeader(Exchange.HTTP_METHOD, "GET")
+.request(String.class);
+}
+
@Path("/ahc/post")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@@ -102,6 +112,16 @@ public class HttpResource {
.request(String.class);
}
+@Path("/http/get-https")
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public String httpGetHttps() {
+return producerTemplate
+
.to("https://restcountries.eu/rest/v2/alpha/cz?bridgeEndpoint=true;)
+.withHeader(Exchange.HTTP_METHOD, "GET")
+.request(String.class);
+}
+
@Path("/http/post")
@POST
@Consumes(MediaType.TEXT_PLAIN)
@@ -131,6 +151,16 @@ public class HttpResource {
.request(String.class);
}
+@Path("/netty-http/get-https")
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public String nettyHttpGetHttps() {
+return producerTemplate
+.to("netty-http:https://restcountries.eu/rest/v2/alpha/cz;)
+.withHeader(Exchange.HTTP_METHOD, "GET")
+.request(String.class);
+}
+
@Path("/netty-http/post")
@POST
@Consumes(MediaType.TEXT_PLAIN)
diff --git
a/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
b/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
index 8423014..ab048c3 100644
---
a/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
+++
b/integration-tests/http/src/test/java/org/apache/camel/quarkus/component/http/it/HttpTest.java
@@ -19,14 +19,17 @@ package org.apache.camel.quarkus.component.http.it;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import org.apache.camel.quarkus.test.TrustStoreResource;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(HttpTestResource.class)
+@QuarkusTestResource(TrustStoreResource.class)
class HttpTest {
@ParameterizedTest
@ValueSource(strings = { "ahc", "http", "netty-http" })
@@ -49,6 +52,32 @@ class HttpTest {
.body(is("MESSAGE"));
}
+@ParameterizedTest
+@ValueSource(strings = { "ahc",
+"http" /*, "netty-http" disabled because of
https://github.com/apache/camel-quarkus/issues/695 */ })
+public void httpsProducer(String component) {
+RestAssured
+.given()
+.when()
+.get("/test/client/{component}/get-https", component)
+.then()
+.body(containsString("Czech Republic"));
+}
+
+@Test
+public void restcountries() throws Exception {
+RestAssured
+.given()
+.baseUri("https://restcountries.eu;)
+.port(443)
+.when()
+.accept("application/json")
+.get("/rest/v2/alpha/cz")
+.then()
+.statusCode(200)
+.body(containsString("Czech Republic"));
+}
+
@Test
public void basicNettyHttpServer() throws Exception {
final int port = Integer.getInteger("camel.netty-http.test-port");
diff --git
[camel-quarkus] 09/34: #670 fix PDF itests in native mode
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 23e36a10c3083be2d899fc8e78e6e03055221445
Author: Freeman Fang
AuthorDate: Wed Feb 12 17:23:29 2020 -0500
#670 fix PDF itests in native mode
---
extensions/pdf/deployment/pom.xml | 4
.../camel/quarkus/component/pdf/deployment/PdfProcessor.java | 10 +++---
extensions/pdf/runtime/pom.xml | 10 ++
.../org/apache/camel/quarkus/component/pdf/it/PdfResource.java | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/extensions/pdf/deployment/pom.xml
b/extensions/pdf/deployment/pom.xml
index 3b7e9a2..0058ff4 100644
--- a/extensions/pdf/deployment/pom.xml
+++ b/extensions/pdf/deployment/pom.xml
@@ -50,6 +50,10 @@
org.apache.camel.quarkus
camel-quarkus-pdf
+
+org.apache.camel.quarkus
+
camel-quarkus-support-commons-logging-deployment
+
diff --git
a/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
b/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
index 60568c0..e7bbf14 100644
---
a/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
+++
b/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
@@ -16,11 +16,12 @@
*/
package org.apache.camel.quarkus.component.pdf.deployment;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.component.pdf.PdfConfiguration;
class PdfProcessor {
@@ -42,8 +43,11 @@ class PdfProcessor {
}
@BuildStep
-ReflectiveClassBuildItem initReflectiveConfiguration() {
-return new ReflectiveClassBuildItem(true, false,
PdfConfiguration.class);
+NativeImageConfigBuildItem build(BuildProducer
reflectiveClass) {
+return NativeImageConfigBuildItem.builder()
+
.addRuntimeInitializedClass("org.apache.pdfbox.pdmodel.font.PDType1Font")
+
.addRuntimeInitializedClass("org.apache.camel.component.pdf.PdfConfiguration")
+.build();
}
}
diff --git a/extensions/pdf/runtime/pom.xml b/extensions/pdf/runtime/pom.xml
index a4de961..72da6bc 100644
--- a/extensions/pdf/runtime/pom.xml
+++ b/extensions/pdf/runtime/pom.xml
@@ -53,6 +53,16 @@
org.apache.camel
camel-pdf
+
+
+commons-logging
+commons-logging
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-support-commons-logging
diff --git
a/integration-tests/pdf/src/main/java/org/apache/camel/quarkus/component/pdf/it/PdfResource.java
b/integration-tests/pdf/src/main/java/org/apache/camel/quarkus/component/pdf/it/PdfResource.java
index ffd6fa8..c8d7bda 100644
---
a/integration-tests/pdf/src/main/java/org/apache/camel/quarkus/component/pdf/it/PdfResource.java
+++
b/integration-tests/pdf/src/main/java/org/apache/camel/quarkus/component/pdf/it/PdfResource.java
@@ -51,7 +51,7 @@ public class PdfResource {
@Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response createFromText(String message) throws Exception {
document = producerTemplate.requestBody(
-"pdf:create?fontSize=6=PAGE_SIZE_A5=Courier",
message, byte[].class);
+"pdf:create?fontSize=6=PAGE_SIZE_A5", message,
byte[].class);
LOG.infof("The PDDocument has been created and contains %d bytes",
document.length);
[camel-quarkus] 25/34: Renamed camel-jaxp to camel-xml-jaxp
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 fec7df2cd1b45218a3d7fe097610ceb8241596b1
Author: Claus Ibsen
AuthorDate: Fri Feb 7 11:28:16 2020 +0100
Renamed camel-jaxp to camel-xml-jaxp
---
extensions/core/runtime/pom.xml| 2 +-
extensions/support/xml/runtime/pom.xml | 2 +-
poms/bom/pom.xml | 10 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml
index f0ab723..f7706ec 100644
--- a/extensions/core/runtime/pom.xml
+++ b/extensions/core/runtime/pom.xml
@@ -80,7 +80,7 @@
org.apache.camel
-camel-jaxp
+camel-xml-jaxp
diff --git a/extensions/support/xml/runtime/pom.xml
b/extensions/support/xml/runtime/pom.xml
index e72f1ab..5f99efa 100644
--- a/extensions/support/xml/runtime/pom.xml
+++ b/extensions/support/xml/runtime/pom.xml
@@ -52,7 +52,7 @@
org.apache.camel
-camel-jaxp
+camel-xml-jaxp
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8e74d06..c3964fb 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -305,11 +305,6 @@
org.apache.camel
-camel-jaxp
-${camel.version}
-
-
-org.apache.camel
camel-jdbc
${camel.version}
@@ -541,6 +536,11 @@
org.apache.camel
+camel-xml-jaxp
+${camel.version}
+
+
+org.apache.camel
camel-xslt
${camel.version}
[camel-quarkus] 21/34: Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
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 6dac73aef63a103aad2816f9b5844845d8bbd8d7
Author: lburgazzoli
AuthorDate: Tue Feb 4 17:57:53 2020 +0100
Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
---
.../component/xml/deployment/XmlProcessor.java | 9 +-
extensions/core-xml/runtime/pom.xml| 4 +++
.../camel/quarkus/component/xml/XmlRecorder.java | 27 ++--
.../quarkus/core/deployment/BuildProcessor.java| 13 ++--
.../CamelModelToXMLDumperBuildItem.java} | 22 +++--
.../deployment/CamelRoutesLoaderBuildItems.java| 10 +++---
.../camel/quarkus/core/CamelMainRecorder.java | 3 +-
.../apache/camel/quarkus/core/CamelRecorder.java | 23 +-
.../camel/quarkus/core/CamelRoutesCollector.java | 17 +++---
.../quarkus/core/DisabledModelToXMLDumper.java}| 23 ++
...java => DisabledXMLRoutesDefinitionLoader.java} | 11 +++
.../camel/quarkus/core/FastCamelContext.java | 36 --
.../org/apache/camel/quarkus/core/FastModel.java | 6 +---
.../apache/camel/quarkus/core/CamelServlet.java| 5 +++
.../org/apache/camel/quarkus/core/CamelTest.java | 5 +++
.../apache/camel/quarkus/core/CamelServlet.java| 2 ++
.../org/apache/camel/quarkus/core/CamelTest.java | 5 ++-
poms/bom/pom.xml | 11 +++
tooling/package-maven-plugin/pom.xml | 10 ++
19 files changed, 165 insertions(+), 77 deletions(-)
diff --git
a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
index 07329c8..19b096b 100644
---
a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
+++
b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
@@ -24,6 +24,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
import org.apache.camel.quarkus.component.xml.XmlRecorder;
import
org.apache.camel.quarkus.core.deployment.CamelModelJAXBContextFactoryBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelModelToXMLDumperBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.CamelSupport;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
@@ -56,7 +57,13 @@ class XmlProcessor {
@BuildStep
@Record(value = ExecutionTime.STATIC_INIT, optional = true)
CamelRoutesLoaderBuildItems.Xml xmlLoader(XmlRecorder recorder) {
-return new
CamelRoutesLoaderBuildItems.Xml(recorder.newDefaultXmlLoader());
+return new
CamelRoutesLoaderBuildItems.Xml(recorder.newJaxbXMLRoutesDefinitionLoader());
+}
+
+@BuildStep
+@Record(value = ExecutionTime.STATIC_INIT, optional = true)
+CamelModelToXMLDumperBuildItem xmlModelDumper(XmlRecorder recorder) {
+return new
CamelModelToXMLDumperBuildItem(recorder.newJaxbModelToXMLDumper());
}
@BuildStep
diff --git a/extensions/core-xml/runtime/pom.xml
b/extensions/core-xml/runtime/pom.xml
index aac5cda..f61467d 100644
--- a/extensions/core-xml/runtime/pom.xml
+++ b/extensions/core-xml/runtime/pom.xml
@@ -48,6 +48,10 @@
+org.apache.camel
+camel-xml-jaxb
+
+
org.apache.camel.quarkus
camel-quarkus-core
diff --git
a/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
b/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
index 0170587..1469086 100644
---
a/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
+++
b/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
@@ -24,12 +24,15 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultModelJAXBContextFactory;
import org.apache.camel.model.ValidateDefinition;
import org.apache.camel.model.validator.PredicateValidatorDefinition;
-import org.apache.camel.quarkus.core.XmlRoutesLoader;
import org.apache.camel.reifier.ProcessorReifier;
import org.apache.camel.reifier.ValidateReifier;
import org.apache.camel.reifier.validator.PredicateValidatorReifier;
import org.apache.camel.reifier.validator.ValidatorReifier;
import org.apache.camel.spi.ModelJAXBContextFactory;
+import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.spi.XMLRoutesDefinitionLoader;
+import
[camel-quarkus] 17/34: create camel-jira extension #710
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 5b22aa6218fb3d61d14ad92c3efde71b3271aac6
Author: Freeman Fang
AuthorDate: Thu Feb 13 14:03:25 2020 -0500
create camel-jira extension #710
---
.../pages/list-of-camel-quarkus-extensions.adoc| 5 +-
extensions/jira/deployment/pom.xml | 79
.../component/jira/deployment/JiraProcessor.java | 31
extensions/jira/pom.xml| 39
extensions/jira/runtime/pom.xml| 125 +
.../main/resources/META-INF/quarkus-extension.yaml | 27 +++
extensions/pom.xml | 1 +
extensions/readme.adoc | 5 +-
integration-tests/jira/pom.xml | 202 +
.../quarkus/component/jira/it/JiraResource.java| 86 +
.../component/jira/it/JiraRouteBuilder.java| 41 +
.../camel/quarkus/component/jira/it/JiraIT.java| 24 +++
.../camel/quarkus/component/jira/it/JiraTest.java | 41 +
integration-tests/pom.xml | 1 +
pom.xml| 2 +
poms/bom-deployment/pom.xml| 5 +
poms/bom/pom.xml | 22 ++-
17 files changed, 733 insertions(+), 3 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index b97e9be..b884fda 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -18,7 +18,7 @@ In case you are missing some Camel feature in the list:
== Camel Components
// components: START
-Number of Camel components: 63 in 54 JAR artifacts (0 deprecated)
+Number of Camel components: 64 in 55 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -114,6 +114,9 @@ Number of Camel components: 63 in 54 JAR artifacts (0
deprecated)
| link:https://camel.apache.org/components/latest/jdbc-component.html[JDBC]
(camel-quarkus-jdbc) +
`jdbc:dataSourceName` | 0.2.0 | The jdbc component enables you to access
databases through JDBC, where SQL queries are sent in the message body.
+| link:https://camel.apache.org/components/latest/jira-component.html[Jira]
(camel-quarkus-jira) +
+`jira:type` | 1.1.0 | The jira component interacts with the JIRA issue tracker.
+
| link:https://camel.apache.org/components/latest/kafka-component.html[Kafka]
(camel-quarkus-kafka) +
`kafka:topic` | 1.0.0-M1 | The kafka component allows messages to be sent to
(or consumed from) Apache Kafka brokers.
diff --git a/extensions/jira/deployment/pom.xml
b/extensions/jira/deployment/pom.xml
new file mode 100644
index 000..2e1dd6c
--- /dev/null
+++ b/extensions/jira/deployment/pom.xml
@@ -0,0 +1,79 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-jira-parent
+1.1.0-SNAPSHOT
+../pom.xml
+
+
+camel-quarkus-jira-deployment
+Camel Quarkus :: Jira :: Deployment
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom-deployment
+${project.version}
+pom
+import
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-core-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-jira
+
+
+org.apache.camel.quarkus
+
camel-quarkus-support-commons-logging-deployment
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+
+
+io.quarkus
+
quarkus-extension-processor
+${quarkus.version}
+
+
+
+
+
+
+
+
diff --git
a/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
b/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
new file mode 100644
index 000..befac44
--- /dev/null
+++
b/extensions/jira/deployment/src/main/java/org/apache/camel/quarkus/component/jira/deployment/JiraProcessor.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license
[camel-quarkus] 19/34: Fix incompatibilities between Quarkus and Camel MongoDB dependencies
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 0bbb279a050ea13c80b549984ef9145ecb1ae4bc
Author: James Netherton
AuthorDate: Thu Jan 23 15:11:07 2020 +
Fix incompatibilities between Quarkus and Camel MongoDB dependencies
fixes #544, #649
---
.../mongodb/deployment/MongoDbProcessor.java | 11 +-
extensions/mongodb/runtime/pom.xml | 4 +-
.../component/mongodb/CamelMongoClient.java| 124 -
.../mongodb/CamelMongoClientRecorder.java | 29 -
.../graal/SubstituteMongoClientOptions.java| 43 ---
.../component/mongodb/it/MongoDbResource.java | 10 --
.../component/mongodb/it/MongoDbTestResource.java | 4 +-
pom.xml| 8 ++
poms/bom/pom.xml | 25 +
9 files changed, 39 insertions(+), 219 deletions(-)
diff --git
a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
index f14c0c9..8f5a378 100644
---
a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
+++
b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
@@ -18,11 +18,8 @@ package
org.apache.camel.quarkus.component.mongodb.deployment;
import com.mongodb.MongoClient;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
-import org.apache.camel.quarkus.component.mongodb.CamelMongoClientRecorder;
import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
class MongoDbProcessor {
@@ -35,11 +32,7 @@ class MongoDbProcessor {
}
@BuildStep
-@Record(ExecutionTime.RUNTIME_INIT)
-CamelRuntimeBeanBuildItem
registerCamelMongoClientProducer(MongoClientBuildItem mongoClientBuildItem,
-CamelMongoClientRecorder recorder) {
-
-return new CamelRuntimeBeanBuildItem("camelMongoClient",
MongoClient.class.getName(),
-
recorder.createCamelMongoClient(mongoClientBuildItem.getClient()));
+CamelRuntimeBeanBuildItem
registerCamelMongoClientProducer(MongoClientBuildItem mongoClientBuildItem) {
+return new CamelRuntimeBeanBuildItem("camelMongoClient",
MongoClient.class.getName(), mongoClientBuildItem.getClient());
}
}
diff --git a/extensions/mongodb/runtime/pom.xml
b/extensions/mongodb/runtime/pom.xml
index 8cf892f..2517e80 100644
--- a/extensions/mongodb/runtime/pom.xml
+++ b/extensions/mongodb/runtime/pom.xml
@@ -63,8 +63,8 @@
mongodb-driver-legacy
-org.graalvm.nativeimage
-svm
+org.mongodb
+mongodb-crypt
diff --git
a/extensions/mongodb/runtime/src/main/java/org/apache/camel/quarkus/component/mongodb/CamelMongoClient.java
b/extensions/mongodb/runtime/src/main/java/org/apache/camel/quarkus/component/mongodb/CamelMongoClient.java
deleted file mode 100644
index a2f515f..000
---
a/extensions/mongodb/runtime/src/main/java/org/apache/camel/quarkus/component/mongodb/CamelMongoClient.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.quarkus.component.mongodb;
-
-import java.util.List;
-
-import com.mongodb.ClientSessionOptions;
-import com.mongodb.client.ChangeStreamIterable;
-import com.mongodb.client.ClientSession;
-import com.mongodb.client.ListDatabasesIterable;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.MongoIterable;
-import org.bson.Document;
-import org.bson.conversions.Bson;
-
-/**
- * Bridges Mongo client types {@link
[camel-quarkus] 33/34: Upgarde to Camel 3.1.0 - WIP (FastTypeConverter)
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 c1451c7a89b205430dd195c4b707f5938ba43227
Author: James Netherton
AuthorDate: Mon Feb 17 09:32:03 2020 +
Upgarde to Camel 3.1.0 - WIP (FastTypeConverter)
---
.../main/java/org/apache/camel/quarkus/core/FastTypeConverter.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
index 7ed602b..178250f 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
@@ -40,9 +40,4 @@ public class FastTypeConverter extends DefaultTypeConverter {
public void loadCoreAndFastTypeConverters() throws Exception {
throw new UnsupportedOperationException();
}
-
-@Override
-protected void initTypeConverterLoaders() {
-// no-op
-}
}
[camel-quarkus] 16/34: Fix #694 quarkus-maven-plugin generate application.properties file for IT tests
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 d2f6b59c800b376f19f2de2862b1938c65f4ff2e Author: Peter Palaga AuthorDate: Thu Feb 13 15:14:16 2020 +0100 Fix #694 quarkus-maven-plugin generate application.properties file for IT tests --- .../integration-test-application.properties | 16 1 file changed, 16 insertions(+) diff --git a/tooling/create-extension-templates/integration-test-application.properties b/tooling/create-extension-templates/integration-test-application.properties new file mode 100644 index 000..fa7a54b --- /dev/null +++ b/tooling/create-extension-templates/integration-test-application.properties @@ -0,0 +1,16 @@ +## --- +## 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. +## ---
[camel-quarkus] 11/34: Ensure that catalog files are added to the native image #686 (fix findings)
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 f17423b079f0a887b8286c4794b7d59b8e730d0a
Author: lburgazzoli
AuthorDate: Wed Feb 12 10:53:15 2020 +0100
Ensure that catalog files are added to the native image #686 (fix findings)
---
.../org/apache/camel/quarkus/core/CamelConfig.java | 20 +---
.../camel/quarkus/core/CamelRuntimeCatalog.java | 8
.../java/org/apache/camel/quarkus/core/Flags.java| 5 -
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
index 4873c5e..1b2c75c 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
@@ -39,7 +39,7 @@ public class CamelConfig {
public ServiceConfig service;
/**
- * Build time configuration options for CamelRuntimeCatalog.
+ * Build time configuration options for {@link
org.apache.camel.runtimecatalog.RuntimeCamelCatalog}.
*/
@ConfigItem
public RuntimeCatalogConfig runtimeCatalog;
@@ -183,16 +183,11 @@ public class CamelConfig {
@ConfigGroup
public static class RuntimeCatalogConfig {
/**
- * Enable {@link CamelRuntimeCatalog} functionaries.
- */
-@ConfigItem(defaultValue = "true")
-public boolean enabled;
-
-/**
* Used to control the resolution of components catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to components
- * discovered at build time have to be included in the final binary.
+ * discovered at build time have to be included in the final binary.
In JVM mode there is no real benefit of
+ * setting this flag to {@code false} if not to make the behavior
consistent with native mode.
*/
@ConfigItem(defaultValue = "true")
public boolean components;
@@ -201,7 +196,8 @@ public class CamelConfig {
* Used to control the resolution of languages catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to languages
- * discovered at build time have to be included in the final binary.
+ * discovered at build time have to be included in the final binary.
In JVM mode there is no real benefit of
+ * setting this flag to {@code false} if not to make the behavior
consistent with native mode.
*/
@ConfigItem(defaultValue = "true")
public boolean languages;
@@ -210,7 +206,8 @@ public class CamelConfig {
* Used to control the resolution of dataformats catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to dataformats
- * discovered at build time have to be included in the final binary.
+ * discovered at build time have to be included in the final binary.
In JVM mode there is no real benefit of
+ * setting this flag to {@code false} if not to make the behavior
consistent with native mode.
*/
@ConfigItem(defaultValue = "true")
public boolean dataformats;
@@ -219,7 +216,8 @@ public class CamelConfig {
* Used to control the resolution of model catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to models
- * has to be included in the final binary.
+ * has to be included in the final binary. In JVM mode there is no
real benefit of setting this flag to
+ * {@code false} if not to make the behavior consistent with native
mode.
*/
@ConfigItem(defaultValue = "true")
public boolean models;
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
index 2f82322..5b56b9c 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
@@ -30,7 +30,7 @@ public class CamelRuntimeCatalog extends
DefaultRuntimeCamelCatalog {
@Override
public String modelJSonSchema(String name) {
-if (!config.enabled || !config.models) {
+if (!config.models) {
return null;
}
@@ -39,7 +39,7 @@ public class CamelRuntimeCatalog extends
DefaultRuntimeCamelCatalog {
@Override
public
[camel-quarkus] 02/34: chore: Remove redundant note related to fileWatcher param in stream extension docs
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 882bb408d632a3be449a43a14d8596757ba71e36 Author: James Netherton AuthorDate: Tue Feb 11 15:19:02 2020 + chore: Remove redundant note related to fileWatcher param in stream extension docs --- docs/modules/ROOT/pages/extensions/stream.adoc | 4 1 file changed, 4 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/stream.adoc b/docs/modules/ROOT/pages/extensions/stream.adoc index 0da0e4c..eae7814 100644 --- a/docs/modules/ROOT/pages/extensions/stream.adoc +++ b/docs/modules/ROOT/pages/extensions/stream.adoc @@ -25,7 +25,3 @@ Please refer to the https://camel.apache.org/components/latest/stream-component. * Check the xref:native-mode.adoc#charsets[Character encodings section] of the Native mode guide if you want to use non-default encodings for the stream endpoint `encoding` URI parameter. -[NOTE] - -The `fileWatcher` feature of the stream consumer requires GraalVM >= 19.3.0, due to a https://github.com/oracle/graal/issues/1253[bug]. -
[camel-quarkus] 01/34: Add olingo4 extension
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 287480e280d196ffb7354bcb6cf7aebbe6a195cb
Author: James Netherton
AuthorDate: Tue Feb 11 09:19:43 2020 +
Add olingo4 extension
fixes #692
---
.../pages/list-of-camel-quarkus-extensions.adoc| 5 +-
extensions/olingo4/deployment/pom.xml | 91 ++
.../olingo4/deployment/Olingo4Processor.java | 72 +++
extensions/olingo4/pom.xml | 39 ++
extensions/olingo4/runtime/pom.xml | 102
.../olingo4/graal/ODataImplSubstitutions.java | 33 ++
.../main/resources/META-INF/quarkus-extension.yaml | 28 +
extensions/pom.xml | 1 +
extensions/readme.adoc | 5 +-
.../httpclient/deployment/HttpClientProcessor.java | 7 ++
integration-tests/olingo4/pom.xml | 132 +
.../component/olingo4/it/Olingo4Resource.java | 120 +++
.../camel/quarkus/component/olingo4/it/Person.java | 68 +++
.../quarkus/component/olingo4/it/Olingo4IT.java| 24
.../quarkus/component/olingo4/it/Olingo4Test.java | 120 +++
integration-tests/pom.xml | 1 +
pom.xml| 1 +
poms/bom-deployment/pom.xml| 5 +
poms/bom/pom.xml | 21
19 files changed, 873 insertions(+), 2 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index cced184..b97e9be 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -18,7 +18,7 @@ In case you are missing some Camel feature in the list:
== Camel Components
// components: START
-Number of Camel components: 62 in 53 JAR artifacts (0 deprecated)
+Number of Camel components: 63 in 54 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -135,6 +135,9 @@ Number of Camel components: 62 in 53 JAR artifacts (0
deprecated)
| xref:extensions/netty-http.adoc[Netty HTTP] (camel-quarkus-netty-http) +
`netty-http:protocol:host:port/path` | 0.2.0 | Netty HTTP server and client
using the Netty 4.x library.
+|
link:https://camel.apache.org/components/latest/olingo4-component.html[Olingo4]
(camel-quarkus-olingo4) +
+`olingo4:apiName/methodName` | 1.2.0 | Communicates with OData 4.0 services
using Apache Olingo OData API.
+
| link:https://camel.apache.org/components/latest/paho-component.html[Paho]
(camel-quarkus-paho) +
`paho:topic` | 0.2.0 | Component for communicating with MQTT message brokers
using Eclipse Paho MQTT Client.
diff --git a/extensions/olingo4/deployment/pom.xml
b/extensions/olingo4/deployment/pom.xml
new file mode 100644
index 000..4271d30
--- /dev/null
+++ b/extensions/olingo4/deployment/pom.xml
@@ -0,0 +1,91 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-olingo4-parent
+1.1.0-SNAPSHOT
+../pom.xml
+
+
+camel-quarkus-olingo4-deployment
+Camel Quarkus :: Olingo4 :: Deployment
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom-deployment
+${project.version}
+pom
+import
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-core-deployment
+
+
+org.apache.camel.quarkus
+
camel-quarkus-support-commons-logging-deployment
+
+
+org.apache.camel.quarkus
+
camel-quarkus-support-httpclient-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-support-xml-deployment
+
+
+io.quarkus
+quarkus-jackson-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-olingo4
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+
+
+io.quarkus
+
quarkus-extension-processor
+${quarkus.version}
+
+
+
+
+
+
+
+
diff --git
[camel-quarkus] 29/34: Upgarde to Camel 3.1.0 - WIP (simplified RuntimeCamelCatalog)
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 15da541a23c307e38b8bfa061d84da863986e8ab
Author: Peter Palaga
AuthorDate: Thu Feb 13 16:10:05 2020 +0100
Upgarde to Camel 3.1.0 - WIP (simplified RuntimeCamelCatalog)
---
.../src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java | 4 ++--
.../java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java| 7 ++-
.../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 2 +-
.../src/main/java/org/apache/camel/quarkus/core/CamelServlet.java | 4 ++--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index e37ca47..35e5688 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
@@ -20,12 +20,12 @@ import io.quarkus.arc.runtime.BeanContainer;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import org.apache.camel.CamelContext;
+import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.model.ValidateDefinition;
import org.apache.camel.model.validator.PredicateValidatorDefinition;
import org.apache.camel.quarkus.core.FastFactoryFinderResolver.Builder;
import org.apache.camel.reifier.ProcessorReifier;
import org.apache.camel.reifier.validator.ValidatorReifier;
-import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelToXMLDumper;
@@ -75,7 +75,7 @@ public class CamelRecorder {
xmlLoader.getValue(),
xmlModelDumper.getValue());
-context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new
CamelRuntimeCatalog(context, config.runtimeCatalog));
+context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new
CamelRuntimeCatalog(config.runtimeCatalog));
context.setRegistry(registry.getValue());
context.setTypeConverterRegistry(typeConverterRegistry.getValue());
context.setLoadTypeConverters(false);
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
index 5b56b9c..98474b3 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
@@ -16,15 +16,12 @@
*/
package org.apache.camel.quarkus.core;
-import org.apache.camel.CamelContext;
-import org.apache.camel.runtimecatalog.impl.DefaultRuntimeCamelCatalog;
+import org.apache.camel.catalog.impl.DefaultRuntimeCamelCatalog;
public class CamelRuntimeCatalog extends DefaultRuntimeCamelCatalog {
private final CamelConfig.RuntimeCatalogConfig config;
-public CamelRuntimeCatalog(CamelContext camelContext,
CamelConfig.RuntimeCatalogConfig config) {
-super(camelContext, true);
-
+public CamelRuntimeCatalog(CamelConfig.RuntimeCatalogConfig config) {
this.config = config;
}
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index 35ebb10..da27c25 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -76,8 +76,8 @@ import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ComponentResolver;
-import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.ConfigurerResolver;
+import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.EndpointRegistry;
import org.apache.camel.spi.ExecutorServiceManager;
diff --git
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
index d83da39..773d87e 100644
---
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
+++
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
@@ -30,8 +30,8 @@ import javax.ws.rs.core.MediaType;
import org.apache.camel.CamelContext;
import
[camel-quarkus] 12/34: Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
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 35ad157e15362a24a69466f6e516138c7a9381f0 Author: Peter Palaga AuthorDate: Wed Feb 12 17:46:24 2020 +0100 Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true This is to enable retries even on dependency downloads where the request was sent successfully --- .mvn/maven.config | 1 + 1 file changed, 1 insertion(+) diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000..3b3d7bc --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.wagon.http.retryHandler.requestSentEnabled=true
[camel-quarkus] 27/34: Stop unbanning some classes after the upgrade to Camel 3.1
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 704a28af8579fd47309d6dc82a4937d73663ac58
Author: Peter Palaga
AuthorDate: Mon Feb 10 16:31:42 2020 +0100
Stop unbanning some classes after the upgrade to Camel 3.1
---
.../quarkus/component/consul/deployment/ConsulProcessor.java | 12
.../component/support/policy/deployment/PolicyProcessor.java | 8 +---
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git
a/extensions/consul/deployment/src/main/java/org/apache/camel/quarkus/component/consul/deployment/ConsulProcessor.java
b/extensions/consul/deployment/src/main/java/org/apache/camel/quarkus/component/consul/deployment/ConsulProcessor.java
index 131adba..ac2cf5b 100644
---
a/extensions/consul/deployment/src/main/java/org/apache/camel/quarkus/component/consul/deployment/ConsulProcessor.java
+++
b/extensions/consul/deployment/src/main/java/org/apache/camel/quarkus/component/consul/deployment/ConsulProcessor.java
@@ -16,11 +16,9 @@
*/
package org.apache.camel.quarkus.component.consul.deployment;
-import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
class ConsulProcessor {
private static final String FEATURE = "camel-consul";
@@ -35,14 +33,4 @@ class ConsulProcessor {
return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
-@BuildStep
-void reflectiveClasses(BuildProducer
reflectiveClasses) {
-reflectiveClasses.produce(new ReflectiveClassBuildItem(
-true,
-false,
-"org.apache.camel.component.consul.ConsulConfiguration",
-"org.apache.camel.component.consul.ConsulClientConfiguration",
-
"org.apache.camel.component.consul.health.ConsulHealthCheckRepositoryConfiguration",
-
"org.apache.camel.component.consul.cloud.ConsulServiceRegistryConfiguration"));
-}
}
diff --git
a/extensions/support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
b/extensions/support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
index 8993afa..9a2ce53 100644
---
a/extensions/support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
+++
b/extensions/support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
@@ -65,13 +65,7 @@ class PolicyProcessor {
"org.apache.camel.component.fhir.FhirHistoryEndpointConfiguration",
"org.apache.camel.component.fhir.FhirMetaEndpointConfiguration",
"org.apache.camel.component.fhir.FhirPatchEndpointConfiguration",
-
"org.apache.camel.component.fhir.FhirDeleteEndpointConfiguration",
-
-/* org.apache.camel.component.consul.* can be removed after
the upgrade to Camel 3.1 */
-"org.apache.camel.component.consul.ConsulConfiguration",
-"org.apache.camel.component.consul.ConsulClientConfiguration",
-
"org.apache.camel.component.consul.health.ConsulHealthCheckRepositoryConfiguration",
-
"org.apache.camel.component.consul.cloud.ConsulServiceRegistryConfiguration");
+
"org.apache.camel.component.fhir.FhirDeleteEndpointConfiguration");
}
/* Make the build fail as long as there are banned classes registered for
reflection */
[camel-quarkus] 20/34: Upgrade to Camel 3.1.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 c43d9bd543760598b9c27b16945256151ca28bcc
Author: James Netherton
AuthorDate: Wed Jan 29 08:03:34 2020 +
Upgrade to Camel 3.1.0 - WIP
---
.../pages/list-of-camel-quarkus-extensions.adoc| 4 +-
.../quarkus/core/CamelMainEventDispatcher.java | 5 +
.../apache/camel/quarkus/core/CamelMainEvents.java | 6 +
.../camel/quarkus/core/CamelMainRecorder.java | 3 +-
.../core/DisabledPredicateValidatorReifier.java| 2 +-
.../camel/quarkus/core/FastCamelContext.java | 17 +-
.../camel/quarkus/core/FastTypeConverter.java | 6 +-
extensions/readme.adoc | 4 +-
.../apache/camel/quarkus/core/CamelServlet.java| 2 +-
.../core/runtime/support/SupportListener.java | 4 +
pom.xml| 2 +-
tooling/package-maven-plugin/pom.xml | 22 +
.../apache/camel/quarkus/maven/ExtMvelHelper.java | 12 +-
.../camel/quarkus/maven/JSonSchemaHelper.java | 567 +
.../quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +-
.../quarkus/maven/UpdateDocExtensionsListMojo.java | 132 ++---
16 files changed, 697 insertions(+), 93 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index b884fda..b8e0b1d 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -64,7 +64,7 @@ Number of Camel components: 64 in 55 JAR artifacts (0
deprecated)
`aws-sqs:queueNameOrArn` | 0.2.0 | The aws-sqs component is used for sending
and receiving messages to Amazon's SQS service.
|
link:https://camel.apache.org/components/latest/aws-translate-component.html[AWS
Translate] (camel-quarkus-aws-translate) +
-`aws-translate:label` | 1.0.0-M3 | The aws-kms is used for managing Amazon
Translate
+`aws-translate:label` | 1.0.0-M3 | The aws-translate component is used for
managing Amazon Translate
| link:https://camel.apache.org/components/latest/bean-component.html[Bean]
(camel-quarkus-bean) +
`bean:beanName` | 0.2.0 | The bean component is for invoking Java beans from
Camel.
@@ -73,7 +73,7 @@ Number of Camel components: 64 in 55 JAR artifacts (0
deprecated)
`bean-validator:label` | 1.0.0-M1 | The Validator component performs bean
validation of the message body using the Java Bean Validation API.
| link:https://camel.apache.org/components/latest/class-component.html[Class]
(camel-quarkus-bean) +
-`class:beanName` | 0.2.0 | The class component is for invoking Java classes
(Java beans) from Camel.
+`class:beanName` | 0.2.0 | The Class component is for invoking Java classes
(Java beans) from Camel.
|
link:https://camel.apache.org/components/latest/consul-component.html[Consul]
(camel-quarkus-consul) +
`consul:apiEndpoint` | 1.0.0-M3 | The camel consul component allows you to
work with Consul, a distributed, highly available, datacenter-aware, service
discovery and configuration system.
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
index 1df54ab..2b6f368 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
@@ -26,6 +26,11 @@ import org.apache.camel.main.MainSupport;
*/
public class CamelMainEventDispatcher implements
org.apache.camel.main.MainListener {
@Override
+public void beforeConfigure(BaseMainSupport main) {
+fireEvent(CamelMainEvents.BeforeConfigure.class, new
CamelMainEvents.BeforeConfigure());
+}
+
+@Override
public void configure(CamelContext context) {
fireEvent(CamelMainEvents.Configure.class, new
CamelMainEvents.Configure());
}
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
index 122803a..75b1d0e 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
@@ -21,6 +21,12 @@ public final class CamelMainEvents {
}
/**
+ * Event fired by {@link CamelMain} before the CamelContext is configured.
+ */
+public static class BeforeConfigure {
+}
+
+/**
* Event fired by {@link CamelMain} before the CamelContext is being
created and started.
*/
public static class BeforeStart {
