[GitHub] [camel] fpapon commented on pull request #3800: [CAMEL-15010] Upgrade to Shiro 1.5.3
fpapon commented on pull request #3800: URL: https://github.com/apache/camel/pull/3800#issuecomment-623869656 @oscerd I cancel this PR because this update has already done in this commit: https://github.com/apache/camel/commit/81ec7bab205b4f57bc86570e84e71b323bb769ab I didn't see it because there isn't a Jira. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] fpapon commented on pull request #3800: [CAMEL-15010] Upgrade to Shiro 1.5.3
fpapon commented on pull request #3800: URL: https://github.com/apache/camel/pull/3800#issuecomment-623865452 > Please run also tooling/maven/sync-properties so it will be updated also camel-dependecies will be updated too Ok, I didn't know about this, sorry for the noise. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd commented on pull request #3800: [CAMEL-15010] Upgrade to Shiro 1.5.3
oscerd commented on pull request #3800: URL: https://github.com/apache/camel/pull/3800#issuecomment-623865785 Yesterday evening news :-) not your fault! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] fpapon opened a new pull request #3800: [CAMEL-15010] Upgrade to Shiro 1.5.3
fpapon opened a new pull request #3800: URL: https://github.com/apache/camel/pull/3800 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch master updated: [create-pull-request] automated change
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 d797fdf [create-pull-request] automated change d797fdf is described below commit d797fdff2a261f5c3ac2416d7caa85f62928a7c8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue May 5 00:35:46 2020 + [create-pull-request] automated change --- components-starter/camel-corda-starter/pom.xml | 12 components-starter/camel-spring-boot-starter/pom.xml | 16 .../camel-spring-cloud-consul-starter/pom.xml| 20 .../camel-spring-cloud-netflix-starter/pom.xml | 20 .../camel-spring-cloud-starter/pom.xml | 20 .../camel-spring-cloud-zookeeper-starter/pom.xml | 20 6 files changed, 108 deletions(-) diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index f29dca1..0391c60 100644 --- a/components-starter/camel-corda-starter/pom.xml +++ b/components-starter/camel-corda-starter/pom.xml @@ -38,18 +38,6 @@ org.apache.camel camel-corda ${camel-version} - - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - diff --git a/components-starter/camel-spring-boot-starter/pom.xml b/components-starter/camel-spring-boot-starter/pom.xml index a044dd9..ef4dde9 100644 --- a/components-starter/camel-spring-boot-starter/pom.xml +++ b/components-starter/camel-spring-boot-starter/pom.xml @@ -48,22 +48,6 @@ ch.qos.logback logback-core - - commons-logging - commons-logging - - - log4j - log4j - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml b/components-starter/camel-spring-cloud-consul-starter/pom.xml index 6e257e9..5df3ca4 100644 --- a/components-starter/camel-spring-cloud-consul-starter/pom.xml +++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml @@ -38,26 +38,6 @@ org.apache.camel.springboot camel-spring-cloud-consul ${project.version} - - - - commons-logging - commons-logging - - - log4j - log4j - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - - - diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/components-starter/camel-spring-cloud-netflix-starter/pom.xml index beacbb0..fbba09a 100644 --- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml +++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml @@ -38,26 +38,6 @@ org.apache.camel.springboot camel-spring-cloud-netflix ${project.version} - - - - commons-logging - commons-logging - - - log4j - log4j - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - - - diff --git a/components-starter/camel-spring-cloud-starter/pom.xml b/components-starter/camel-spring-cloud-starter/pom.xml index 35eb6a5..0f4ff7d 100644 --- a/components-starter/camel-spring-cloud-starter/pom.xml +++ b/components-starter/camel-spring-cloud-starter/pom.xml @@ -38,26 +38,6 @@ org.apache.camel.springboot camel-spring-cloud ${project.version} - - - - commons-logging - commons-logging - - - log4j - log4j - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - - - diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml index b29563b..168d968 100644 --- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml +++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml @@ -38,26 +38,6 @@ org.apache.camel.springboot camel-spring-cloud-zookeeper ${project.version} - - - - commons-logging -
[GitHub] [camel-quarkus] github-actions[bot] opened a new issue #1179: [CI] - Quarkus Master Branch Build Failure
github-actions[bot] opened a new issue #1179: URL: https://github.com/apache/camel-quarkus/issues/1179 The [quarkus-master](https://github.com/apache/camel-quarkus/tree/quarkus-master) branch build is failing: * Build ID: 95760384-12-650a3bfd-f963-4e03-8a99-f99bb6ba96b4 * Commit: b1e5afe8d7bd16d715a81851490b837962faa502 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/95760384 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (2ea6d41 -> e54ada6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. omit 2ea6d41 [create-pull-request] automated change add 562b0cd [create-pull-request] automated change add 1a2807c CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and regen add 8033a29 CAMEL-15007 camel-undertow-spring-security create example of usage add e54ada6 [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2ea6d41) \ N -- N -- N refs/heads/automatic-periodic-sync (e54ada6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../springboot/catalog/components/activemq.json|1 - .../camel/springboot/catalog/components/amqp.json |1 - .../camel/springboot/catalog/components/jms.json |1 - .../src/main/docs/activemq-starter.adoc|3 +- .../springboot/ActiveMQComponentConfiguration.java | 17 - .../src/main/docs/amqp-starter.adoc|3 +- .../springboot/AMQPComponentConfiguration.java | 17 - .../src/main/docs/jms-starter.adoc |3 +- .../jms/springboot/JmsComponentConfiguration.java | 17 - docs/modules/ROOT/pages/activemq-starter.adoc |3 +- docs/modules/ROOT/pages/amqp-starter.adoc |3 +- docs/modules/ROOT/pages/jms-starter.adoc |3 +- .../pom.xml| 41 +- .../readme.adoc| 67 + .../realm-export.json | 1446 .../example/undertow/spring/boot}/Application.java | 24 +- .../spring/boot/SecurityConfiguration.java | 106 ++ .../src/main}/resources/application.properties |4 +- examples/pom.xml |1 + pom.xml|6 +- tooling/camel-spring-boot-dependencies/pom.xml |4 +- 21 files changed, 1673 insertions(+), 98 deletions(-) copy examples/{camel-example-spring-boot-clustered-route-controller/cluster-node => camel-example-spring-boot-undertow-spring-security}/pom.xml (78%) create mode 100644 examples/camel-example-spring-boot-undertow-spring-security/readme.adoc create mode 100644 examples/camel-example-spring-boot-undertow-spring-security/realm-export.json copy examples/{camel-example-spring-boot-webhook/src/main/java/org/apache/camel/example/webhook => camel-example-spring-boot-undertow-spring-security/src/main/java/org/apache/camel/example/undertow/spring/boot}/Application.java (56%) create mode 100644 examples/camel-example-spring-boot-undertow-spring-security/src/main/java/org/apache/camel/example/undertow/spring/boot/SecurityConfiguration.java copy {components-starter/camel-dns-starter/src/test => examples/camel-example-spring-boot-undertow-spring-security/src/main}/resources/application.properties (85%)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request #61: [Github Actions] Periodic Sync Camel Spring Boot Master Branch
github-actions[bot] opened a new pull request #61: URL: https://github.com/apache/camel-spring-boot/pull/61 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
[GitHub] [camel-k] michaelwjoyner opened a new issue #1442: vanilla minikube - CronJobs are not being built from operator
michaelwjoyner opened a new issue #1442: URL: https://github.com/apache/camel-k/issues/1442 ``` import org.apache.camel.builder.RouteBuilder; public class Basic extends RouteBuilder { @Override public void configure() throws Exception { from("timer:java?period=18=true") .setHeader("example").constant("python") .setBody().simple("Fred flinstone rocks!!! ${header.example}.") .to("log:info"); } } ``` The above job is not building, it works fine for **period=5000** Please let me know if I can attach my log from the operator. ``` integration "basic" created Progress: integration "basic" in phase Initialization IntegrationPlatformAvailable for Integration basic: camel-k Progress: integration "basic" in phase Building Kit Integration basic in phase Initialization No DeploymentAvailable for Integration basic: controller strategy: cron-job No IntegrationKitAvailable for Integration basic: creating a new integration kit Integration basic in phase Building Kit Integration basic dependent resource kit-bqob141jlfefk721mnqg (Integration Kit) changed phase to Build Submitted Integration basic dependent resource kit-bqob141jlfefk721mnqg (Build) changed phase to Scheduling Integration basic dependent resource kit-bqob141jlfefk721mnqg (Integration Kit) changed phase to Build Running Integration basic dependent resource kit-bqob141jlfefk721mnqg (Build) changed phase to Initialization Integration basic dependent resource kit-bqob141jlfefk721mnqg (Build) changed phase to Scheduling Integration basic dependent resource kit-bqob141jlfefk721mnqg (Build) changed phase to Initialization Integration basic dependent resource kit-bqob141jlfefk721mnqg (Build) changed phase to Scheduling ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] isarantidis opened a new pull request #60: CAMEL-15009: Updated activemq component generation configuration
isarantidis opened a new pull request #60: URL: https://github.com/apache/camel-spring-boot/pull/60 Updated with correct default for usePooledConnection This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] djencks opened a new pull request #1441: Partially Fixes Camel 14995: generates master and 3/threescale traits docs.
djencks opened a new pull request #1441: URL: https://github.com/apache/camel-k/pull/1441 This adjusts the source locations in script/gen_doc.sh to actually find the master and threescale source and thus generate the docs. The solution seems to be to list each source directory explicitly. I haven't found any documentation on --input-dirs or been able to discover where it is used or what format it is supposed to be in. This is seriously incomplete for a robust solution: - possible other traits in addons need to be added to gen_doc.sh by hand. This IMO is not likely to happen. - There is no check that every checked in .adoc that was once generated is still generated. In fact I have found no evidence that gen_docs.sh is run as part of ci. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch master updated: Fix #1177 Add simple timer dev mode test
This is an automated email from the ASF dual-hosted git repository. ppalaga 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 83cda81 Fix #1177 Add simple timer dev mode test 83cda81 is described below commit 83cda81e806f928889ee4bd0f63c28f021bf5a43 Author: Peter Palaga AuthorDate: Mon May 4 12:55:30 2020 +0200 Fix #1177 Add simple timer dev mode test --- extensions/timer/deployment/pom.xml| 12 +++ .../test/devmode/timer/TimerDevModeTest.java | 97 ++ .../component/test/devmode/timer/TimerRoute.java | 31 +++ 3 files changed, 140 insertions(+) diff --git a/extensions/timer/deployment/pom.xml b/extensions/timer/deployment/pom.xml index 008253a..93904a8 100644 --- a/extensions/timer/deployment/pom.xml +++ b/extensions/timer/deployment/pom.xml @@ -50,6 +50,18 @@ org.apache.camel.quarkus camel-quarkus-timer + + + +io.quarkus +quarkus-junit5-internal +test + + +org.awaitility +awaitility +test + diff --git a/extensions/timer/deployment/src/test/java/org/apache/camel/quarkus/component/test/devmode/timer/TimerDevModeTest.java b/extensions/timer/deployment/src/test/java/org/apache/camel/quarkus/component/test/devmode/timer/TimerDevModeTest.java new file mode 100644 index 000..f83c82e --- /dev/null +++ b/extensions/timer/deployment/src/test/java/org/apache/camel/quarkus/component/test/devmode/timer/TimerDevModeTest.java @@ -0,0 +1,97 @@ +/* + * 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.test.devmode.timer; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Properties; +import java.util.concurrent.TimeUnit; + +import io.quarkus.test.QuarkusDevModeTest; +import org.awaitility.Awaitility; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +public class TimerDevModeTest { +private static final Path LOG_FILE = Paths.get("target/" + TimerDevModeTest.class.getSimpleName() + ".log"); + +@RegisterExtension +static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() +.setArchiveProducer(() -> ShrinkWrap +.create(JavaArchive.class) +.addClasses(TimerRoute.class) +.addAsResource(applicationProperties(), "application.properties")) +.setLogFileName(LOG_FILE.getFileName().toString()); + +@Test +void logMessageEdit() throws IOException { +Awaitility.await() +.atMost(1, TimeUnit.MINUTES) +.until(() -> Files.exists(LOG_FILE)); + +try (BufferedReader logFileReader = Files.newBufferedReader(LOG_FILE, StandardCharsets.UTF_8)) { +assertLogMessage(logFileReader, "Hello foo", 3); +TEST.modifySourceFile(TimerRoute.class, oldSource -> oldSource.replace("Hello foo", "Hello bar")); +assertLogMessage(logFileReader, "Hello bar", 3); +} +} + +static void assertLogMessage(BufferedReader logFileReader, String msg, long timeout) throws IOException { +boolean found = false; +final long deadline = System.currentTimeMillis() + timeout; +while (System.currentTimeMillis() < deadline) { +final String line = logFileReader.readLine(); +if (line == null) { +try { +Thread.sleep(50); +} catch (InterruptedException e) { +Thread.currentThread().interrupt(); +throw new
[camel-spring-boot] branch master updated: CAMEL-15007 camel-undertow-spring-security create example of usage
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 8033a29 CAMEL-15007 camel-undertow-spring-security create example of usage 8033a29 is described below commit 8033a29d2eb936240bc0f2c7c1bd66b1c3306e07 Author: JiriOndrusek AuthorDate: Mon May 4 12:56:01 2020 +0200 CAMEL-15007 camel-undertow-spring-security create example of usage --- .../pom.xml| 99 ++ .../readme.adoc| 67 + .../realm-export.json | 1446 .../example/undertow/spring/boot/Application.java | 60 + .../spring/boot/SecurityConfiguration.java | 106 ++ .../src/main/resources/application.properties | 20 + examples/pom.xml |1 + 7 files changed, 1799 insertions(+) diff --git a/examples/camel-example-spring-boot-undertow-spring-security/pom.xml b/examples/camel-example-spring-boot-undertow-spring-security/pom.xml new file mode 100644 index 000..1103dce --- /dev/null +++ b/examples/camel-example-spring-boot-undertow-spring-security/pom.xml @@ -0,0 +1,99 @@ + + +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;> + +examples +org.apache.camel.springboot.example +3.3.0-SNAPSHOT + +4.0.0 + +camel-example-spring-boot-undertow-spring-security +Camel SB Examples :: Undertow spring security +Example on how to use the Camel Undertow component with spring security and Keycloak +jar + + +Advanced + + + + + +org.springframework.boot +spring-boot-dependencies +${spring-boot-version} +pom +import + + + +org.apache.camel.springboot +camel-spring-boot-dependencies +${project.version} +pom +import + + + + + + +org.springframework.boot +spring-boot-starter-undertow + + +org.springframework.boot +spring-boot-starter-tomcat + + + + +org.apache.camel.springboot +camel-undertow-starter + + +org.apache.camel +camel-undertow-spring-security + + +org.springframework.boot +spring-boot-starter-security + + + + + + +org.springframework.boot +spring-boot-maven-plugin +${spring-boot-version} + + + +repackage + + + + + + + + diff --git a/examples/camel-example-spring-boot-undertow-spring-security/readme.adoc b/examples/camel-example-spring-boot-undertow-spring-security/readme.adoc new file mode 100644 index 000..0251e60 --- /dev/null +++ b/examples/camel-example-spring-boot-undertow-spring-security/readme.adoc @@ -0,0 +1,67 @@ +== Camel Example Undertow Spring Security with Keycloak + +This example shows the undertow component with spring security using one of the supported authentication providers: *Keycloak* + +The example starts up a spring-boot application that is authenticated via bearer token with keycloak server. + +=== Setting up a Keycloak server + +Running configured keycloak server is required for this demo. + +To prepare Keycloak server, use _docker-compose_ according the following +https://github.com/keycloak/keycloak-containers/tree/master/docker-compose-examples[examples]. + +After logging into the Administration Console of the keycloak server: + +* Create a realm using import (exported file _realm-export.json_ is prepared in the root of this example). +It will create realm "example-app", with client _example-service_ and roles _role01_ and _role02_. +* Create a user for each roles (_user01_ with role _role01_ and _user02_ with role _role02_). + +When the Keycloak server is configured and running, retrieve access tokens for both users. + +You can use following commands (use correct secrets and names) to retrieve both tokens: + + curl -d "client_id=example-service" -d "client_secret=" -d "username=" -d "password=" -d "grant_type=password" http://localhost:8080/auth/realms//protocol/openid-connect/token | jq -r '.access_token' + +and + + curl -d "client_id=example-service" -d "client_secret="
[GitHub] [camel-quarkus] dc2tom commented on issue #837: Velocity Support
dc2tom commented on issue #837: URL: https://github.com/apache/camel-quarkus/issues/837#issuecomment-623672896 Perfect, thanks for the quick response, I'm now in a position to work through porting the rest of the camel-velocity test over. Hopefully I can have a pull request ready in the near future. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch master updated: CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and 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 The following commit(s) were added to refs/heads/master by this push: new 1a2807c CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and regen 1a2807c is described below commit 1a2807cdc195ab722b6a8a21050ca3ba48ae18fc Author: Andrea Cosentino AuthorDate: Mon May 4 20:47:26 2020 +0200 CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and regen --- .../springboot/catalog/components/activemq.json | 1 - .../camel/springboot/catalog/components/amqp.json| 1 - .../camel/springboot/catalog/components/jms.json | 1 - .../src/main/docs/activemq-starter.adoc | 3 +-- .../springboot/ActiveMQComponentConfiguration.java | 17 - .../src/main/docs/amqp-starter.adoc | 3 +-- .../amqp/springboot/AMQPComponentConfiguration.java | 17 - components-starter/camel-corda-starter/pom.xml | 12 .../camel-jms-starter/src/main/docs/jms-starter.adoc | 3 +-- .../jms/springboot/JmsComponentConfiguration.java| 17 - components-starter/camel-spring-boot-starter/pom.xml | 16 .../camel-spring-cloud-consul-starter/pom.xml| 20 .../camel-spring-cloud-netflix-starter/pom.xml | 20 .../camel-spring-cloud-starter/pom.xml | 20 .../camel-spring-cloud-zookeeper-starter/pom.xml | 20 docs/modules/ROOT/pages/activemq-starter.adoc| 3 +-- docs/modules/ROOT/pages/amqp-starter.adoc| 3 +-- docs/modules/ROOT/pages/jms-starter.adoc | 3 +-- pom.xml | 6 +++--- tooling/camel-spring-boot-dependencies/pom.xml | 4 ++-- 20 files changed, 119 insertions(+), 71 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json index 8772778..1c0c401 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json @@ -35,7 +35,6 @@ "acknowledgementModeName": { "kind": "property", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", [...] "asyncConsumer": { "kind": "property", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message f [...] "autoStartup": { "kind": "property", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether the consumer container should auto-startup." }, -"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 [...] "cacheLevel": { "kind": "property", "displayName": "Cache Level", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description":
[camel-spring-boot] branch master updated: CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and 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 The following commit(s) were added to refs/heads/master by this push: new 1a2807c CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and regen 1a2807c is described below commit 1a2807cdc195ab722b6a8a21050ca3ba48ae18fc Author: Andrea Cosentino AuthorDate: Mon May 4 20:47:26 2020 +0200 CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml, lets do the same for camel-spring-boot and regen --- .../springboot/catalog/components/activemq.json | 1 - .../camel/springboot/catalog/components/amqp.json| 1 - .../camel/springboot/catalog/components/jms.json | 1 - .../src/main/docs/activemq-starter.adoc | 3 +-- .../springboot/ActiveMQComponentConfiguration.java | 17 - .../src/main/docs/amqp-starter.adoc | 3 +-- .../amqp/springboot/AMQPComponentConfiguration.java | 17 - components-starter/camel-corda-starter/pom.xml | 12 .../camel-jms-starter/src/main/docs/jms-starter.adoc | 3 +-- .../jms/springboot/JmsComponentConfiguration.java| 17 - components-starter/camel-spring-boot-starter/pom.xml | 16 .../camel-spring-cloud-consul-starter/pom.xml| 20 .../camel-spring-cloud-netflix-starter/pom.xml | 20 .../camel-spring-cloud-starter/pom.xml | 20 .../camel-spring-cloud-zookeeper-starter/pom.xml | 20 docs/modules/ROOT/pages/activemq-starter.adoc| 3 +-- docs/modules/ROOT/pages/amqp-starter.adoc| 3 +-- docs/modules/ROOT/pages/jms-starter.adoc | 3 +-- pom.xml | 6 +++--- tooling/camel-spring-boot-dependencies/pom.xml | 4 ++-- 20 files changed, 119 insertions(+), 71 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json index 8772778..1c0c401 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json @@ -35,7 +35,6 @@ "acknowledgementModeName": { "kind": "property", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", [...] "asyncConsumer": { "kind": "property", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message f [...] "autoStartup": { "kind": "property", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether the consumer container should auto-startup." }, -"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 [...] "cacheLevel": { "kind": "property", "displayName": "Cache Level", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description":
[camel] branch master updated: CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 3235ae9 CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml 3235ae9 is described below commit 3235ae9370f205a2568640b16099b1f34570a88a Author: Andrea Cosentino AuthorDate: Mon May 4 14:30:54 2020 +0200 CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml --- camel-dependencies/pom.xml | 565 + parent/pom.xml | 1 - pom.xml| 2 + tooling/maven/pom.xml | 1 + tooling/maven/sync-properties-maven-plugin/pom.xml | 88 .../maven/sync/properties/SyncPropertiesMojo.java | 85 6 files changed, 741 insertions(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml new file mode 100644 index 000..6d4770f --- /dev/null +++ b/camel-dependencies/pom.xml @@ -0,0 +1,565 @@ + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +org.apache +apache +21 + + org.apache.camel + camel-dependencies + 3.3.0-SNAPSHOT + pom + Camel :: Dependencies + Camel Dependencies POM + +0.4.0 +2.1.3 + 3.3.0 + 2.0.0.Final +[8,9) +2.12.0 +1.9.1 +2.3 +0.51.0 +1.6.0.Final +9.9.1-6 +5.1.0.RELEASE +2.3 +1.4.13 +2.24.1 +3.14.7 +3.4.0.Final +3.1.1 +3.0.0 +1.4 +3.13.1 + v2-rev297-1.22.0 +7.36.1.Final +4.0.4 +3.0.5 +3.7.2 +1.9.12 +2.4.13 +1.8 +false +1.3 +1.7.7.1 + 3.0.1-b10 + 1.1 +1.23 +1.3.3 +1.7 +2.2.19 +1.11.22 +2.0.14 +2.7.6 +1.1 +2.3 +1.2 +28.2-jre +3.5.0 + 2.0.0 +2.4.4 +3.4.2 +once +1.8.8 +4.2.1.RELEASE +1.2.0 + +5.9.0 +1.2.62 +7.5.1.Final +2.9.0 +3.0.2 +3.10 +1.0.8 +1.50.1 +1.0.0.RC4 +3.2.1 +1.6 +2.3 +true +1.0.2.v20150114 +2.5.0 +3.2.3 +3.11.1 +0.12.0 +1.0.4 +1.3.8 +6.1.1 +1.11.2.Final +4.2.0 +1.7.30 + ${project.groupId}.${project.artifactId} +0.10 +2.1.1 +3.3.6 +2.7.0 +3.1.5 +1.0 + v1-rev12-1.22.0 +1.0.0.Beta6 +1.3 +1.102.0 +1.6.3 +2.6.7 +1.0.1 +2.4.0 +2.4.5 +1.1.0.Final +1.6.0 +1.5.0 +4.0.1 +6.0.0 +2.5.3 +2.0.1.Final +2.1 +3.1.1 +17.0 +1.8 +4.0.4 +[3.3,4.0) +4.3.1 +2.2.6.RELEASE +4.4 +2.4.1 +26.0-jre + version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))" +0.6.4 +4.2.1 +2.2 +8.0.1 + 7.3.2 +3.0.0 +7.36.1.Final +5.10.4.Final +2.0 +1.0 +2.1 +3.6 +1.6.2 +1.5.0 +3.1.0 +1.2.1 +1.0.0-beta7 +8.26 +3.3.3 +5.1.6 +1.3 +1.3.04 +2.1.1 +10.14.2.0 +1.10.0 +2.8.5 +1.14.1 +1.3.2 +0.9.9 +1.9.4 +5.3.1.RELEASE +2.1.4 +2.5.13 +3.1.0 +2.5.0 + 7.3.2.0 +false + 1.1.1 +1.4.1 +3.15.0 +2.3.2 +2.10.0 + 1.0 +1.5.18 +6.1.3.Final +2.1.2 +1.5.3 +2.2.1 + 3.0.1-b04 +0.10.2 +3.6.1 +1.14 +19.0 +1.5 +3.1.1 +1.2.3 +2.12.3 +1.1.1 +2.6.3_1 +1.10 +0.11.2 +1.7.0.CR3 +0.9 +2.2.4.RELEASE +2.4.0 +1.4.6 +3.6.0 +1.0.47 +4.9.1 +2.3 +2.5.0 +3.1.3 +0.8.0 +2.47.0 +2.0 +7.9.1 +4.0.7 +3.10.6.Final +!* +0.10 +0.7 +1.11 +1.7.30 +2.3.9 +3.14.7 +1.11.3 +0.22 +2.4.4 +1.1.3 +2.3.2 +2.28 + version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))" +2.2.3 +org.eclipse.jetty +3.13.10 +3.1.0 +20090621 +2.2.1 +8.0.0 + 1.0 +1.0.7 +2.17 +2.3 + 2.1 +8.9 +0.6.4 +2.5.0 +1.19 +3.3.8.Final +1.1 +2.13.8 + 3.1.0 +3.9.0 +2.3.0 +2.1.1 + [$(version;==;$(@)),$(version;+;$(@))) +4.9.1 +4.1.4 +1.1.1 +1.7 +2.21.0 +4.0.56.Final +1.4.0 +0.33.4 +3.6.0 +1.2.6 +2.6 +0.1.55 +1.19 +[0,2) +4.1.1.4 +1.1 +10.1.6.Final + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF +2.6 + +version=${project.version} +2.11.0 +3.1.3 +14.0 +[8,9) +20.0 + +21.0 +1.24.1 +1.1.4c +1.9 +1.4.0 +2.6 +2.0.19 +5.4.13.Final +3.0.5.Final +
[camel-karaf] branch master updated: CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new b1cecd4 CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml b1cecd4 is described below commit b1cecd487c2665b730399dde9e093163d61a5ee1 Author: Andrea Cosentino AuthorDate: Mon May 4 20:28:14 2020 +0200 CAMEL-14812 - camel-karaf - We should not maintain versions in its root pom.xml --- docs/modules/ROOT/pages/components.adoc | 5 +- pom.xml | 536 +--- 2 files changed, 7 insertions(+), 534 deletions(-) diff --git a/docs/modules/ROOT/pages/components.adoc b/docs/modules/ROOT/pages/components.adoc index 9d8f0e9..c8fddd9 100644 --- a/docs/modules/ROOT/pages/components.adoc +++ b/docs/modules/ROOT/pages/components.adoc @@ -5,7 +5,7 @@ Apache Camel Karaf supports the following Camel artifacts as Karaf features == Camel Components // components: START -Number of Camel components: 208 in 208 JAR artifacts (1 deprecated) +Number of Camel components: 209 in 209 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -98,6 +98,9 @@ Number of Camel components: 208 in 208 JAR artifacts (1 deprecated) | xref:components::azure-storage-blob-component.adoc[Azure Storage Blob Service] (camel-azure-storage-blob) + `azure-storage-blob:containerName` | 3.3 | Store and retrieve blobs from Azure Storage Blob Service using SDK v12. +| xref:components::azure-storage-queue-component.adoc[Azure Storage Queue Service] (camel-azure-storage-queue) + +`azure-storage-queue:queueName` | 3.3 | The azure-storage-queue component is used for storing and retrieving the messages to/from Azure Storage Queue using Azure SDK v12. + | xref:components::bean-component.adoc[Bean] (camel-bean) + `bean:beanName` | 1.0 | Invoke methods of Java beans stored in Camel registry. diff --git a/pom.xml b/pom.xml index 913dfb2..7c776b1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ 4.0.0 -org.apache -apache -21 +org.apache.camel +camel-dependencies +3.3.0-SNAPSHOT org.apache.camel.karaf @@ -110,700 +110,170 @@ ${project.version} - - -1.1.3 - -5.15.12 -1.0.2.v20150114 -2.11.0 -4.1.1.4 1.7.0_6 3.5.2_1 3.5.2_1 -2.0.0.AM25 -2.3 2.3_1 -1.17.0 -0.9 0.8.3 -1.0.1 -1.3.0 -1.10.0 -1.1.1 -1.2.1 -1.1.3 - 1.0.2.Final -1.6.0.Final - 2.0.0.Final 2.1.0 5.0.4 -1.9.5 -3.15.0 -1.0.0-final 1.0.0-final_1 -3.0.0 -3.1.0 -2.5.13 -[2.5,3.0) -1.0.8 -1.2.1 1.11-8_1 4.3.1_1 -4.3.1 -1.9.1 -1.9.1 -1.9.1 1.9.1_1 -4.0.2 1.11.714_1 -1.11.714 -1.11.22 -2.4.0 -1.2.14 1.4.0_1 12.6.0_1 12.6.0_1 12.5.0_1 -8.6.0 8.6.0_1 20.0 3.1 5.2_4 -2.1.0 -1.4.6 2.4.0 -1.65 -2.47.0 -2.108.0 -5.11.2 1.12 -0.9.5.5 0.9.5.5_1 -2.8.2 -2.0.0 -3.7.2 3.2.6 -19.0 -3.7 -3.1.3.2 -2.0 -1.2 -3.2.12 -3.5.0 3.5.0_1 -2.8.0 -1.1.0 -4.0.4 2.3.1_2 -4.0.4 -1.9.4 -1.14 -3.2.2 -4.4 -1.19 -1.9 -2.7 -1.6 -1.4 -1.4 -2.7.0 -1.3 3.1_7 -2.6 -2.6 -3.10 -1.2 -3.6.1 -3.6 -1.6 -2.8.0 -1.8 -1.0.4 -2.2.1 -1.3.3 1.3.3_1 -2.7 -4.4 -1.4.13 1.4.13_1 -4.3.0 -3.3.6 -[3.3,4.0) -3.3.5 -3.3.1 -3.3.1 -1.9.0 -1.4.0 -10.14.2.0 -2.17 2.17_1 0.2 0.3 -0.9.9 -3.4.2 -3.0.1 3.0.1_1 -3.1.5 3.1.5_1 -6.5.0 -7.36.1.Final -3.1.3 1.0.0.Final - 8.0.16 -0.4.0 -1.6.0 -2.1.5 2.1.5_1 2.10.6 -3.8.1 - 7.3.2 - 7.3.2.0 -7.3.2 7.3.2_1 -1.3 -1.7.0.CR3 0.3.0 -2.1.1 -2.18.0 -1.6.0 -4.4.0 -2.4.13 2.4.13_1 -1.2.62 1.2.62_1 -1.8.8 -0.2.0 -
[camel-kafka-connector] branch master updated: Added test on different component properties formats fix #132
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 74cffea Added test on different component properties formats fix #132 new fa66cd3 Merge pull request #187 from valdar/pathOptionsFix 74cffea is described below commit 74cffea7b3f8810a16acd2980ba995cc6b4405f7 Author: Andrea Tarocchi AuthorDate: Mon May 4 19:21:50 2020 +0200 Added test on different component properties formats fix #132 --- ...derTest.java => PropertiesNameFormatsTest.java} | 23 +- .../camel/kafkaconnector/PropertiesOrderTest.java | 3 ++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesNameFormatsTest.java similarity index 55% copy from core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java copy to core/src/test/java/org/apache/camel/kafkaconnector/PropertiesNameFormatsTest.java index 5402589..9b39e18 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesNameFormatsTest.java @@ -19,12 +19,18 @@ package org.apache.camel.kafkaconnector; import java.util.HashMap; import java.util.Map; +import org.apache.camel.Exchange; +import org.apache.camel.component.seda.BlockingQueueFactory; +import org.apache.camel.component.seda.SedaComponent; +import org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory; import org.junit.jupiter.api.Test; -public class PropertiesOrderTest { +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class PropertiesNameFormatsTest { @Test -public void testOneOrder() { +public void testCamelCaseFormat() { Map props = new HashMap<>(); props.put("camel.source.url", "seda://test"); props.put("camel.source.kafka.topic", "mytopic"); @@ -33,19 +39,26 @@ public class PropertiesOrderTest { CamelSourceTask camelsourceTask = new CamelSourceTask(); camelsourceTask.start(props); +BlockingQueueFactory sedaTestQueue = ((SedaComponent) camelsourceTask.getCms().getEndpoint("seda://test").getCamelContext().getComponent("seda")).getDefaultQueueFactory(); + assertEquals("org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory", sedaTestQueue.getClass().getName()); +assertEquals(1, ((TestBlockingQueueFactory)sedaTestQueue).getCounter()); camelsourceTask.stop(); } @Test -public void testOppositOrder() { +public void testDashSeparatedFormat() { Map props = new HashMap<>(); props.put("camel.source.url", "seda://test"); props.put("camel.source.kafka.topic", "mytopic"); -props.put("camel.component.seda.defaultQueueFactory.counter", "1"); -props.put("camel.component.seda.defaultQueueFactory", "#class:org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory"); +props.put("camel.component.seda.default-queue-factory", "#class:org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory"); +props.put("camel.component.seda.default-queue-factory.counter", "1"); CamelSourceTask camelsourceTask = new CamelSourceTask(); camelsourceTask.start(props); +BlockingQueueFactory sedaTestQueue = ((SedaComponent) camelsourceTask.getCms().getEndpoint("seda://test").getCamelContext().getComponent("seda")).getDefaultQueueFactory(); + assertEquals("org.apache.camel.kafkaconnector.test.TestBlockingQueueFactory", sedaTestQueue.getClass().getName()); +assertEquals(1, ((TestBlockingQueueFactory)sedaTestQueue).getCounter()); camelsourceTask.stop(); } } + diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java index 5402589..4d58be8 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/PropertiesOrderTest.java @@ -37,7 +37,7 @@ public class PropertiesOrderTest { } @Test -public void testOppositOrder() { +public void testOppositeOrder() { Map props = new HashMap<>(); props.put("camel.source.url", "seda://test"); props.put("camel.source.kafka.topic", "mytopic"); @@ -49,3 +49,4 @@ public class PropertiesOrderTest { camelsourceTask.stop(); } } +
[GitHub] [camel-quarkus] jamesnetherton commented on a change in pull request #1169: Replace hard coded native test categories with dynamic lookup
jamesnetherton commented on a change in pull request #1169: URL: https://github.com/apache/camel-quarkus/pull/1169#discussion_r419603762 ## File path: .github/workflows/camel-master-cron.yaml ## @@ -74,6 +76,13 @@ jobs: with: name: maven-repo path: maven-repo.tgz + - name: Setup Native Test Matrix +id: set-native-matrix +run: | + sudo wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64; + sudo chmod +x /usr/local/bin/yq + CATEGORIES=$(cat .github/test-categories.yaml | yq r - --printMode p "categories.*" | sed -e 's/categories.//g' -e "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g') Review comment: Yes, good point. I think I only kept the `categories` parent in case we ever wanted to define other stuff in there. But that's probably an unlikely scenario, so I can look at flattening it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] valdar opened a new pull request #187: Added test on different component properties formats fix #132
valdar opened a new pull request #187: URL: https://github.com/apache/camel-kafka-connector/pull/187 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #1169: Replace hard coded native test categories with dynamic lookup
ppalaga commented on a change in pull request #1169: URL: https://github.com/apache/camel-quarkus/pull/1169#discussion_r419578824 ## File path: .github/workflows/camel-master-cron.yaml ## @@ -74,6 +76,13 @@ jobs: with: name: maven-repo path: maven-repo.tgz + - name: Setup Native Test Matrix +id: set-native-matrix +run: | + sudo wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64; + sudo chmod +x /usr/local/bin/yq + CATEGORIES=$(cat .github/test-categories.yaml | yq r - --printMode p "categories.*" | sed -e 's/categories.//g' -e "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g') Review comment: I wonder if we could eliminate the `sed -e 's/categories.//g'` step by flattening the `.github/test-categories.yaml` file? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on pull request #1178: Fix #1177 Add simple timer dev mode test
ppalaga commented on pull request #1178: URL: https://github.com/apache/camel-quarkus/pull/1178#issuecomment-623573528 370e875 added the missing license headers This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #837: Velocity Support
ppalaga commented on issue #837: URL: https://github.com/apache/camel-quarkus/issues/837#issuecomment-623571444 Sounds like your integration test module is missing the `camel-quarkus-direct` dependency. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] dc2tom commented on issue #837: Velocity Support
dc2tom commented on issue #837: URL: https://github.com/apache/camel-quarkus/issues/837#issuecomment-623564487 Hi, I've made a start with this following the Freemarker pull request as an example. I'm working on porting over the unit tests from camel-velocity but there is one thing I'm not getting. When trying to run my test, against the below resource definition ```java @Path("/velocity") @ApplicationScoped public class VelocityLetterResource { @Inject ProducerTemplate producerTemplate; @Path("/velocityLetter") @POST @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String post(String message) { Exchange exchange = producerTemplate.request("direct:a", new Processor() { @Override public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader("firstName", "Claus"); exchange.getIn().setHeader("lastName", "Ibsen"); exchange.getIn().setHeader("item", "Camel in Action"); exchange.getIn().setBody("PS: Next beer is on me, James"); } }); return (String) exchange.getOut().getBody(); } public static class VelocityRouteBuilder extends RouteBuilder { @Override public void configure() { from("direct:a") .to("velocity:org/apache/camel/quarkus/component/velocity/letter.vm"); } } ``` I see the following failure: ```code Caused by: org.apache.camel.NoSuchEndpointException: No endpoint could be found for: direct://a, please check your classpath contains the needed Camel component jar. ``` I can't work out how the RouteBuilder is invoked - my integration tests exist in the org.apache.camel.quarkus.component.velocity.it package.. I auto generated the velocity extension as per the contribution guide. I expected that perhaps my extension would not be able to load the .vm file as I have yet to implement the functionality, but instead it seems the RouteBuilder is not being executed. Any advice appreciated :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch master updated: Update index.md
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-website.git The following commit(s) were added to refs/heads/master by this push: new 75fe09d Update index.md new d9c6e58 Merge pull request #362 from ovcharenko-di/patch-1 75fe09d is described below commit 75fe09d8be63c82bb750ac5f1a5647b873e1611a Author: Dima Ovcharenko AuthorDate: Mon May 4 17:47:09 2020 +0300 Update index.md --- content/blog/Camel32-Whatsnew/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/blog/Camel32-Whatsnew/index.md b/content/blog/Camel32-Whatsnew/index.md index c6372ee..19e90ab 100644 --- a/content/blog/Camel32-Whatsnew/index.md +++ b/content/blog/Camel32-Whatsnew/index.md @@ -21,7 +21,7 @@ See this [external blog post](http://www.davsclaus.com/2020/03/apache-camel-31-f Another work is to make Camel reflection free (99%). We now source code generate configurer classes that is capable of configuring and setting properties on all components, data formats, and other areas in Camel. We missed some parts of Rest-DSL and Circuit Breakers which has been implemented for Camel 3.3. See this [external blog post](http://www.davsclaus.com/2020/03/apache-camel-32-reflection-free.html) for more details. -Camel core has also been further optimize to do more of its bootstrapping in an earlier phase where pssible. This makes Camel faster and ligther on Quarkus and GraalVM. This work will continue in the next release, as there are some Camel components that can be optimized more as well. +Camel core has also been further optimize to do more of its bootstrapping in an earlier phase where possible. This makes Camel faster and ligther on Quarkus and GraalVM. This work will continue in the next release, as there are some Camel components that can be optimized more as well. There is an ongoing experiment for a lightweight CamelContext that is locked-down and immutable which is an effort to make Camel even quicker and faster for Quarkus and GraalVM; where dynamism at runtime is not needed (for example adding new routes). @@ -71,4 +71,4 @@ And then all the usual stuff with 3rd party dependency upgrades, bug fixes, new But in this blog we wanted to spill out details about the heavy work that are ongoing to make Camel awesome for today and tomorrows modern Java workloads. -PS: And we have also worked on the website, which keep getting better and better. +PS: And we have also worked on the website, which keeps getting better and better.
[GitHub] [camel-k] nicolaferraro commented on issue #1297: Events are reported twice in dev mode
nicolaferraro commented on issue #1297: URL: https://github.com/apache/camel-k/issues/1297#issuecomment-623546386 This issue is no longer appearing This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly
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 008eaec CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly 008eaec is described below commit 008eaec2c7145d8f704080da115403be35e4696a Author: Claus Ibsen AuthorDate: Mon May 4 17:40:36 2020 +0200 CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly --- .../src/main/java/org/apache/camel/spi/ReactiveExecutor.java | 11 ++- .../org/apache/camel/impl/engine/DefaultReactiveExecutor.java | 5 - 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java b/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java index 3f30d59..23e6489 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java @@ -27,20 +27,13 @@ public interface ReactiveExecutor { String FACTORY = "reactive-executor"; /** - * Schedules the task to be run + * Schedules the task to be run (fairly) * * @param runnablethe task */ void schedule(Runnable runnable); /** - * Schedules the task to be run first - * - * @param runnablethe task - */ -void scheduleFirst(Runnable runnable); - -/** * Schedules the task to be prioritized and run asap * * @param runnablethe task @@ -48,7 +41,7 @@ public interface ReactiveExecutor { void scheduleMain(Runnable runnable); /** - * Schedules the task to run synchronously + * Schedules the task to run synchronously (current thread) * * @param runnablethe task */ diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java index ccf7094..3b6c1c7 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java @@ -56,11 +56,6 @@ public class DefaultReactiveExecutor extends ServiceSupport implements ReactiveE } @Override -public void scheduleFirst(Runnable runnable) { -workers.get().schedule(runnable, true, false, false); -} - -@Override public void scheduleMain(Runnable runnable) { workers.get().schedule(runnable, true, true, false); }
[camel] 01/07: CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task.
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 85c2f83ddade82d88d1c842f9747e77a8b8e2ade Author: Claus Ibsen AuthorDate: Mon May 4 10:05:06 2020 +0200 CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. --- .../apache/camel/processor/MulticastProcessor.java | 109 ++--- .../processor/SplitterStreamingUoWIssueTest.java | 11 ++- ...teParallelProcessingStackOverflowIssueTest.java | 50 ++ .../SplitAggregateStackOverflowIssueTest.java | 67 + ...itParallelProcessingStackOverflowIssueTest.java | 42 .../aggregator/SplitStackOverflowIssueTest.java| 41 6 files changed, 304 insertions(+), 16 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java index 1a3c9de..f32ffa8 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -64,7 +64,6 @@ import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.CastUtils; import org.apache.camel.util.IOHelper; import org.apache.camel.util.KeyValueHolder; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StopWatch; import org.apache.camel.util.concurrent.AsyncCompletionService; import org.slf4j.Logger; @@ -262,14 +261,15 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat return true; } -MulticastState state = new MulticastState(exchange, pairs, callback); if (isParallelProcessing()) { -executorService.submit(() -> reactiveExecutor.schedule(state)); +MulticastParallelTask task = new MulticastParallelTask(exchange, pairs, callback); +executorService.submit(() -> reactiveExecutor.schedule(task)); } else { +MulticastTask task = new MulticastTask(exchange, pairs, callback); if (exchange.isTransacted()) { -reactiveExecutor.scheduleSync(state); +reactiveExecutor.scheduleSync(task); } else { -reactiveExecutor.scheduleMain(state); +reactiveExecutor.scheduleMain(task); } } @@ -287,7 +287,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat } } -protected class MulticastState implements Runnable { +protected class MulticastTask implements Runnable { final Exchange original; final Iterable pairs; @@ -301,7 +301,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat final AtomicBoolean allSent = new AtomicBoolean(); final AtomicBoolean done = new AtomicBoolean(); -MulticastState(Exchange original, Iterable pairs, AsyncCallback callback) { +MulticastTask(Exchange original, Iterable pairs, AsyncCallback callback) { this.original = original; this.pairs = pairs; this.callback = callback; @@ -347,12 +347,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat int index = nbExchangeSent.getAndIncrement(); updateNewExchange(exchange, index, pairs, hasNext); -// Schedule the processing of the next pair -if (hasNext) { -if (isParallelProcessing()) { -schedule(this); -} -} else { +if (!hasNext) { allSent.set(true); } @@ -387,8 +382,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat // aggregate exchanges if any aggregate(); -// next step -if (hasNext && !isParallelProcessing()) { +if (hasNext) { schedule(this); } }); @@ -455,6 +449,91 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat } } +protected class MulticastParallelTask extends MulticastTask { + +MulticastParallelTask(Exchange original, Iterable pairs, AsyncCallback callback) { +super(original, pairs, callback); +} + +@Override +public String toString() { +return "MulticastParallelTask"; +} + +@Override +public void run() { +try { +if
[camel] branch master updated (3ce668c -> 4e95bad)
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 3ce668c [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method (#3796) new 85c2f83 CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. new f57e6e3 CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. new dcff7fe CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. new 875fb0e CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly new 6712e3d CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly new adb3c4b CAMEL-14996: Okay after diving more into this then CAMEL-15008 fixed the root problem so we dont need to separate multicast eip into parallel vs sequential task to fix the endless stack frame. So reverting this code back and a little polish. new 4e95bad CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/camel/spi/ReactiveExecutor.java | 7 +++ .../camel/impl/engine/DefaultReactiveExecutor.java | 5 ++ .../apache/camel/processor/MulticastProcessor.java | 19 +++--- .../processor/aggregate/AggregateProcessor.java| 4 +- .../processor/SplitterStreamingUoWIssueTest.java | 11 +++- ...teParallelProcessingStackOverflowIssueTest.java | 50 .../SplitAggregateStackOverflowIssueTest.java | 69 ++ ...itParallelProcessingStackOverflowIssueTest.java | 42 + .../aggregator/SplitStackOverflowIssueTest.java| 41 + 9 files changed, 234 insertions(+), 14 deletions(-) create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateParallelProcessingStackOverflowIssueTest.java create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitParallelProcessingStackOverflowIssueTest.java create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitStackOverflowIssueTest.java
[camel] 04/07: CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly
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 875fb0ec655f9d6cd83ec10e067a3bbb28eda649 Author: Claus Ibsen AuthorDate: Mon May 4 16:12:21 2020 +0200 CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly --- .../java/org/apache/camel/spi/ReactiveExecutor.java | 7 +++ .../camel/impl/engine/DefaultReactiveExecutor.java | 5 + .../processor/aggregate/AggregateProcessor.java | 20 +++- .../SplitAggregateStackOverflowIssueTest.java| 6 +++--- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java b/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java index 3de9d65..3f30d59 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java @@ -34,6 +34,13 @@ public interface ReactiveExecutor { void schedule(Runnable runnable); /** + * Schedules the task to be run first + * + * @param runnablethe task + */ +void scheduleFirst(Runnable runnable); + +/** * Schedules the task to be prioritized and run asap * * @param runnablethe task diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java index 406e21f..ccf7094 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java @@ -52,6 +52,11 @@ public class DefaultReactiveExecutor extends ServiceSupport implements ReactiveE @Override public void schedule(Runnable runnable) { +workers.get().schedule(runnable, false, false, false); +} + +@Override +public void scheduleFirst(Runnable runnable) { workers.get().schedule(runnable, true, false, false); } diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index 638b9f5..bdbff35 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -861,15 +861,17 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat // send this exchange // the call to schedule last if needed to ensure in-order processing of the aggregates -executorService.submit(() -> reactiveExecutor.scheduleSync(() -> processor.process(exchange, done -> { -// log exception if there was a problem -if (exchange.getException() != null) { -// if there was an exception then let the exception handler handle it -getExceptionHandler().handleException("Error processing aggregated exchange", exchange, exchange.getException()); -} else { -LOG.trace("Processing aggregated exchange: {} complete.", exchange); -} -}))); +executorService.execute(() -> { +processor.process(exchange, done -> { +// log exception if there was a problem +if (exchange.getException() != null) { +// if there was an exception then let the exception handler handle it +getExceptionHandler().handleException("Error processing aggregated exchange", exchange, exchange.getException()); +} else { +LOG.trace("Processing aggregated exchange: {} complete.", exchange); +} +}); +}); } /** diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java index ad8098e..d5fcaf7 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.camel.Exchange.SPLIT_COMPLETE; -@Ignore("TODO: Fix this bug") public class SplitAggregateStackOverflowIssueTest extends ContextTestSupport { private final AtomicInteger count = new AtomicInteger(); @@ -36,7 +35,7 @@ public class SplitAggregateStackOverflowIssueTest extends ContextTestSupport {
[camel] 06/07: CAMEL-14996: Okay after diving more into this then CAMEL-15008 fixed the root problem so we dont need to separate multicast eip into parallel vs sequential task to fix the endless stack
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 adb3c4b1496ddba907b095a41603858a3a7412af Author: Claus Ibsen AuthorDate: Mon May 4 17:24:39 2020 +0200 CAMEL-14996: Okay after diving more into this then CAMEL-15008 fixed the root problem so we dont need to separate multicast eip into parallel vs sequential task to fix the endless stack frame. So reverting this code back and a little polish. --- .../apache/camel/processor/MulticastProcessor.java | 207 +++-- 1 file changed, 29 insertions(+), 178 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java index d0b1e2c..7d542ae 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Consumer; import org.apache.camel.AggregationStrategy; import org.apache.camel.AsyncCallback; @@ -177,9 +176,9 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, boolean stopOnException, long timeout, Processor onPrepare, boolean shareUnitOfWork, boolean parallelAggregate) { this(camelContext, route, processors, aggregationStrategy, parallelProcessing, executorService, shutdownExecutorService, streaming, stopOnException, timeout, onPrepare, - shareUnitOfWork, parallelAggregate, false); +shareUnitOfWork, parallelAggregate, false); } - + public MulticastProcessor(CamelContext camelContext, Route route, Collection processors, AggregationStrategy aggregationStrategy, boolean parallelProcessing, ExecutorService executorService, boolean shutdownExecutorService, boolean streaming, boolean stopOnException, long timeout, Processor onPrepare, boolean shareUnitOfWork, @@ -260,15 +259,14 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat return true; } +MulticastTask state = new MulticastTask(exchange, pairs, callback); if (isParallelProcessing()) { -MulticastParallelTask task = new MulticastParallelTask(exchange, pairs, callback); -executorService.submit(() -> reactiveExecutor.schedule(task)); +executorService.submit(() -> reactiveExecutor.schedule(state)); } else { -MulticastTask task = new MulticastTask(exchange, pairs, callback); if (exchange.isTransacted()) { -reactiveExecutor.scheduleSync(task); +reactiveExecutor.scheduleSync(state); } else { -reactiveExecutor.scheduleMain(task); +reactiveExecutor.scheduleMain(state); } } @@ -286,66 +284,6 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat } } -private interface MulticastCompletionService { - -Exchange poll(); - -Exchange pollUnordered(); - -void submit(Consumer> runner); - -} - -private class MulticastCompletionServiceParallelTask implements MulticastCompletionService { -private final AsyncCompletionService completion; - -public MulticastCompletionServiceParallelTask(ReentrantLock lock) { -this.completion = new AsyncCompletionService<>(MulticastProcessor.this::schedule, !isStreaming(), lock);; -} - -@Override -public Exchange poll() { -return completion.poll(); -} - -@Override -public Exchange pollUnordered() { -return completion.pollUnordered(); -} - -@Override -public void submit(Consumer> runner) { -completion.submit(runner); -} -} - -private class MulticastCompletionServiceTask implements MulticastCompletionService { - -private final AtomicReference exchange = new AtomicReference<>(); - -public MulticastCompletionServiceTask() { -} - -@Override -public Exchange poll() { -return exchange.getAndSet(null); -} - -@Override -public Exchange pollUnordered() { -return exchange.getAndSet(null); -} - -@Override -public void submit(Consumer> runner) { -runner.accept(this::setResult); -
[camel] 02/07: CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task.
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 f57e6e384fccb0ac8b6836a9ad7df167aa3e0643 Author: Claus Ibsen AuthorDate: Mon May 4 11:25:16 2020 +0200 CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. --- .../apache/camel/processor/MulticastProcessor.java | 67 +++--- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java index f32ffa8..63106f2 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -74,8 +74,6 @@ import static org.apache.camel.util.ObjectHelper.notNull; /** * Implements the Multicast pattern to send a message exchange to a number of * endpoints, each endpoint receiving a copy of the message exchange. - * - * @see Pipeline */ public class MulticastProcessor extends AsyncProcessorSupport implements Navigate, Traceable, IdAware, RouteIdAware { @@ -309,9 +307,6 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat this.lock = new ReentrantLock(); this.completion = new AsyncCompletionService<>(MulticastProcessor.this::schedule, !isStreaming(), lock); this.result = new AtomicReference<>(); -if (timeout > 0) { -schedule(aggregateExecutorService, this::timeout, timeout, TimeUnit.MILLISECONDS); -} } @Override @@ -414,34 +409,6 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat } } -protected void timeout() { -Lock lock = this.lock; -if (lock.tryLock()) { -try { -while (nbAggregated.get() < nbExchangeSent.get()) { -Exchange exchange = completion.pollUnordered(); -int index = exchange != null ? getExchangeIndex(exchange) : nbExchangeSent.get(); -while (nbAggregated.get() < index) { -AggregationStrategy strategy = getAggregationStrategy(null); -strategy.timeout(result.get() != null ? result.get() : original, -nbAggregated.getAndIncrement(), nbExchangeSent.get(), timeout); -} -if (exchange != null) { -doAggregate(result, exchange, original); -nbAggregated.incrementAndGet(); -} -} -doDone(result.get(), true); -} catch (Throwable e) { -original.setException(e); -// and do the done work -doDone(null, false); -} finally { -lock.unlock(); -} -} -} - protected void doDone(Exchange exchange, boolean forceExhaust) { if (done.compareAndSet(false, true)) { MulticastProcessor.this.doDone(original, exchange, pairs, callback, false, forceExhaust); @@ -453,6 +420,9 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat MulticastParallelTask(Exchange original, Iterable pairs, AsyncCallback callback) { super(original, pairs, callback); +if (timeout > 0) { +schedule(aggregateExecutorService, this::timeout, timeout, TimeUnit.MILLISECONDS); +} } @Override @@ -532,6 +502,34 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat doDone(null, false); } } + +protected void timeout() { +Lock lock = this.lock; +if (lock.tryLock()) { +try { +while (nbAggregated.get() < nbExchangeSent.get()) { +Exchange exchange = completion.pollUnordered(); +int index = exchange != null ? getExchangeIndex(exchange) : nbExchangeSent.get(); +while (nbAggregated.get() < index) { +AggregationStrategy strategy = getAggregationStrategy(null); +strategy.timeout(result.get() != null ? result.get() : original, +nbAggregated.getAndIncrement(), nbExchangeSent.get(), timeout); +} +if (exchange != null) { +
[camel] 07/07: CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task.
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 4e95bad28364c53d340af5b1dc11f41856268d13 Author: Claus Ibsen AuthorDate: Mon May 4 17:26:00 2020 +0200 CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. --- .../processor/aggregator/SplitAggregateStackOverflowIssueTest.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java index d5fcaf7..7858177 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitAggregateStackOverflowIssueTest.java @@ -35,7 +35,9 @@ public class SplitAggregateStackOverflowIssueTest extends ContextTestSupport { MockEndpoint.assertIsSatisfied(60, SECONDS, result); -assertTrue("Stackframe must not be too high, was " + count.get(), count.get() < 100); +// the stackframe is 48 at this time of coding but can grow a little bit over time so lets just assume 70 +// is fine, as if we get the endless bug again then this test fails before and this counter goes to 1024 +assertTrue("Stackframe must not be too high, was " + count.get(), count.get() < 70); } @Override
[camel] 03/07: CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task.
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 dcff7fee1df493229d1ac114ca73a3957c7174b0 Author: Claus Ibsen AuthorDate: Mon May 4 12:38:10 2020 +0200 CAMEL-14996: Splitter/Multicast EIP can cause a thread to starve from endless stackframes when splitting as it does not collapse its stackframes but keep scheduling for next split/task. --- .../apache/camel/processor/MulticastProcessor.java | 72 +- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java index 63106f2..d0b1e2c 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Consumer; import org.apache.camel.AggregationStrategy; import org.apache.camel.AsyncCallback; @@ -285,6 +286,66 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat } } +private interface MulticastCompletionService { + +Exchange poll(); + +Exchange pollUnordered(); + +void submit(Consumer> runner); + +} + +private class MulticastCompletionServiceParallelTask implements MulticastCompletionService { +private final AsyncCompletionService completion; + +public MulticastCompletionServiceParallelTask(ReentrantLock lock) { +this.completion = new AsyncCompletionService<>(MulticastProcessor.this::schedule, !isStreaming(), lock);; +} + +@Override +public Exchange poll() { +return completion.poll(); +} + +@Override +public Exchange pollUnordered() { +return completion.pollUnordered(); +} + +@Override +public void submit(Consumer> runner) { +completion.submit(runner); +} +} + +private class MulticastCompletionServiceTask implements MulticastCompletionService { + +private final AtomicReference exchange = new AtomicReference<>(); + +public MulticastCompletionServiceTask() { +} + +@Override +public Exchange poll() { +return exchange.getAndSet(null); +} + +@Override +public Exchange pollUnordered() { +return exchange.getAndSet(null); +} + +@Override +public void submit(Consumer> runner) { +runner.accept(this::setResult); +} + +private void setResult(Exchange result) { +this.exchange.set(result); +} +} + protected class MulticastTask implements Runnable { final Exchange original; @@ -292,7 +353,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat final AsyncCallback callback; final Iterator iterator; final ReentrantLock lock; -final AsyncCompletionService completion; +MulticastCompletionService completion; final AtomicReference result; final AtomicInteger nbExchangeSent = new AtomicInteger(); final AtomicInteger nbAggregated = new AtomicInteger(); @@ -305,7 +366,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat this.callback = callback; this.iterator = pairs.iterator(); this.lock = new ReentrantLock(); -this.completion = new AsyncCompletionService<>(MulticastProcessor.this::schedule, !isStreaming(), lock); +this.completion = new MulticastCompletionServiceTask(); this.result = new AtomicReference<>(); } @@ -314,6 +375,10 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat return "MulticastTask"; } +private Exchange completionPoll() { +return completion.poll(); +} + @Override public void run() { try { @@ -393,7 +458,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat if (lock.tryLock()) { try { Exchange exchange; -while (!done.get() && (exchange = completion.poll()) != null) { +while (!done.get() && (exchange = completionPoll()) != null) { doAggregate(result, exchange, original); if (nbAggregated.incrementAndGet() >= nbExchangeSent.get() && allSent.get()) {
[camel] 05/07: CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly
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 6712e3d87e83a8a4c84c838bb611f519f8dea137 Author: Claus Ibsen AuthorDate: Mon May 4 16:48:53 2020 +0200 CAMEL-15008: ReactiveExecutor should run scheduled tasks more fairly --- .../processor/aggregate/AggregateProcessor.java| 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index bdbff35..aada58c 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -860,18 +860,16 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat exchange.adapt(ExtendedExchange.class).addOnCompletion(new AggregateOnCompletion(exchange.getExchangeId())); // send this exchange -// the call to schedule last if needed to ensure in-order processing of the aggregates -executorService.execute(() -> { -processor.process(exchange, done -> { -// log exception if there was a problem -if (exchange.getException() != null) { -// if there was an exception then let the exception handler handle it -getExceptionHandler().handleException("Error processing aggregated exchange", exchange, exchange.getException()); -} else { -LOG.trace("Processing aggregated exchange: {} complete.", exchange); -} -}); -}); +// the call to schedule is needed to ensure in-order processing of the aggregates +executorService.execute(() -> reactiveExecutor.schedule(() -> processor.process(exchange, done -> { +// log exception if there was a problem +if (exchange.getException() != null) { +// if there was an exception then let the exception handler handle it +getExceptionHandler().handleException("Error processing aggregated exchange", exchange, exchange.getException()); +} else { +LOG.trace("Processing aggregated exchange: {} complete.", exchange); +} +}))); } /**
[GitHub] [camel-quarkus] ppalaga opened a new pull request #1178: Fix #1177 Add simple timer dev mode test
ppalaga opened a new pull request #1178: URL: https://github.com/apache/camel-quarkus/pull/1178 Fix #1177 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga opened a new issue #1177: Add simple timer dev mode test
ppalaga opened a new issue #1177: URL: https://github.com/apache/camel-quarkus/issues/1177 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] ovcharenko-di opened a new pull request #362: typos in index.md
ovcharenko-di opened a new pull request #362: URL: https://github.com/apache/camel-website/pull/362 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch master updated: Fixed the jvm8 build #1157
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 7fd6ac4 Fixed the jvm8 build #1157 7fd6ac4 is described below commit 7fd6ac4957413ed5f77ee5ea355547cbea9dbc6e Author: aldettinger AuthorDate: Mon May 4 13:47:06 2020 +0200 Fixed the jvm8 build #1157 --- .../test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java | 3 +++ .../test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java index 66f71af..8bf9fad 100644 --- a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java +++ b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java @@ -17,10 +17,13 @@ package org.apache.camel.quarkus.component.kudu.it; import io.quarkus.test.junit.NativeImageTest; +import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.condition.JRE; @NativeImageTest @EnabledIfSystemProperty(named = "java.runtime.name", matches = ".*OpenJDK.*") +@DisabledOnJre(JRE.JAVA_8) class KuduIT extends KuduTest { } diff --git a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java index 46d858e..068d39a 100644 --- a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java +++ b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java @@ -32,7 +32,9 @@ import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; +import org.junit.jupiter.api.condition.JRE; import static org.apache.camel.quarkus.component.kudu.it.KuduInfrastructureTestHelper.KUDU_AUTHORITY_CONFIG_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,6 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @QuarkusTest @TestMethodOrder(OrderAnnotation.class) @EnabledIfSystemProperty(named = "java.runtime.name", matches = ".*OpenJDK.*") +@DisabledOnJre(JRE.JAVA_8) class KuduTest { private static final Logger LOG = Logger.getLogger(KuduTest.class);
[camel] branch master updated: [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method (#3796)
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 3ce668c [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method (#3796) 3ce668c is described below commit 3ce668ce3c897f9f0ebe78b412e9286aa28bad9d Author: Guillaume Nodet AuthorDate: Mon May 4 16:22:49 2020 +0200 [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method (#3796) --- .../org/apache/camel/main/MainListenerTest.java| 22 +++--- .../camel/tooling/util/CamelVersionHelper.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java index c2c8e8a..a0398a4 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java @@ -16,14 +16,14 @@ */ package org.apache.camel.main; -import org.junit.Assert; -import org.junit.Test; - import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.junit.Assert; +import org.junit.Test; + import static org.apache.camel.util.CollectionHelper.propertiesOf; public class MainListenerTest extends Assert { @@ -33,12 +33,12 @@ public class MainListenerTest extends Assert { List events = new ArrayList<>(); Main main = new Main(); main.addMainListener((MainListener) Proxy.newProxyInstance( -MainListener.class.getClassLoader(), -new Class[]{MainListener.class}, -(proxy, method, args) -> { -events.add(method.getName()); -return null; -})); +MainListener.class.getClassLoader(), +new Class[]{MainListener.class}, +(proxy, method, args) -> { +events.add(method.getName()); +return null; +})); Thread thread = new Thread(() -> { try { main.run(); @@ -50,8 +50,8 @@ public class MainListenerTest extends Assert { Thread.sleep(100); main.completed(); thread.join(); -assertEquals(Arrays.asList("beforeConfigure", "configure", "beforeStart", -"afterStart", "beforeStop", "afterStop"), events); +assertEquals(Arrays.asList("beforeInitialize", "beforeConfigure", "afterConfigure", +"configure", "beforeStart", "afterStart", "beforeStop", "afterStop"), events); } @Test diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/CamelVersionHelper.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/CamelVersionHelper.java index 08654d8..4a1cdf9 100644 --- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/CamelVersionHelper.java +++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/CamelVersionHelper.java @@ -58,7 +58,7 @@ public final class CamelVersionHelper { return ver2.compareTo(ver1) >= 0; } -private static class Version implements Comparable { +private static final class Version implements Comparable { private final String version;
[GitHub] [camel] lburgazzoli commented on pull request #3794: CAMEL-15003: PropertyBindingSupport fails for anonymous classes
lburgazzoli commented on pull request #3794: URL: https://github.com/apache/camel/pull/3794#issuecomment-623466629 There may be some alternatives like: - using an annotation - trying to check if the class is anonymous and try to see if the class it extends has a configurer, thus it may have some additional methods so don't know if it could work This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/02: [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method
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 d7faf7c3564383c62b2002352e8596ea4af373df Author: Guillaume Nodet AuthorDate: Mon May 4 09:47:09 2020 +0200 [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method --- ...tomixClientClusteredRoutePolicyFactoryMain.java | 5 ++-- .../ConsulClusteredRoutePolicyFactoryMain.java | 5 ++-- .../ZooKeeperClusteredRoutePolicyFactoryMain.java | 5 ++-- .../zookeeper/cluster/ZooKeeperMasterMain.java | 5 ++-- .../org/apache/camel/main/BaseMainSupport.java | 5 .../java/org/apache/camel/main/MainListener.java | 16 ++- .../org/apache/camel/main/MainListenerSupport.java | 11 .../java/org/apache/camel/main/MainSupport.java| 1 + .../org/apache/camel/main/MainListenerTest.java| 32 ++ .../java/org/apache/camel/main/MainVetoTest.java | 4 +-- .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 2 ++ 11 files changed, 80 insertions(+), 11 deletions(-) diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java index 416a529..1c84c10 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java @@ -24,6 +24,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory; import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy; +import org.apache.camel.main.BaseMainSupport; import org.apache.camel.main.Main; import org.apache.camel.main.MainListenerSupport; @@ -37,14 +38,14 @@ public final class AtomixClientClusteredRoutePolicyFactoryMain { Main main = new Main(); main.addMainListener(new MainListenerSupport() { @Override -public void configure(CamelContext context) { +public void afterConfigure(BaseMainSupport main) { try { AtomixClusterService service = new AtomixClusterService(); service.setId("node-" + id); service.setStorageLevel(StorageLevel.MEMORY); service.setAddress(new Address(args[0])); service.setNodes(args.length > 1 ? args[1] : args[0]); - +CamelContext context = main.getCamelContext(); context.setNameStrategy(new ExplicitCamelContextNameStrategy("camel-" + id)); context.addService(service); context.addRoutePolicyFactory(ClusteredRoutePolicyFactory.forNamespace("my-ns")); diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java index a2cf563..5b9f235 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory; import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy; +import org.apache.camel.main.BaseMainSupport; import org.apache.camel.main.Main; import org.apache.camel.main.MainListenerSupport; @@ -35,12 +36,12 @@ public final class ConsulClusteredRoutePolicyFactoryMain { Main main = new Main(); main.addMainListener(new MainListenerSupport() { @Override -public void configure(CamelContext context) { +public void afterConfigure(BaseMainSupport main) { try { ConsulClusterService service = new ConsulClusterService(); service.setId("node-" + id); service.setUrl(args[0]); - +CamelContext context = main.getCamelContext(); context.setNameStrategy(new ExplicitCamelContextNameStrategy("camel-" + id)); context.addService(service); context.addRoutePolicyFactory(ClusteredRoutePolicyFactory.forNamespace("my-ns")); diff --git
[camel] 02/02: Fix github actions
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 c5e0f68ce75e72e30ac0ef5524715f2db5356555 Author: Guillaume Nodet AuthorDate: Mon May 4 15:25:51 2020 +0200 Fix github actions --- .github/workflows/master-pr-build.yml | 2 +- .github/workflows/master-push-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml index 0548054..212e488 100644 --- a/.github/workflows/master-pr-build.yml +++ b/.github/workflows/master-pr-build.yml @@ -40,4 +40,4 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: mvn sourcecheck - run: ./mvnw -V --no-transfer-progress -Psourcecheck -Dcheckstyle.failOnViolation=true checkstyle:checkstyle + run: ./mvnw -V --no-transfer-progress -Psourcecheck -Dcheckstyle.failOnViolation=true -DskipTests checkstyle:checkstyle verify diff --git a/.github/workflows/master-push-build.yml b/.github/workflows/master-push-build.yml index d58568e..10eeba0 100644 --- a/.github/workflows/master-push-build.yml +++ b/.github/workflows/master-push-build.yml @@ -40,4 +40,4 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: mvn sourcecheck -run: ./mvnw -V --no-transfer-progress -Psourcecheck -Dcheckstyle.failOnViolation=true checkstyle:checkstyle +run: ./mvnw -V --no-transfer-progress -Psourcecheck -Dcheckstyle.failOnViolation=true -DskipTests checkstyle:checkstyle verify
[camel] branch master updated (9afc6ed -> c5e0f68)
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 9afc6ed Website: Camel3 migration guide: fixup JndiRegistry section new d7faf7c [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method new c5e0f68 Fix github actions 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: .github/workflows/master-pr-build.yml | 2 +- .github/workflows/master-push-build.yml| 2 +- ...tomixClientClusteredRoutePolicyFactoryMain.java | 5 ++-- .../ConsulClusteredRoutePolicyFactoryMain.java | 5 ++-- .../ZooKeeperClusteredRoutePolicyFactoryMain.java | 5 ++-- .../zookeeper/cluster/ZooKeeperMasterMain.java | 5 ++-- .../org/apache/camel/main/BaseMainSupport.java | 5 .../java/org/apache/camel/main/MainListener.java | 16 ++- .../org/apache/camel/main/MainListenerSupport.java | 11 .../java/org/apache/camel/main/MainSupport.java| 1 + .../org/apache/camel/main/MainListenerTest.java| 32 ++ .../java/org/apache/camel/main/MainVetoTest.java | 4 +-- .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 2 ++ 13 files changed, 82 insertions(+), 13 deletions(-)
[GitHub] [camel] lburgazzoli opened a new pull request #3799: CAMEL-15006: Allow to configure camel-main's properties locations using system properties and env vars
lburgazzoli opened a new pull request #3799: URL: https://github.com/apache/camel/pull/3799 [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] JiriOndrusek opened a new pull request #59: CAMEL-15007 camel-undertow-spring-security create example of usage
JiriOndrusek opened a new pull request #59: URL: https://github.com/apache/camel-spring-boot/pull/59 Issue: https://issues.apache.org/jira/browse/CAMEL-15007 Example of the usage of the camel-undertow-spring-security component with the Keycloak server. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch master updated: Fixed the promote JVM Only extension to native guide
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 7e78125 Fixed the promote JVM Only extension to native guide 7e78125 is described below commit 7e781256d71040ee5e8d3dfa89ac62213731ffcc Author: aldettinger AuthorDate: Mon May 4 14:01:47 2020 +0200 Fixed the promote JVM Only extension to native guide --- docs/modules/ROOT/pages/promote-jvm-to-native.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/promote-jvm-to-native.adoc b/docs/modules/ROOT/pages/promote-jvm-to-native.adoc index 8f99f4c..a85b0a7 100644 --- a/docs/modules/ROOT/pages/promote-jvm-to-native.adoc +++ b/docs/modules/ROOT/pages/promote-jvm-to-native.adoc @@ -32,7 +32,8 @@ $ { git mv "extensions-jvm/${EXT}" "extensions/${EXT}" sed -i -r "s/(.*)activemq(.*)/\1activemq\2\n\1${EXT}\2/g" extensions/pom.xml sed -i -r "s/(.*)activemq(.*)/\1activemq\2\n\1${EXT}\2/g" integration-tests/pom.xml - sed -i -r "s/camel-quarkus-${EXT}-parent/camel-quarkus-integration-tests/g" "integration-tests/${EXT}/pom.xml" + sed -i -r "s/camel-quarkus-build-parent-it/camel-quarkus-integration-tests/g" "integration-tests/${EXT}/pom.xml" + sed -i '/relativePath/d' "integration-tests/${EXT}/pom.xml" sed -i -r "s/camel-quarkus-${EXT}-integration-test/camel-quarkus-integration-test-${EXT}/g" "integration-tests/${EXT}/pom.xml" sed -i -r "s/Quarkus :: (.*) :: Integration Test/Quarkus :: Integration Test :: \1/g" "integration-tests/${EXT}/pom.xml" }
[GitHub] [camel-website] fvaleri commented on pull request #361: CDC blog post
fvaleri commented on pull request #361: URL: https://github.com/apache/camel-website/pull/361#issuecomment-623426222 Thanks! No, I'm not on Twitter. If you can post on the Official Account, that would be great :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] zregvart commented on pull request #361: CDC blog post
zregvart commented on pull request #361: URL: https://github.com/apache/camel-website/pull/361#issuecomment-623422139 @fvaleri website is built periodically (I see the blog post [is published](https://camel.apache.org/blog/CdcWithCamelAndDebezium/) now). We haven't tied this to Twitter I can post about this on https://twitter.com/ApacheCamel are you on Twitter, would you like to be tagged there? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger opened a new pull request #1176: Fixed the jvm8 CI build #1157
aldettinger opened a new pull request #1176: URL: https://github.com/apache/camel-quarkus/pull/1176 [ ] An issue should be filed for the change unless this is a trivial change (fixing a typo or similar). One issue should ideally be fixed by not more than one commit and the other way round, each commit should fix just one issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful and properly spelled subject line and body. Copying the title of the associated issue is typically enough. Please include the issue number in the commit message prefixed by #. [ ] The pull request description should explain what the pull request does, how, and why. If the info is available in the associated issue or some other external document, a link is enough. [ ] Phrases like Fix # or Fixes # will auto-close the named issue upon merging the pull request. Using them is typically a good idea. [ ] Please run mvn process-resources -Pformat (and amend the changes if necessary) before sending the pull request. [ ] Contributor guide is your good friend: https://camel.apache.org/camel-quarkus/latest/contributor-guide.html This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger commented on pull request #1176: Fixed the jvm8 CI build #1157
aldettinger commented on pull request #1176: URL: https://github.com/apache/camel-quarkus/pull/1176#issuecomment-623417089 Let's ensure that pr builds are fine with that. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: Website: Camel3 migration guide: fixup JndiRegistry section
This is an automated email from the ASF dual-hosted git repository. jpoth 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 9afc6ed Website: Camel3 migration guide: fixup JndiRegistry section 9afc6ed is described below commit 9afc6ed3297c707d7e3b2b4c56a0a2fdf0634dfd Author: John Poth AuthorDate: Mon May 4 13:38:57 2020 +0200 Website: Camel3 migration guide: fixup JndiRegistry section --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc index 5bc878e..7d764e0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc @@ -564,9 +564,9 @@ should be rewritten as: == Upgrading Camel 3.1 to 3.2 -```=== JndiRegistry +=== JndiRegistry -The deprecated class `org.apache.camel.impl.JndiRegistry` was removed. `org.apache.camel.support.jndi.JndiBeanRepository` should be used instead. +The deprecated class `org.apache.camel.impl.JndiRegistry` has been removed. The class `org.apache.camel.support.jndi.JndiBeanRepository` located in `org.apache.camel:camel-support` should be used instead. === Rest Configuration
[GitHub] [camel-website] fvaleri commented on pull request #361: CDC blog post
fvaleri commented on pull request #361: URL: https://github.com/apache/camel-website/pull/361#issuecomment-623411801 Hi @zregvart , thanks for merging this. How does it work for publication? Does it also publish on the official Twitter account? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch master updated: Upgrade Influxdb bundle to version 2.18
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new ae72198 Upgrade Influxdb bundle to version 2.18 ae72198 is described below commit ae721989e7cf5bb571b6b387dedc10e8d4539cea Author: Andrea Cosentino AuthorDate: Mon May 4 12:50:03 2020 +0200 Upgrade Influxdb bundle to version 2.18 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f3446dc..913dfb2 100644 --- a/pom.xml +++ b/pom.xml @@ -374,8 +374,8 @@ 65.1 2.7.6 1.3.2 -2.17 - 2.17_1 +2.18 + 2.18_1 20.0 1.10_5 1.10
[camel-website] branch master updated: CDC blog post
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new c0f933e CDC blog post c0f933e is described below commit c0f933eb1cac65c49b22dc2f83afd47d96b6300b Author: Federico Valeri AuthorDate: Sun May 3 19:24:08 2020 +0200 CDC blog post --- .../CdcWithCamelAndDebezium/camel-featured.jpg | Bin 0 -> 122153 bytes content/blog/CdcWithCamelAndDebezium/index.md | 190 + 2 files changed, 190 insertions(+) diff --git a/content/blog/CdcWithCamelAndDebezium/camel-featured.jpg b/content/blog/CdcWithCamelAndDebezium/camel-featured.jpg new file mode 100644 index 000..89bdcff Binary files /dev/null and b/content/blog/CdcWithCamelAndDebezium/camel-featured.jpg differ diff --git a/content/blog/CdcWithCamelAndDebezium/index.md b/content/blog/CdcWithCamelAndDebezium/index.md new file mode 100644 index 000..9914bbc --- /dev/null +++ b/content/blog/CdcWithCamelAndDebezium/index.md @@ -0,0 +1,190 @@ +--- +title: "CDC with Camel and Debezium" +date: 2020-05-04 +draft: false +authors: [fvaleri] +categories: ["Usecases"] +preview: "CDC approaches based on Camel and Debezium." +--- + +Change Data Capture (CDC) is a well-established software design pattern for a system that monitors and captures +the changes in data, so that other software can respond to those changes. + +Using a CDC engine like [Debezium](https://debezium.io) along with [Camel](https://camel.apache.org) integration +framework, we can easily build data pipelines to bridge traditional data stores and new cloud-native event-driven +architectures. + +The advantages of CDC comparing to a simple poll-based or query-based process are: + +- *All changes captured*: intermediary changes (updates, deletes) between two runs of the poll loop may be missed. +- *Low overhead*: near real-time reaction to data changes avoids increased CPU load due to frequent polling. +- *No data model impact*: timestamp columns to determine the last update of data are not needed. + +There are two main aproaches for building a CDC pipeline: + +The first approach is *configuration-driven* and runs on top of [KafkaConnect](https://kafka.apache.org/documentation/#connect), +the streaming integration platform based on Kafka. The second approach is *code-driven* and it is purely implemented with Camel +(no Kafka dependency). + +While KafkaConnect provides some *Connectors* for zero or low coding integrations, Camel's extensive collection of *Components* +(300+) enables you to connect to all kinds of external systems. The great news is that these Components can now be used as +Connectors thanks to a new sub-project called *CamelKafkaConnect* (will use the SJMS2 as an example). + +## Use case + +We want to focus on the technology, so the use case is relatively simple, but includes both routing and transformation +logic. The requirement is to stream all new customers from a source table to XML and JSON sink queues. +``` + |---> (xml-sink-queue) +(source-table) ---> [cdc-process] ---| + |---> (json-sink-queue) +``` + +## Implementations + +No matter what technology you use, the CDC process must run as a single thread to maintain ordering. +Since Debezium records the log offset asyncronously, any final consumer of these changes must be idempotent. + +Important change event properties: `lsn` (offset) is the log sequence number that tracks the position in the database +WAL (write ahead log), `txId` represents the identifier of the server transaction which caused the event, `ts_ms` +represents the number of microseconds since Unix Epoch as the server time at which the transaction was committed. + +Prerequisites: Postgres 11, OpenJDK 1.8 and Maven 3.5+. + +[GET CODE HERE](https://github.com/fvaleri/cdc) + +### External systems setup + +First of all, you need to start Postgres (the procedure depends on your specific OS). + +Then, there is a simple script to create and initialize the database. +This script can also be used to query the table and produce a stream of changes. +```sh +./run.sh --database +./run.sh --query +./run.sh --stream +``` + +Enable Postgres internal transaction log access (required by Debezium). +```sh +# postgresql.conf: configure replication slot +wal_level = logical +max_wal_senders = 1 +max_replication_slots = 1 +# pg_hba.conf: allow localhost replication to debezium user +local replication cdcadmintrust +hostreplication cdcadmin127.0.0.1/32trust +hostreplication cdcadmin::1/128 trust +# add replication permission to user and enable previous values +psql cdcdb +ALTER ROLE cdcadmin WITH REPLICATION; +ALTER TABLE cdc.customers REPLICA IDENTITY FULL; +# restart
[camel] branch master updated: Upgrade Influxdb to version 2.18
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 4d0eaac Upgrade Influxdb to version 2.18 4d0eaac is described below commit 4d0eaac2fa5f19b612ae1148a3717fb437747767 Author: Andrea Cosentino AuthorDate: Mon May 4 12:44:00 2020 +0200 Upgrade Influxdb to version 2.18 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 30963db..265d0e7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -256,7 +256,7 @@ 2.7.6 1.3.2 10.1.6.Final -2.17 +2.18 20.0 1.10 3.0.5
[GitHub] [camel] lburgazzoli opened a new pull request #3798: CAMEL-15005: Move configurationClasses and routeBuilderClasses to MainConfigurationProperties
lburgazzoli opened a new pull request #3798: URL: https://github.com/apache/camel/pull/3798 [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] oscerd opened a new issue #186: Avoid Thread.sleep in test, use Awaitility FTW
oscerd opened a new issue #186: URL: https://github.com/apache/camel-kafka-connector/issues/186 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch master updated: Code cleanup
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new dc5b5fd Code cleanup new 2095b4b Merge pull request #184 from fvaleri/cleanup dc5b5fd is described below commit dc5b5fdb189c8402535d41695320b508f870e9f6 Author: Federico Valeri AuthorDate: Sun May 3 17:59:51 2020 +0200 Code cleanup --- .../camel/kafkaconnector/CamelSinkConnector.java | 6 +- .../kafkaconnector/CamelSinkConnectorConfig.java | 13 +++-- .../apache/camel/kafkaconnector/CamelSinkTask.java | 18 +++--- .../kafkaconnector/CamelSourceConnectorConfig.java | 26 + .../camel/kafkaconnector/CamelSourceTask.java | 5 +- .../kafkaconnector/utils/CamelMainSupport.java | 26 - .../camel/kafkaconnector/CamelSourceTaskTest.java | 65 +++--- .../maven/AbstractCamelKafkaConnectorMojo.java | 2 +- 8 files changed, 80 insertions(+), 81 deletions(-) diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnector.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnector.java index 7cc47f0..092e513 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnector.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnector.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class CamelSinkConnector extends SinkConnector { -private static Logger log = LoggerFactory.getLogger(CamelSinkConnector.class); +private static final Logger LOG = LoggerFactory.getLogger(CamelSinkConnector.class); private Map configProps; @@ -38,7 +38,7 @@ public class CamelSinkConnector extends SinkConnector { @Override public void start(Map configProps) { -log.info("Connector config keys: {}", String.join(", ", configProps.keySet())); +LOG.info("Connector config keys: {}", String.join(", ", configProps.keySet())); this.configProps = configProps; } @@ -49,7 +49,7 @@ public class CamelSinkConnector extends SinkConnector { @Override public List> taskConfigs(int maxTasks) { -log.info("Setting task configurations for {} workers.", maxTasks); +LOG.info("Setting task configurations for {} workers.", maxTasks); final List> configs = new ArrayList<>(maxTasks); for (int i = 0; i < maxTasks; ++i) { configs.add(configProps); diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java index d59d342..e11e84d 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java @@ -38,18 +38,21 @@ public class CamelSinkConnectorConfig extends AbstractConfig { public static final String CAMEL_SINK_URL_DOC = "The camel url to configure the destination. If this is set " + CAMEL_SINK_COMPONENT_CONF + " and all the properties starting with " + CamelSinkTask.getCamelSinkEndpointConfigPrefix() + ".<" + CAMEL_SINK_COMPONENT_CONF + " value> are ignored."; +private static final ConfigDef CONFIG_DEF = new ConfigDef() +.define(CAMEL_SINK_URL_CONF, Type.STRING, CAMEL_SINK_URL_DEFAULT, Importance.HIGH, CAMEL_SINK_URL_DOC) +.define(CAMEL_SINK_MARSHAL_CONF, Type.STRING, CAMEL_SINK_MARSHAL_DEFAULT, Importance.HIGH, CAMEL_SINK_MARSHAL_DOC) +.define(CAMEL_SINK_COMPONENT_CONF, Type.STRING, CAMEL_SINK_COMPONENT_DEFAULT, Importance.HIGH, CAMEL_SINK_COMPONENT_DOC); + public CamelSinkConnectorConfig(ConfigDef config, Map parsedConfig) { super(config, parsedConfig); } public CamelSinkConnectorConfig(Map parsedConfig) { -this(conf(), parsedConfig); +this(CONFIG_DEF, parsedConfig); } public static ConfigDef conf() { -return new ConfigDef() -.define(CAMEL_SINK_URL_CONF, Type.STRING, CAMEL_SINK_URL_DEFAULT, Importance.HIGH, CAMEL_SINK_URL_DOC) -.define(CAMEL_SINK_MARSHAL_CONF, Type.STRING, CAMEL_SINK_MARSHAL_DEFAULT, Importance.HIGH, CAMEL_SINK_MARSHAL_DOC) -.define(CAMEL_SINK_COMPONENT_CONF, Type.STRING, CAMEL_SINK_COMPONENT_DEFAULT, Importance.HIGH, CAMEL_SINK_COMPONENT_DOC); +return CONFIG_DEF; } + } diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java index 9785215..baa6665 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java @@ -19,11 +19,9 @@ package org.apache.camel.kafkaconnector; import
[GitHub] [camel-website] zregvart commented on a change in pull request #360: Add logos on the projects page
zregvart commented on a change in pull request #360: URL: https://github.com/apache/camel-website/pull/360#discussion_r419329206 ## File path: antora-ui-camel/src/css/doc.css ## @@ -328,6 +328,11 @@ max-width: 100%; } +.title-image { + height: 2rem; + float: left; +} + Review comment: I'd put this in `projects.css` (new file and import it from `site.css`) and prefix it with `.projects`, I'd also probably call this class `logo` rather than `title-image`. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated: CAMEL-15001: Support Metadata#excludeProperties for component properties (#3797)
This is an automated email from the ASF dual-hosted git repository. janbednar 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 92c0295 CAMEL-15001: Support Metadata#excludeProperties for component properties (#3797) 92c0295 is described below commit 92c029529ebd8dfcbcc09c4809eb2d2d7325527b Author: Jan Bednar AuthorDate: Mon May 4 11:36:21 2020 +0200 CAMEL-15001: Support Metadata#excludeProperties for component properties (#3797) --- .../apache/camel/component/activemq/activemq.json | 1 - .../src/main/docs/activemq-component.adoc | 3 +-- .../org/apache/camel/component/amqp/amqp.json | 1 - .../camel-amqp/src/main/docs/amqp-component.adoc | 3 +-- .../component/jms/JmsComponentConfigurer.java | 5 .../org/apache/camel/component/jms/jms.json| 1 - .../camel-jms/src/main/docs/jms-component.adoc | 3 +-- .../apache/camel/component/jms/JmsComponent.java | 1 + .../dsl/ActivemqComponentBuilderFactory.java | 20 -- .../component/dsl/AmqpComponentBuilderFactory.java | 20 -- .../component/dsl/JmsComponentBuilderFactory.java | 20 -- .../modules/ROOT/pages/activemq-component.adoc | 3 +-- .../modules/ROOT/pages/amqp-component.adoc | 3 +-- .../modules/ROOT/pages/jms-component.adoc | 3 +-- .../packaging/EndpointSchemaGeneratorMojo.java | 31 +++--- 15 files changed, 28 insertions(+), 90 deletions(-) diff --git a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json index d50ab33..1b4bbf6 100644 --- a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json +++ b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json @@ -35,7 +35,6 @@ "acknowledgementModeName": { "kind": "property", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", [...] "asyncConsumer": { "kind": "property", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message f [...] "autoStartup": { "kind": "property", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether the consumer container should auto-startup." }, -"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 [...] "cacheLevel": { "kind": "property", "displayName": "Cache Level", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details." }, "cacheLevelName": { "kind": "property", "displayName": "Cache Level Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION", "CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false, "secret": false, "defaultValue": "CACHE_AUTO", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the ca [...]
[camel] branch CAMEL-15001 updated (8d46c60 -> 342528f)
This is an automated email from the ASF dual-hosted git repository. janbednar pushed a change to branch CAMEL-15001 in repository https://gitbox.apache.org/repos/asf/camel.git. discard 8d46c60 CAMEL-15001: checkstyle add 342528f CAMEL-15001: checkstyle This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8d46c60) \ N -- N -- N refs/heads/CAMEL-15001 (342528f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/component/activemq/ActiveMQComponent.java | 1 - 1 file changed, 1 deletion(-)
[camel] branch CAMEL-15001 updated (4c86c6c -> 8d46c60)
This is an automated email from the ASF dual-hosted git repository. janbednar pushed a change to branch CAMEL-15001 in repository https://gitbox.apache.org/repos/asf/camel.git. from 4c86c6c CAMEL-15001: Exclude bridgeErrorHandler for JMS and child components. add 8d46c60 CAMEL-15001: checkstyle No new revisions were added by this update. Summary of changes: .../org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-karaf] branch master updated: [CAMEL-14978] Create features for camel-azure-storage-blob and camel-azure-storage-queue components (#6)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new 88340e3 [CAMEL-14978] Create features for camel-azure-storage-blob and camel-azure-storage-queue components (#6) 88340e3 is described below commit 88340e32fcd8c34844225b76f15ed3002077 Author: Jean-Baptiste Onofré AuthorDate: Mon May 4 10:44:11 2020 +0200 [CAMEL-14978] Create features for camel-azure-storage-blob and camel-azure-storage-queue components (#6) --- docs/modules/ROOT/pages/components.adoc| 5 +++- .../karaf/features/src/main/resources/features.xml | 34 ++ pom.xml| 4 +++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/components.adoc b/docs/modules/ROOT/pages/components.adoc index 5899948..9d8f0e9 100644 --- a/docs/modules/ROOT/pages/components.adoc +++ b/docs/modules/ROOT/pages/components.adoc @@ -5,7 +5,7 @@ Apache Camel Karaf supports the following Camel artifacts as Karaf features == Camel Components // components: START -Number of Camel components: 207 in 207 JAR artifacts (1 deprecated) +Number of Camel components: 208 in 208 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -95,6 +95,9 @@ Number of Camel components: 207 in 207 JAR artifacts (1 deprecated) | xref:components::aws-translate-component.adoc[AWS Translate] (camel-aws-translate) + `aws-translate:label` | 3.0 | Translate texts using AWS Translate. +| xref:components::azure-storage-blob-component.adoc[Azure Storage Blob Service] (camel-azure-storage-blob) + +`azure-storage-blob:containerName` | 3.3 | Store and retrieve blobs from Azure Storage Blob Service using SDK v12. + | xref:components::bean-component.adoc[Bean] (camel-bean) + `bean:beanName` | 1.0 | Invoke methods of Java beans stored in Camel registry. diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 5d4aead..02f83cd 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -560,6 +560,40 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage/${azure-storage-java-sdk-bundle-version} mvn:org.apache.camel/camel-azure/${project.version} + +camel-core +mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version} +mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version} +mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version} +mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version} +mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version} +mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version} +mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version} +mvn:org.reactivestreams/reactive-streams/${reactive-streams-version} +mvn:io.projectreactor/reactor-core/${reactor-version} +mvn:commons-io/commons-io/${commons-io-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core/${azure-core-bundle-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-common/${azure-storage-common-bundle-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-blob/${azure-storage-blob-bundle-version} + mvn:org.apache.camel/camel-azure-storage-blob/${project.version} + + +camel-core +mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version} +mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version} +mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version} +mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version} +mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version} +mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version} +mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version} +mvn:org.reactivestreams/reactive-streams/${reactive-streams-version} +mvn:io.projectreactor/reactor-core/${reactor-version} +mvn:commons-io/commons-io/${commons-io-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-core/${azure-core-bundle-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-common/${azure-storage-common-bundle-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.azure-storage-queue/${azure-storage-queue-bundle-version} + mvn:org.apache.camel/camel-azure-storage-queue/${project.version} + camel-core
[camel-quarkus] branch master updated: Dropped JDK 8 itests infrastructure for Kudu extension #1157
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 83e269d Dropped JDK 8 itests infrastructure for Kudu extension #1157 83e269d is described below commit 83e269d731d3403d5c2cf479adf7efbcd1e21f1e Author: aldettinger AuthorDate: Mon May 4 10:33:52 2020 +0200 Dropped JDK 8 itests infrastructure for Kudu extension #1157 --- .../kudu/it/KuduInfrastructureTestHelper.java | 39 +++--- .../camel/quarkus/component/kudu/it/KuduIT.java| 4 +-- .../camel/quarkus/component/kudu/it/KuduTest.java | 4 +-- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java b/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java index 9e9625d..7ebaef0 100644 --- a/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java +++ b/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java @@ -37,23 +37,22 @@ import org.jboss.logging.Logger; * {@code KuduTestResource}. * * A) How to run integration tests against a custom setup: - * Comment @Disabled and @DisabledOnNativeImage annotations from {@code KuduTest} and {@code KuduIT}. + * Comment @EnabledIfSystemProperty annotations from {@code KuduTest} and {@code KuduIT}. * Install Kudu master and tablet servers on the same network than integration tests. * Configure "camel.kudu.test.master.rpc-authority" in "application.properties", for instance: * camel.kudu.test.master.rpc-authority=kudu-master-hostname:7051 * Run integration tests with mvn clean integration-test -P native * * B) How to run integration tests against the container based setup when NOT running on top of OpenJDK: - * Comment @Disabled and @DisabledOnNativeImage annotations from {@code KuduTest} and {@code KuduIT}. + * Comment @EnabledIfSystemProperty annotations from {@code KuduTest} and {@code KuduIT}. * Override the ip resolution of the host "kudu-tserver" to 127.0.0.1, e.g. by adding an entry in /etc/hosts file as * below: * 127.0.0.1 kudu-tserver * Run integration tests with mvn clean integration-test -P native * - * C) How to run integration tests against the container based setup when running on top of OpenJDK: - * Comment @Disabled and @DisabledOnNativeImage annotations from {@code KuduTest} and {@code KuduIT}. - * No extra setup is needed as {@code overrideKuduTabletServerResolutionInInetAddressCache} takes care of redirecting - * the Kudu tablet server traffic toward localhost + * C) How to run integration tests against the container based setup when running on top of OpenJDK 9 onward: + * No extra setup is needed as {@code overrideTabletServerHostnameResolution} takes care of redirecting + * the Kudu tablet server traffic toward localhost. * Run integration tests with mvn clean integration-test -P native */ @ApplicationScoped @@ -69,19 +68,6 @@ public class KuduInfrastructureTestHelper { } public static void overrideTabletServerHostnameResolution() { -int javaMajorVersion = Integer.parseInt(System.getProperty("java.version").replaceFirst("([0-9]+)[.].*", "$1")); - -if (javaMajorVersion == 1) { -attemptOverideTabletServerHostnameResolutionOpenJdk8(); -} else if (javaMajorVersion >= 9) { -attemptOverideTabletServerHostnameResolutionOpenJdk9Onward(); -} else { -attemptOverideTabletServerHostnameResolutionOpenJdk8(); -attemptOverideTabletServerHostnameResolutionOpenJdk9Onward(); -} -} - -public static void attemptOverideTabletServerHostnameResolutionOpenJdk9Onward() { try { // Warm up the InetAddress cache InetAddress.getByName("localhost"); @@ -99,19 +85,4 @@ public class KuduInfrastructureTestHelper { LOG.warn(msg, ex); } } - -public static void attemptOverideTabletServerHostnameResolutionOpenJdk8() { -try { -Field addressCacheField = InetAddress.class.getDeclaredField("addressCache"); -addressCacheField.setAccessible(true); -Object addressCache = addressCacheField.get(null); - -Method put = addressCache.getClass().getMethod("put", String.class, InetAddress[].class); -put.setAccessible(true); -put.invoke(addressCache, KUDU_TABLET_SERVER_HOSTNAME, (Object[]) InetAddress.getAllByName("localhost")); -} catch (Exception ex) { -final String msg = "An issue occurred while attempting the Open JDK8 override of the kudu tablet server hostname resolution"; -
[GitHub] [camel] davsclaus commented on a change in pull request #3797: CAMEL-15001: Support Metadata#excludeProperties for component properties
davsclaus commented on a change in pull request #3797: URL: https://github.com/apache/camel/pull/3797#discussion_r419289450 ## File path: tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java ## @@ -528,10 +535,14 @@ protected ComponentModel findComponentProperties(UriEndpoint uriEndpoint, Class< protected void findComponentClassProperties(ComponentModel componentModel, Class classElement, String prefix, String nestedTypeName, String nestedFieldName) { final Class orgClassElement = classElement; +Set excludes = new HashSet<>(); while (true) { Metadata componentAnnotation = classElement.getAnnotation(Metadata.class); -if (componentAnnotation != null && Objects.equals("verifiers", componentAnnotation.label())) { -componentModel.setVerifiers(componentAnnotation.enums()); +if (componentAnnotation != null) { +if(Objects.equals("verifiers", componentAnnotation.label())) { Review comment: Checkstyle issue This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] bedlaj opened a new pull request #3797: CAMEL-15001: Support Metadata#excludeProperties for component properties
bedlaj opened a new pull request #3797: URL: https://github.com/apache/camel/pull/3797 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: CAMEL-15001: Exclude bridgeErrorHandler for JMS and child components.
This is an automated email from the ASF dual-hosted git repository. janbednar pushed a commit to branch CAMEL-15001 in repository https://gitbox.apache.org/repos/asf/camel.git commit 4c86c6c59b1bfb3356986b7fa3a80d92055a2576 Author: Jan Bednář AuthorDate: Mon May 4 01:41:31 2020 +0200 CAMEL-15001: Exclude bridgeErrorHandler for JMS and child components. --- .../apache/camel/component/activemq/activemq.json| 1 - .../src/main/docs/activemq-component.adoc| 3 +-- .../camel/component/activemq/ActiveMQComponent.java | 1 + .../org/apache/camel/component/amqp/amqp.json| 1 - .../camel-amqp/src/main/docs/amqp-component.adoc | 3 +-- .../camel/component/jms/JmsComponentConfigurer.java | 5 - .../org/apache/camel/component/jms/jms.json | 1 - .../camel-jms/src/main/docs/jms-component.adoc | 3 +-- .../org/apache/camel/component/jms/JmsComponent.java | 1 + .../dsl/ActivemqComponentBuilderFactory.java | 20 .../component/dsl/AmqpComponentBuilderFactory.java | 20 .../component/dsl/JmsComponentBuilderFactory.java| 20 .../modules/ROOT/pages/activemq-component.adoc | 3 +-- .../modules/ROOT/pages/amqp-component.adoc | 3 +-- .../components/modules/ROOT/pages/jms-component.adoc | 3 +-- 15 files changed, 8 insertions(+), 80 deletions(-) diff --git a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json index d50ab33..1b4bbf6 100644 --- a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json +++ b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json @@ -35,7 +35,6 @@ "acknowledgementModeName": { "kind": "property", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", [...] "asyncConsumer": { "kind": "property", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message f [...] "autoStartup": { "kind": "property", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether the consumer container should auto-startup." }, -"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 [...] "cacheLevel": { "kind": "property", "displayName": "Cache Level", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details." }, "cacheLevelName": { "kind": "property", "displayName": "Cache Level Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION", "CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false, "secret": false, "defaultValue": "CACHE_AUTO", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the ca [...] "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int",
[camel] 01/02: CAMEL-15001: introduce excludeProperties for component
This is an automated email from the ASF dual-hosted git repository. janbednar pushed a commit to branch CAMEL-15001 in repository https://gitbox.apache.org/repos/asf/camel.git commit 41a4618ddb0a1eb04a6b532780075cebdc5ee0fa Author: Jan Bednář AuthorDate: Mon May 4 01:40:46 2020 +0200 CAMEL-15001: introduce excludeProperties for component --- .../packaging/EndpointSchemaGeneratorMojo.java | 31 +++--- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java index 1fcbf2f..abe8116 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java @@ -213,20 +213,26 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { // component options Class componentClassElement = loadClass(componentModel.getJavaType()); +String excludedComponentProperties = ""; if (componentClassElement != null) { findComponentClassProperties(componentModel, componentClassElement, "", null, null); +Metadata componentMetadata = componentClassElement.getAnnotation(Metadata.class); +if (componentMetadata != null) { +excludedComponentProperties = componentMetadata.excludeProperties(); +} } // endpoint options findClassProperties(componentModel, classElement, new HashSet<>(), "", null, null, false); -String excludedProperties = ""; -Metadata metadata = classElement.getAnnotation(Metadata.class); -if (metadata != null) { -excludedProperties = metadata.excludeProperties(); +String excludedEndpointProperties = ""; +Metadata endpointMetadata = classElement.getAnnotation(Metadata.class); +if (endpointMetadata != null) { +excludedEndpointProperties = endpointMetadata.excludeProperties(); } + // enhance and generate -enhanceComponentModel(componentModel, parentData, excludedProperties); +enhanceComponentModel(componentModel, parentData, excludedEndpointProperties, excludedComponentProperties); // if the component has known class name if (!"@@@JAVATYPE@@@".equals(componentModel.getJavaType())) { @@ -270,7 +276,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { return data; } -private void enhanceComponentModel(ComponentModel componentModel, ComponentModel parentData, String excludeProperties) { +private void enhanceComponentModel(ComponentModel componentModel, ComponentModel parentData, String excludedEndpointProperties, String excludedComponentProperties) { componentModel.getComponentOptions().removeIf(option -> filterOutOption(componentModel, option)); componentModel.getComponentOptions().forEach(option -> fixDoc(option, parentData != null ? parentData.getComponentOptions() : null)); componentModel.getComponentOptions().sort(EndpointHelper.createGroupAndLabelComparator()); @@ -281,7 +287,8 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { if (parentData != null) { Set componentOptionNames = componentModel.getComponentOptions().stream().map(BaseOptionModel::getName).collect(Collectors.toSet()); Set endpointOptionNames = componentModel.getEndpointOptions().stream().map(BaseOptionModel::getName).collect(Collectors.toSet()); -Collections.addAll(endpointOptionNames, excludeProperties.split(",")); +Collections.addAll(componentOptionNames, excludedComponentProperties.split(",")); +Collections.addAll(endpointOptionNames, excludedEndpointProperties.split(",")); parentData.getComponentOptions().stream() .filter(option -> !componentOptionNames.contains(option.getName())) .forEach(option -> componentModel.getComponentOptions().add(option)); @@ -528,10 +535,14 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { protected void findComponentClassProperties(ComponentModel componentModel, Class classElement, String prefix, String nestedTypeName, String nestedFieldName) { final Class orgClassElement = classElement; +Set excludes = new HashSet<>(); while (true) { Metadata componentAnnotation = classElement.getAnnotation(Metadata.class); -if (componentAnnotation != null && Objects.equals("verifiers", componentAnnotation.label())) { -
[camel] branch CAMEL-15001 created (now 4c86c6c)
This is an automated email from the ASF dual-hosted git repository. janbednar pushed a change to branch CAMEL-15001 in repository https://gitbox.apache.org/repos/asf/camel.git. at 4c86c6c CAMEL-15001: Exclude bridgeErrorHandler for JMS and child components. This branch includes the following new commits: new 41a4618 CAMEL-15001: introduce excludeProperties for component new 4c86c6c CAMEL-15001: Exclude bridgeErrorHandler for JMS and child components. 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.
[GitHub] [camel] gnodet opened a new pull request #3796: [CAMEL-15002] Add a beforeInitialize method on the MainListener and deprecate the configure method
gnodet opened a new pull request #3796: URL: https://github.com/apache/camel/pull/3796 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #1171: Dev mode does not work using platform 1.4.1
ppalaga commented on issue #1171: URL: https://github.com/apache/camel-quarkus/issues/1171#issuecomment-623326803 Unless somebody has a better idea, I am going to try to 1. Create a new dev mode test to cover cases like the above 2. Make the platform to execute it. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] lburgazzoli opened a new pull request #3795: Make VertxPlatformHttpServer public
lburgazzoli opened a new pull request #3795: URL: https://github.com/apache/camel/pull/3795 [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] lburgazzoli opened a new pull request #3794: CAMEL-15003: PropertyBindingSupport fails for anonymous classes
lburgazzoli opened a new pull request #3794: URL: https://github.com/apache/camel/pull/3794 [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful subject line and body. [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #1173: Need an archetype for Camel Quarkus
ppalaga commented on issue #1173: URL: https://github.com/apache/camel-quarkus/issues/1173#issuecomment-623311222 The Quarkus folks are working on a solution for the extensions to co-scaffold starter projects: https://groups.google.com/d/msg/quarkus-dev/yUcOM8jwIvY/5ZQXK7ZlDwAJ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch master updated (390d4fb -> 451287d)
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 390d4fb Upgrade roaster new f9a671d Upgrade Pulsar to version 2.5.1 new 451287d Upgrade docker image for pulsar to 2.5.1 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: .../test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 02/02: Upgrade docker image for pulsar to 2.5.1
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 451287d378a5e32a4cac4da073366b571dd31091 Author: Andrea Cosentino AuthorDate: Mon May 4 09:37:47 2020 +0200 Upgrade docker image for pulsar to 2.5.1 --- .../test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java index 6d052bd..4cda20d 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java @@ -22,7 +22,7 @@ import org.testcontainers.containers.GenericContainer; public class PulsarTestSupport extends ContainerAwareTestSupport { -public static final String CONTAINER_IMAGE = "apachepulsar/pulsar:2.5.0"; +public static final String CONTAINER_IMAGE = "apachepulsar/pulsar:2.5.1"; public static final String CONTAINER_NAME = "pulsar"; public static final int BROKER_PORT = 6650; public static final int BROKER_HTTP_PORT = 8080;
[camel] 01/02: Upgrade Pulsar to version 2.5.1
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 f9a671d127a036cb767e987c4322079f5581a3e2 Author: Andrea Cosentino AuthorDate: Mon May 4 08:51:14 2020 +0200 Upgrade Pulsar to version 2.5.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f37b87a..30963db 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -455,7 +455,7 @@ 0.6.1 1.8 4.25.0 -2.5.0 +2.5.1 8.0.0 0.33.4 0.51.0
[camel-karaf] branch master updated: Upgrade Pulsar and related bundle to version 2.5.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/master by this push: new 64d1dc3 Upgrade Pulsar and related bundle to version 2.5.1 64d1dc3 is described below commit 64d1dc363914ac389f2da9f4277cd8493f76e750 Author: Andrea Cosentino AuthorDate: Mon May 4 09:38:17 2020 +0200 Upgrade Pulsar and related bundle to version 2.5.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d6ec9e0..4d973d5 100644 --- a/pom.xml +++ b/pom.xml @@ -616,8 +616,8 @@ 0.6.1 1.8 4.25.0 -2.5.0 -2.5.0_1 +2.5.1 +2.5.1_1 8.0.0 0.33.4 0.51.0
[GitHub] [camel-kafka-connector] orpiske commented on issue #178: Automate bootstrap for non-containerized deployment?
orpiske commented on issue #178: URL: https://github.com/apache/camel-kafka-connector/issues/178#issuecomment-623308132 > @orpiske For the configuration part actually I was planning to add an autogenerated example configuration listing only the required options (the camel catalog should provide that information). We can potentially convey that information using the Kafka connect config priority field (i.e. only the properties with priority = HIGH are the mandatory ones). I think that's a good idea. I think reusing the priority would make it possible to use it for the bootstrapping part as well. > > Probably we would need to specify the version as well? Or directly some GAV? I think we need that too. I think we could use the GAV. IIRC, camel-k CLI already uses the GAV, so overall usage throughout the projects would be consistent. > > It is a nice idea, it sounds a decent amount of work is needed for a facility to basically run examples and standalone (that nowadays I am not sure how much would be used, as you said containers platforms have these facilities built in somehow. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] 01/01: Upgrade to Camel 3.3.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 b862f45aa5c819d58857f7551e45910e5353dbbc Author: James Netherton AuthorDate: Tue Apr 14 09:34:35 2020 +0100 Upgrade to Camel 3.3.0 - WIP --- .../pages/list-of-camel-quarkus-extensions.adoc| 378 ++--- .../org/apache/camel/quarkus/core/BaseModel.java | 29 ++ .../camel/quarkus/core/FastCamelContext.java | 20 ++ .../quarkus/core/FastFactoryFinderResolver.java| 19 +- .../component/file/deployment/FileProcessor.java | 36 -- .../org/apache/camel/component/qute/qute.json | 21 +- .../quarkus/component/slack/it/SlackRoutes.java| 4 +- pom.xml| 4 +- 8 files changed, 257 insertions(+), 254 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 b2706df..bb68845 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -27,15 +27,15 @@ Level | Since | Description | link:https://camel.apache.org/components/latest/activemq-component.html[ActiveMQ] (camel-quarkus-activemq) + `activemq:destinationType:destinationName` | Native + - Stable | 1.0.0-M5 | The activemq component allows messages to be sent to (or consumed from) Apache ActiveMQ. This component extends the Camel JMS component. + Stable | 1.0.0-M5 | Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. | xref:extensions/ahc.adoc[AHC] (camel-quarkus-ahc) + `ahc:httpUri` | Native + - Stable | 1.0.0-M3 | To call external HTTP services using Async Http Client. + Stable | 1.0.0-M3 | Call external HTTP services using Async Http Client. | link:https://camel.apache.org/components/latest/ahc-ws-component.html[AHC Websocket] (camel-quarkus-ahc-ws) + `ahc-ws:httpUri` | Native + - Stable | 1.0.0-M3 | To exchange data with external Websocket servers using Async Http Client. + Stable | 1.0.0-M3 | Exchange data with external Websocket servers using Async Http Client. | link:https://camel.apache.org/components/latest/amqp-component.html[AMQP] (camel-quarkus-amqp) + `amqp:destinationType:destinationName` | Native + @@ -43,235 +43,235 @@ Level | Since | Description | link:https://camel.apache.org/components/latest/avro-component.html[Avro] (camel-quarkus-avro-rpc) + `avro:transport:host:port/messageName` | JVM + - Preview | 1.0.0-M6 | Working with Apache Avro for data serialization. + Preview | 1.0.0-M6 | Produce or consume Apache Avro RPC services. | link:https://camel.apache.org/components/latest/aws2-cw-component.html[AWS 2 CloudWatch] (camel-quarkus-aws2-cw) + `aws2-cw:namespace` | Native + - Stable | 1.0.0-M6 | The aws2-cw component is used for sending metrics to an Amazon CloudWatch. + Stable | 1.0.0-M6 | Sending metrics to AWS CloudWatch using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-ddb-component.html[AWS 2 DynamoDB] (camel-quarkus-aws2-ddb) + `aws2-ddb:tableName` | JVM + - Preview | 1.0.0-M6 | The aws2-ddb component is used for storing and retrieving data from Amazon's DynamoDB service. + Preview | 1.0.0-M6 | Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-ddbstream-component.html[AWS 2 DynamoDB Streams] (camel-quarkus-aws2-ddb) + `aws2-ddbstream:tableName` | JVM + - Preview | 1.0.0-M6 | The aws2-ddbstream component is used for working with Amazon DynamoDB Streams. + Preview | 1.0.0-M6 | Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-ec2-component.html[AWS 2 EC2] (camel-quarkus-aws2-ec2) + `aws2-ec2:label` | JVM + - Preview | 1.0.0-M6 | The aws2-ec2 is used for managing Amazon EC2 instances. + Preview | 1.0.0-M6 | Manage AWS EC2 instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-ecs-component.html[AWS 2 ECS] (camel-quarkus-aws2-ecs) + `aws2-ecs:label` | JVM + - Preview | 1.0.0-M6 | The aws2-ecs is used for managing Amazon ECS + Preview | 1.0.0-M6 | Manage AWS ECS cluster instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-eks-component.html[AWS 2 EKS] (camel-quarkus-aws2-eks) + `aws2-eks:label` | JVM + - Preview | 1.0.0-M6 | The aws2-eks is used for managing Amazon EKS + Preview | 1.0.0-M6 | Manage AWS EKS cluster instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 IAM] (camel-quarkus-aws2-iam) + `aws2-iam:label` | JVM + - Preview | 1.0.0-M6 | The aws2-iam is used for managing Amazon IAM + Preview | 1.0.0-M6 | Manage AWS
[camel-quarkus] branch camel-master updated (e8543f5 -> b862f45)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard e8543f5 Upgrade to Camel 3.3.0 - WIP add 44fb006 Added JDK11 support to the Kudu container-based itests infrastructure #1132 add c8df0fc deps: update kotlin to v1.3.72 add f850a1a Bump firstVersion to 1.0.0-M8 add a399235 Fix #1154 Generating JavaDoc is slown on Java 11 add 668d7db Do not sign twice during releases add 9b4e701 Fix #1156 #1155 Skip unnecessary tasks during release:prepare and release:perform add ca78071 Update the release guide add 1d87d96 Upgrade Activemq to version 5.11.12 add 3914963 Upgrade Quarkus Qpid JMS to 0.14.1 add 62d2b10 Add native support for Elasticsearch REST add 59257bf Ensure unlisted is not present while promoting a JVM only extension to native add 6fab85a Improve Elasticsearch Rest test method name add d67b571 Fix #1153 Import camel-quarkus-bom-test into camel-quarkus-build-parent-it add baaa61c Bump Camel-Quarkus last release to 1.0.0-M7 add e797254 Merge pull request #1170 from apache/1.0.0-M7-1 add aa61c73 Bump Jandex to version 1.0.8 (#1172) new b862f45 Upgrade to Camel 3.3.0 - WIP This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e8543f5) \ N -- N -- N refs/heads/camel-master (b862f45) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/test-categories.yaml | 1 + docs/antora.yml| 2 +- .../pages/list-of-camel-quarkus-extensions.adoc| 6 +- docs/modules/ROOT/pages/promote-jvm-to-native.adoc | 1 + docs/modules/ROOT/pages/release-guide.adoc | 9 +- extensions-jvm/avro-rpc/integration-test/pom.xml | 3 +- extensions-jvm/avro/integration-test/pom.xml | 3 +- extensions-jvm/aws2-ddb/integration-test/pom.xml | 3 +- extensions-jvm/aws2-ec2/integration-test/pom.xml | 3 +- extensions-jvm/aws2-ecs/integration-test/pom.xml | 3 +- extensions-jvm/aws2-eks/integration-test/pom.xml | 3 +- extensions-jvm/aws2-iam/integration-test/pom.xml | 3 +- extensions-jvm/aws2-kms/integration-test/pom.xml | 3 +- extensions-jvm/aws2-mq/integration-test/pom.xml| 3 +- extensions-jvm/aws2-msk/integration-test/pom.xml | 3 +- extensions-jvm/aws2-ses/integration-test/pom.xml | 3 +- .../aws2-translate/integration-test/pom.xml| 3 +- .../cassandraql/integration-test/pom.xml | 3 +- extensions-jvm/couchbase/integration-test/pom.xml | 3 +- .../debezium-mongodb/integration-test/pom.xml | 3 +- .../debezium-mysql/integration-test/pom.xml| 3 +- .../debezium-postgres/integration-test/pom.xml | 3 +- .../debezium-sqlserver/integration-test/pom.xml| 3 +- .../deployment/ElasticsearchRestProcessor.java | 47 -- .../elasticsearch-rest/integration-test/pom.xml| 80 .../rest/it/ElasticsearchRestResource.java | 51 -- .../rest/it/ElasticsearchRestTest.java | 34 --- .../main/resources/META-INF/quarkus-extension.yaml | 29 -- .../google-bigquery/integration-test/pom.xml | 3 +- .../google-pubsub/integration-test/pom.xml | 15 +-- extensions-jvm/groovy/integration-test/pom.xml | 3 +- extensions-jvm/grpc/integration-test/pom.xml | 15 +-- .../mongodb-gridfs/integration-test/pom.xml| 3 +- extensions-jvm/nitrite/integration-test/pom.xml| 3 +- extensions-jvm/ognl/integration-test/pom.xml | 3 +- extensions-jvm/openstack/integration-test/pom.xml | 3 +- extensions-jvm/pom.xml | 1 - extensions-jvm/protobuf/integration-test/pom.xml | 15 +-- extensions-jvm/pubnub/integration-test/pom.xml | 3 +- extensions-jvm/rabbitmq/integration-test/pom.xml | 3 +- .../rest-openapi/integration-test/pom.xml | 15 +-- extensions-support/retrofit/runtime/pom.xml| 9 +- .../elasticsearch-rest/deployment/pom.xml | 6 +-
[GitHub] [camel-kafka-connector] fvaleri edited a comment on pull request #184: Code cleanup
fvaleri edited a comment on pull request #184: URL: https://github.com/apache/camel-kafka-connector/pull/184#issuecomment-623301679 Ok, there should be no conflict now. Also fixed a flaky test (CamelSourceTaskTest.testSourcePollingTimeout) and now all tests of this class run in half the time. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] fvaleri commented on pull request #184: Code cleanup
fvaleri commented on pull request #184: URL: https://github.com/apache/camel-kafka-connector/pull/184#issuecomment-623301679 Ok, there should be no conflict now. Also fixed a flaky test (CamelSourceTaskTest.testSourcePollingTimeout) and now all tests run in half the time. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] davsclaus commented on issue #1173: Need an archetype for Camel Quarkus
davsclaus commented on issue #1173: URL: https://github.com/apache/camel-quarkus/issues/1173#issuecomment-623300449 Yes I think its part of a bigger picture. How to let extensions / influence the generated projects - its not only a Camel thing. What if you add hibernate extension then you may want it to setup some jpa/hibernate stuff, and so for other extensions. But its the same at spring boot, it also generates an empty/shallow project. A maven archetype is cumbersome to use and also a big ugly with all the parameters you need to specify. There is a reason why those get started websites are popular. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] lburgazzoli commented on issue #1173: Need an archetype for Camel Quarkus
lburgazzoli commented on issue #1173: URL: https://github.com/apache/camel-quarkus/issues/1173#issuecomment-623298850 I think the main issue is that those tools do not generate a camel specific set-up so i.e. they do generate a JAX-RS application whereas it would be nice to have a sample route This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #1173: Need an archetype for Camel Quarkus
ppalaga commented on issue #1173: URL: https://github.com/apache/camel-quarkus/issues/1173#issuecomment-623297591 We indeed do not have a Maven Archetype, but there are two other ways to scaffold new projects: 1. https://code.quarkus.io/ 2. `quarkus-maven-plugin` can scaffold projects also for Camel Quarkus: ``` mvn io.quarkus:quarkus-maven-plugin:1.4.1.Final:create -DprojectGroupId=org.acme -DprojectArtifactId=camel-timer-quickstart -DclassName="org.acme.rest.json.FruitResource" -Dpath="/fruits" -Dextensions="camel-quarkus-timer" ``` Do you think @weimeilin79 1. and 2. are missing some functionality against an archetype? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] lburgazzoli edited a comment on issue #892: [camel-master branch] support ComponentNameResolver
lburgazzoli edited a comment on issue #892: URL: https://github.com/apache/camel-quarkus/issues/892#issuecomment-623290072 @jamesnetherton not I'm aware of, was thinking to have this process done at build time so basically have a component name resolver that returns a static list of component names but maybe it is not needed. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] lburgazzoli commented on issue #892: [camel-master branch] support ComponentNameResolver
lburgazzoli commented on issue #892: URL: https://github.com/apache/camel-quarkus/issues/892#issuecomment-623290072 @jamesnetherton not I'm aware of, was thinking to have this process done at build time so basically have a component name resolver that returns a static list of component names. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on issue #892: [camel-master branch] support ComponentNameResolver
jamesnetherton commented on issue #892: URL: https://github.com/apache/camel-quarkus/issues/892#issuecomment-623286815 @lburgazzoli is there anything specific that needs to be done for this? I tested it on the master branch and it seems to be working fine. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] 04/05: Added FirstVersion metadata to camel-servlet-osgi
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit db8240d01dd3edafa08104496fe88294d387ea93 Author: Andrea Cosentino AuthorDate: Mon May 4 08:05:51 2020 +0200 Added FirstVersion metadata to camel-servlet-osgi --- components/camel-servlet-osgi/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/components/camel-servlet-osgi/pom.xml b/components/camel-servlet-osgi/pom.xml index 824b28d..3043b18 100644 --- a/components/camel-servlet-osgi/pom.xml +++ b/components/camel-servlet-osgi/pom.xml @@ -31,6 +31,10 @@ Camel Karaf :: Servlet OSGi Camel Servlet for OSGi + +3.2.0 + +
[camel-karaf] 05/05: 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-karaf.git commit 7095800034d70526df8ff9f8e199338120104e15 Author: Andrea Cosentino AuthorDate: Mon May 4 08:07:13 2020 +0200 Regen --- components/camel-servlet-osgi/src/generated/resources/servlet-osgi.json | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-servlet-osgi/src/generated/resources/servlet-osgi.json b/components/camel-servlet-osgi/src/generated/resources/servlet-osgi.json index 7664cb9..1f0bc0d 100644 --- a/components/camel-servlet-osgi/src/generated/resources/servlet-osgi.json +++ b/components/camel-servlet-osgi/src/generated/resources/servlet-osgi.json @@ -5,6 +5,7 @@ "title": "Servlet Osgi", "description": "Camel Servlet for OSGi", "deprecated": false, +"firstVersion": "3.2.0", "supportLevel": "Stable", "groupId": "org.apache.camel.karaf", "artifactId": "camel-servlet-osgi",
[camel-karaf] branch master updated (4192244 -> 7095800)
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-karaf.git. from 4192244 Upgrade QPid Proton J to version 0.33.4 new 28a8c12 Added firstVersion metadata to camel-cxf-blueprint new 14eea74 Added FirstVersion metadata to camel-cxf-transport-blueprint new 48a6d94 Regen new db8240d Added FirstVersion metadata to camel-servlet-osgi new 7095800 Regen The 5 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-cxf-blueprint/pom.xml| 1 + .../camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json| 1 + components/camel-cxf-transport-blueprint/pom.xml | 1 + .../src/generated/resources/cxf-transport-blueprint.json | 1 + components/camel-servlet-osgi/pom.xml | 4 .../camel-servlet-osgi/src/generated/resources/servlet-osgi.json | 1 + 6 files changed, 9 insertions(+)
[camel-karaf] 01/05: Added firstVersion metadata to camel-cxf-blueprint
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit 28a8c120db9413f0dd4a921b5ef7972cf8e22898 Author: Andrea Cosentino AuthorDate: Mon May 4 08:00:16 2020 +0200 Added firstVersion metadata to camel-cxf-blueprint --- components/camel-cxf-blueprint/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-cxf-blueprint/pom.xml b/components/camel-cxf-blueprint/pom.xml index 43fc084..111ff96 100644 --- a/components/camel-cxf-blueprint/pom.xml +++ b/components/camel-cxf-blueprint/pom.xml @@ -32,6 +32,7 @@ Camel CXF for OSGi Blueprint +3.2.0 javax.xml.bind*;version="[2.2,3.0)", *
[camel-karaf] 03/05: 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-karaf.git commit 48a6d9462e5d29c8f38c46ae4a18dfa70b033ea4 Author: Andrea Cosentino AuthorDate: Mon May 4 08:05:16 2020 +0200 Regen --- .../src/generated/resources/cxf-transport-blueprint.json | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-cxf-transport-blueprint/src/generated/resources/cxf-transport-blueprint.json b/components/camel-cxf-transport-blueprint/src/generated/resources/cxf-transport-blueprint.json index ac49468..b78d9e1 100644 --- a/components/camel-cxf-transport-blueprint/src/generated/resources/cxf-transport-blueprint.json +++ b/components/camel-cxf-transport-blueprint/src/generated/resources/cxf-transport-blueprint.json @@ -5,6 +5,7 @@ "title": "Cxf Transport Blueprint", "description": "Camel CXF Transport for OSGi Blueprint", "deprecated": false, +"firstVersion": "3.2.0", "supportLevel": "Stable", "groupId": "org.apache.camel.karaf", "artifactId": "camel-cxf-transport-blueprint",
[camel-karaf] 02/05: Added FirstVersion metadata to camel-cxf-transport-blueprint
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit 14eea7419986f9fc6cc11d8a92a0f2f0a83ee41a Author: Andrea Cosentino AuthorDate: Mon May 4 08:03:50 2020 +0200 Added FirstVersion metadata to camel-cxf-transport-blueprint --- .../camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json | 1 + components/camel-cxf-transport-blueprint/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/components/camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json b/components/camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json index 5e3af5d..410bc22 100644 --- a/components/camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json +++ b/components/camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json @@ -5,6 +5,7 @@ "title": "Cxf Blueprint", "description": "Camel CXF for OSGi Blueprint", "deprecated": false, +"firstVersion": "3.2.0", "supportLevel": "Stable", "groupId": "org.apache.camel.karaf", "artifactId": "camel-cxf-blueprint", diff --git a/components/camel-cxf-transport-blueprint/pom.xml b/components/camel-cxf-transport-blueprint/pom.xml index 8977fa0..6a32856 100644 --- a/components/camel-cxf-transport-blueprint/pom.xml +++ b/components/camel-cxf-transport-blueprint/pom.xml @@ -32,6 +32,7 @@ Camel CXF Transport for OSGi Blueprint +3.2.0 javax.xml.bind*;version="[2.2,3.0)", *
[GitHub] [camel-quarkus] lburgazzoli opened a new pull request #1175: Code cleanup
lburgazzoli opened a new pull request #1175: URL: https://github.com/apache/camel-quarkus/pull/1175 [ ] An issue should be filed for the change unless this is a trivial change (fixing a typo or similar). One issue should ideally be fixed by not more than one commit and the other way round, each commit should fix just one issue, without pulling in other changes. [ ] Each commit in the pull request should have a meaningful and properly spelled subject line and body. Copying the title of the associated issue is typically enough. Please include the issue number in the commit message prefixed by #. [ ] The pull request description should explain what the pull request does, how, and why. If the info is available in the associated issue or some other external document, a link is enough. [ ] Phrases like Fix # or Fixes # will auto-close the named issue upon merging the pull request. Using them is typically a good idea. [ ] Please run mvn process-resources -Pformat (and amend the changes if necessary) before sending the pull request. [ ] Contributor guide is your good friend: https://camel.apache.org/camel-quarkus/latest/contributor-guide.html This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org