[camel] branch regen_bot updated (aa7eb7f4eb9 -> b345238907a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from aa7eb7f4eb9 Regen add b345238907a Documentation of XQuery, Timer components - typos and formatting (#7942) No new revisions were added by this update. Summary of changes: components/camel-saxon/src/main/docs/xquery-component.adoc | 4 ++-- components/camel-timer/src/main/docs/timer-component.adoc | 8 2 files changed, 6 insertions(+), 6 deletions(-)
[GitHub] [camel-spring-boot] davsclaus merged pull request #587: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
davsclaus merged PR #587: URL: https://github.com/apache/camel-spring-boot/pull/587 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: [create-pull-request] automated change (#587)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new adc6a441e95 [create-pull-request] automated change (#587) adc6a441e95 is described below commit adc6a441e9556ba330397b6263dc6042c6398a40 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jun 30 07:37:50 2022 +0200 [create-pull-request] automated change (#587) Co-authored-by: oscerd --- components-starter/camel-hbase-starter/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/components-starter/camel-hbase-starter/pom.xml b/components-starter/camel-hbase-starter/pom.xml index eac8d1a34f3..3f92ee55fc7 100644 --- a/components-starter/camel-hbase-starter/pom.xml +++ b/components-starter/camel-hbase-starter/pom.xml @@ -44,6 +44,10 @@ commons-logging commons-logging + + log4j + log4j +
[camel-karaf] branch main updated: OSGi features fixes
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 630723ea OSGi features fixes 630723ea is described below commit 630723ea1871e74c5e2bc57dc2d0c0fc92ef8858 Author: Claus Ibsen AuthorDate: Thu Jun 30 07:33:16 2022 +0200 OSGi features fixes --- platforms/karaf/features/src/main/resources/features.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 8af93a48..c961e3fa 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -638,7 +638,7 @@ mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-resolver/${netty-version} mvn:io.netty/netty-transport/${netty-version} -mvn:io.netty/netty-transport-native-unix-common-classes/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-tcnative-classes/${netty-tcnative-classes-version} wrap:mvn:org.eclipse.californium/californium-core/${californium-version} wrap:mvn:org.eclipse.californium/element-connector/${californium-version}$overwrite=mergeImport-Package=net.i2p.crypto.eddsa;resolution:=optional
[camel-quarkus] 03/03: Temporarily work around Vert.x incompatibilities between Camel & Quarkus
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a7b753b5bd39c73b9a421c80c42252682d83cf3a Author: James Netherton AuthorDate: Mon Jun 27 09:17:46 2022 +0100 Temporarily work around Vert.x incompatibilities between Camel & Quarkus --- extensions/platform-http/runtime/pom.xml | 5 ++ .../CamelQuarkusVertxPlatformHttpConsumer.java | 89 ++ .../http/graal/PlatformHttpVertxSubstitutions.java | 36 + .../http/runtime/PlatformHttpRecorder.java | 14 +++- .../component/http/server/it/PlatformHttpTest.java | 4 +- 5 files changed, 145 insertions(+), 3 deletions(-) diff --git a/extensions/platform-http/runtime/pom.xml b/extensions/platform-http/runtime/pom.xml index acb533ad4e..16b331476f 100644 --- a/extensions/platform-http/runtime/pom.xml +++ b/extensions/platform-http/runtime/pom.xml @@ -52,6 +52,11 @@ io.quarkus quarkus-vertx-http + +org.graalvm.nativeimage +svm +provided + diff --git a/extensions/platform-http/runtime/src/main/java/org/apache/camel/component/platform/http/vertx/CamelQuarkusVertxPlatformHttpConsumer.java b/extensions/platform-http/runtime/src/main/java/org/apache/camel/component/platform/http/vertx/CamelQuarkusVertxPlatformHttpConsumer.java new file mode 100644 index 00..346ecf6dac --- /dev/null +++ b/extensions/platform-http/runtime/src/main/java/org/apache/camel/component/platform/http/vertx/CamelQuarkusVertxPlatformHttpConsumer.java @@ -0,0 +1,89 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.platform.http.vertx; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import io.vertx.core.Handler; +import io.vertx.core.MultiMap; +import io.vertx.core.buffer.Buffer; +import io.vertx.ext.web.RoutingContext; +import org.apache.camel.Exchange; +import org.apache.camel.Message; +import org.apache.camel.Processor; +import org.apache.camel.component.platform.http.PlatformHttpEndpoint; +import org.apache.camel.component.platform.http.spi.Method; +import org.apache.camel.spi.HeaderFilterStrategy; + +import static org.apache.camel.component.platform.http.vertx.VertxPlatformHttpSupport.appendHeader; +import static org.apache.camel.component.platform.http.vertx.VertxPlatformHttpSupport.populateCamelHeaders; + +// TODO: Remove when Camel / Quarkus Vert.x version is in sync https://github.com/apache/camel-quarkus/issues/3877 +public final class CamelQuarkusVertxPlatformHttpConsumer extends VertxPlatformHttpConsumer { + +public CamelQuarkusVertxPlatformHttpConsumer(PlatformHttpEndpoint endpoint, Processor processor, +List> handlers) { +super(endpoint, processor, handlers); +} + +@Override +protected Message toCamelMessage(RoutingContext ctx, Exchange exchange) { +final Message result = exchange.getIn(); + +final HeaderFilterStrategy headerFilterStrategy = getEndpoint().getHeaderFilterStrategy(); +populateCamelHeaders(ctx, result.getHeaders(), exchange, headerFilterStrategy); +final String mimeType = ctx.parsedHeaders().contentType().value(); +final boolean isMultipartFormData = "multipart/form-data".equals(mimeType); +if ("application/x-www-form-urlencoded".equals(mimeType) || isMultipartFormData) { +final MultiMap formData = ctx.request().formAttributes(); +final Map body = new HashMap<>(); +for (String key : formData.names()) { +for (String value : formData.getAll(key)) { +if (headerFilterStrategy != null +&& !headerFilterStrategy.applyFilterToExternalHeaders(key, value, exchange)) { +appendHeader(result.getHeaders(), key, value); +appendHeader(body, key, value); +} +} +} + +if (!body.isEmpty()) { +result.setBody(body); +} +
[camel-quarkus] 01/03: Aws SQS: Remove unnecessary headers from the test because of CAMEL-18123 #3803
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 045a3a8d81036c22c4dc3b8508be2bc4b97a4260 Author: JiriOndrusek AuthorDate: Mon May 23 13:51:36 2022 +0200 Aws SQS: Remove unnecessary headers from the test because of CAMEL-18123 #3803 --- .../camel/quarkus/component/aws2/sqs/it/Aws2SqsResource.java | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsResource.java b/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsResource.java index 44ad89506c..65ea892b2a 100644 --- a/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsResource.java +++ b/integration-test-groups/aws2/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsResource.java @@ -81,10 +81,8 @@ public class Aws2SqsResource { @DELETE @Produces(MediaType.TEXT_PLAIN) public Response purgeQueue(@PathParam("queueName") String queueName) throws Exception { -producerTemplate.sendBodyAndHeader(componentUri(queueName) + "?operation=purgeQueue", -null, -Sqs2Constants.SQS_QUEUE_PREFIX, -queueName); +producerTemplate.sendBody(componentUri(queueName) + "?operation=purgeQueue", +null); return Response.ok().build(); } @@ -148,10 +146,8 @@ public class Aws2SqsResource { @DELETE @Produces(MediaType.TEXT_PLAIN) public Response deleteQueue(@PathParam("queueName") String queueName) throws Exception { -producerTemplate.sendBodyAndHeader(componentUri(queueName) + "?operation=deleteQueue", -null, -Sqs2Constants.SQS_QUEUE_PREFIX, -queueName); +producerTemplate.sendBody(componentUri(queueName) + "?operation=deleteQueue", +null); return Response.ok().build(); }
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1170782789 Build fixed with: * Camel Quarkus Commit: a7b753b5bd39c73b9a421c80c42252682d83cf3a * Camel Main Commit: 83a8c60c7894fa413910f832813d78543b2fc0a7 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2586693170 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch camel-main updated (e70af2e24d -> a7b753b5bd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard e70af2e24d Temporarily work around Vert.x incompatibilities between Camel & Quarkus discard a99db855f6 Upgrade Camel to 3.18.0 discard 15558098a8 Aws SQS: Remove unnecessary headers from the test because of CAMEL-18123 #3803 add 1a4126936a Upgrade artemiscloud/activemq-artemis-broker to 1.0.5 (#3880) add ef9addfafc Parametrize infinispan image (#3881) add 858727e46d Simplify support for Quartz clustering add 83a8c60c78 Remove redundant Spring dependencies from JDBC extension new 045a3a8d81 Aws SQS: Remove unnecessary headers from the test because of CAMEL-18123 #3803 new 330e92946d Upgrade Camel to 3.18.0 new a7b753b5bd Temporarily work around Vert.x incompatibilities between Camel & Quarkus 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 (e70af2e24d) \ N -- N -- N refs/heads/camel-main (a7b753b5bd) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../modules/ROOT/pages/migration-guide/2.11.0.adoc | 9 ++ docs/modules/ROOT/pages/migration-guide/index.adoc | 1 + .../ROOT/pages/reference/extensions/quartz.adoc| 116 +++-- extensions/jdbc/deployment/pom.xml | 4 - extensions/jdbc/runtime/pom.xml| 4 - .../quartz/deployment/QuartzProcessor.java | 7 +- extensions/quartz/runtime/pom.xml | 5 - .../quartz/runtime/src/main/doc/limitations.adoc | 4 - extensions/quartz/runtime/src/main/doc/usage.adoc | 114 +++- .../CamelQuarkusQuartzConnectionProvider.java | 66 .../support/activemq/ActiveMQTestResource.java | 9 +- .../infinispan/InfinispanServerTestResource.java | 2 +- integration-tests/pom.xml | 1 + .../{master => quartz-clustered}/pom.xml | 90 ++-- .../quartz/it/QuartzClusteredResource.java | 48 + .../quartz/it/QuartzClusteredRoutes.java} | 16 +-- .../src/main/resources/application.properties | 31 +++--- .../db/migration/V1.0.1__QuarkusQuartz.sql | 0 .../component/quartz/it/QuartzClusteredIT.java}| 2 +- .../component/quartz/it/QuartzClusteredTest.java} | 75 - integration-tests/quartz/pom.xml | 37 --- .../component/quartz/it/QuartzResource.java| 21 .../quarkus/component/quartz/it/QuartzRoutes.java | 13 --- .../src/main/resources/application.properties | 31 +- .../src/main/resources/quartz-node-A.properties| 62 --- .../src/main/resources/quartz-node-B.properties| 63 --- .../src/main/resources/quartz-node-C.properties| 67 .../quarkus/component/quartz/it/QuartzTest.java| 31 -- poms/bom/pom.xml | 8 -- poms/bom/src/main/generated/flattened-full-pom.xml | 8 -- .../src/main/generated/flattened-reduced-pom.xml | 8 -- .../generated/flattened-reduced-verbose-pom.xml| 8 -- tooling/scripts/test-categories.yaml | 1 + tooling/test-list/pom.xml | 1 + 34 files changed, 289 insertions(+), 674 deletions(-) create mode 100644 docs/modules/ROOT/pages/migration-guide/2.11.0.adoc delete mode 100644 extensions/quartz/runtime/src/main/doc/limitations.adoc delete mode 100644 extensions/quartz/runtime/src/main/java/org/apache/camel/quarkus/component/quartz/CamelQuarkusQuartzConnectionProvider.java copy integration-tests/{master => quartz-clustered}/pom.xml (73%) copy integration-test-groups/foundation/core-languages/src/main/java/org/apache/camel/quarkus/core/languages/it/RefLanguageRoutes.java => integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredResource.java (51%) copy integration-tests/{main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutesCDI.java =>
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2927 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: OSGi features fixes
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 336ab5f41f3 OSGi features fixes 336ab5f41f3 is described below commit 336ab5f41f3935a034c8785a7b28274df2600de3 Author: Claus Ibsen AuthorDate: Thu Jun 30 07:32:44 2022 +0200 OSGi features fixes --- components/camel-kubernetes/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml index 0bf54b52e92..6e73bfa41ce 100644 --- a/components/camel-kubernetes/pom.xml +++ b/components/camel-kubernetes/pom.xml @@ -32,6 +32,10 @@ Camel :: Kubernetes + +org.apache.camel.component.kubernetes*, +org.apache.camel.component.openshift* +
[camel-karaf] branch main updated: OSGi features fixes
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 81dbdb96 OSGi features fixes 81dbdb96 is described below commit 81dbdb9678dfc01275ff3409f0247b2a9defff28 Author: Claus Ibsen AuthorDate: Thu Jun 30 07:23:19 2022 +0200 OSGi features fixes --- platforms/karaf/features/src/main/resources/features.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 35c542ef..8af93a48 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -638,6 +638,7 @@ mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-resolver/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common-classes/${netty-version} mvn:io.netty/netty-tcnative-classes/${netty-tcnative-classes-version} wrap:mvn:org.eclipse.californium/californium-core/${californium-version} wrap:mvn:org.eclipse.californium/element-connector/${californium-version}$overwrite=mergeImport-Package=net.i2p.crypto.eddsa;resolution:=optional @@ -856,6 +857,7 @@ mvn:io.netty/netty-resolver/${netty-version} mvn:io.netty/netty-resolver-dns/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-codec/${netty-version} mvn:io.netty/netty-codec-http/${netty-version} @@ -1079,6 +1081,7 @@ mvn:io.netty/netty-common/${netty-version} mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-resolver/${netty-version} mvn:io.netty/netty-tcnative-classes/${netty-tcnative-classes-version} mvn:org.apache.camel/camel-iec60870/${project.version} @@ -1465,6 +1468,7 @@ mvn:io.netty/netty-buffer/${netty-version} mvn:io.netty/netty-resolver/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-codec/${netty-version} mvn:io.netty/netty-tcnative-classes/${netty-tcnative-classes-version} @@ -1611,6 +1615,7 @@ mvn:com.fasterxml/aalto-xml/0.9.10 mvn:io.netty/netty-common/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-buffer/${netty-version} mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-resolver/${netty-version} @@ -1677,6 +1682,7 @@ wrap:mvn:com.impossibl.pgjdbc-ng/pgjdbc-ng/${pgjdbc-ng-driver-version} mvn:io.netty/netty-common/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-buffer/${netty-version} mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-resolver/${netty-version} @@ -2188,6 +2194,7 @@ mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version} mvn:io.netty/netty-common/${netty-version} mvn:io.netty/netty-transport/${netty-version} +mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-buffer/${netty-version} mvn:io.netty/netty-handler/${netty-version} mvn:io.netty/netty-handler-proxy/${netty-version}
[camel] branch regen_bot updated (472332ce573 -> aa7eb7f4eb9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 472332ce573 (chores) camel-quartz: test cleanups (#7941) add d8f774ae51b Regen add aa7eb7f4eb9 Regen No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Documentation of XQuery, Timer components - typos and formatting (#7942)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new b345238907a Documentation of XQuery, Timer components - typos and formatting (#7942) b345238907a is described below commit b345238907a32544bf0bd9ef5926d8c72ffef4c5 Author: lfabriko AuthorDate: Thu Jun 30 07:06:58 2022 +0200 Documentation of XQuery, Timer components - typos and formatting (#7942) * Typos, formatting of parameters * Typo, broken link to w3schools tutorial --- components/camel-saxon/src/main/docs/xquery-component.adoc | 4 ++-- components/camel-timer/src/main/docs/timer-component.adoc | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc b/components/camel-saxon/src/main/docs/xquery-component.adoc index ed57bb62ac7..e31874b187c 100644 --- a/components/camel-saxon/src/main/docs/xquery-component.adoc +++ b/components/camel-saxon/src/main/docs/xquery-component.adoc @@ -154,11 +154,11 @@ XQuery is a very powerful language for querying, searching, sorting and returning XML. For help learning XQuery try these tutorials * Mike Kay's http://www.stylusstudio.com/xquery_primer.html[XQuery Primer] -* The W3Schools http://www.w3schools.com/xquery/default.asp[XQuery Tutorial] +* The W3Schools https://www.w3schools.com/xml/xquery_intro.asp[XQuery Tutorial] == Dependencies -To use XQuery in your camel routes you need to add the a dependency on +To use XQuery in your camel routes you need to add the dependency on *camel-saxon* which implements the XQuery language. If you use maven you could just add the following to your pom.xml, diff --git a/components/camel-timer/src/main/docs/timer-component.adoc b/components/camel-timer/src/main/docs/timer-component.adoc index b163789c8f1..69f45385eda 100644 --- a/components/camel-timer/src/main/docs/timer-component.adoc +++ b/components/camel-timer/src/main/docs/timer-component.adoc @@ -15,7 +15,7 @@ *{component-header}* The Timer component is used to generate message exchanges when a -timer fires You can only consume events from this endpoint. +timer fires. You can only consume events from this endpoint. == URI format @@ -114,17 +114,17 @@ can use a negative delay: In this way the timer will fire messages immediately. -You can also specify a repeatCount parameter in conjunction with a +You can also specify a `repeatCount` parameter in conjunction with a negative delay to stop firing messages after a fixed number has been reached. -If you don't specify a repeatCount then the timer will continue firing +If you don't specify a `repeatCount` then the timer will continue firing messages until the route will be stopped. == Firing only once You may want to fire a message in a Camel route only once, such as when -starting the route. To do that you use the repeatCount option as shown: +starting the route. To do that you use the `repeatCount` option as shown: [source,xml]
[GitHub] [camel] davsclaus merged pull request #7942: Documentation of XQuery, Timer components - typos and formatting
davsclaus merged PR #7942: URL: https://github.com/apache/camel/pull/7942 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7942: Documentation of XQuery, Timer components - typos and formatting
github-actions[bot] commented on PR #7942: URL: https://github.com/apache/camel/pull/7942#issuecomment-1170759835 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **2 component(s) tested** -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 06/06: chore(trait): Add an option to disable SSA in deployer trait
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 8f64c6b53911fffde7af59ffe87cd47865b53dd5 Author: Antonin Stefanutti AuthorDate: Wed May 18 10:38:46 2022 +0200 chore(trait): Add an option to disable SSA in deployer trait (cherry picked from commit 8f3f6354228bbd04174cb3f25a33e4a7886fffd5) --- docs/modules/traits/pages/deployer.adoc | 5 + go.sum | 3 ++- pkg/cmd/run_test.go | 4 ++-- pkg/resources/resources.go | 4 ++-- pkg/trait/deployer.go | 5 - resources/traits.yaml | 5 + 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/docs/modules/traits/pages/deployer.adoc b/docs/modules/traits/pages/deployer.adoc index 61181e5a9..906f34936 100755 --- a/docs/modules/traits/pages/deployer.adoc +++ b/docs/modules/traits/pages/deployer.adoc @@ -32,6 +32,11 @@ The following configuration options are available: | string | Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. +| deployer.use-ssa +| bool +| Use server-side apply to update the owned resources (default `true`). +Note that it automatically falls back to client-side patching, if SSA is not available, e.g., on old Kubernetes clusters. + |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/go.sum b/go.sum index a230b3538..571ac57b7 100644 --- a/go.sum +++ b/go.sum @@ -1447,8 +1447,9 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-2026232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M= +golang.org/x/time v0.0.0-2026232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go index 85241a2c5..8cabc66cd 100644 --- a/pkg/cmd/run_test.go +++ b/pkg/cmd/run_test.go @@ -633,7 +633,7 @@ func TestFilterBuildPropertyFiles(t *testing.T) { } func TestResolveYamlPodTemplateWithSupplementalGroups(t *testing.T) { - //_, rootCmd, _ := initializeRunCmdOptions(t) + // _, rootCmd, _ := initializeRunCmdOptions(t) templateText := ` securityContext: supplementalGroups: @@ -651,7 +651,7 @@ securityContext: } func TestResolveJsonPodTemplateWithSupplementalGroups(t *testing.T) { - //_, rootCmd, _ := initializeRunCmdOptions(t) + // _, rootCmd, _ := initializeRunCmdOptions(t) minifiedYamlTemplate := `{"securityContext":{"supplementalGroups":[666]}}` integrationSpec := v1.IntegrationSpec{} diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index a4b5ea1bb..e21cdb9ee 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -583,9 +583,9 @@ var assets = func() http.FileSystem { "/traits.yaml": ۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 51291, + uncompressedSize: 51544, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x73\x5b\xb9\x91\xe0\xef\xf3\x57\xa0\xb4\x57\x65\xc9\x45\x52\x9e\xc9\x26\x99\xd3\xdd\x6c\x4e\x63\x7b\x12\xcd\xf8\x43\x67\x6b\x26\x9b\xf2\xb9\x42\xf0\xbd\x26\x09\xeb\x11\x78\x01\xf0\x24\x33\x97\xfb\xdf\xaf\xd0\xdd\xf8\x78\x8f\xa4\x44\xd9\xd6\x6c\xb4\xb5\x9b\xaa\x1d\x4b\x7a\x00\x1a\x8d\x46\x7f\x77\xc3\x5b\xa9\xbc\x3b\xf9\x6a\x2c\xb4\x5c\xc1\x89\x90\xf3\xb9\xd2\xca\xaf\xbf\x12\xa2\x6d\xa4\x9f\x1b\xbb\x3a\x11\x [...] + compressedContent:
[camel-k] 02/06: feat(gc): Rate limit Discovery and SelfSubjectRulesReview requests
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 92ef377dc9e3f2f23fe059864d4db33eef2af9b3 Author: Antonin Stefanutti AuthorDate: Wed Jun 1 18:46:20 2022 +0200 feat(gc): Rate limit Discovery and SelfSubjectRulesReview requests (cherry picked from commit 9d7145e8ab71e8619a205c65d68797084f3d5fb4) --- go.mod | 1 + pkg/trait/gc.go | 46 +- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index e3c63cfc8..5d1130572 100644 --- a/go.mod +++ b/go.mod @@ -46,6 +46,7 @@ require ( go.uber.org/zap v1.19.1 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + golang.org/x/time v0.0.0-2026232009-f0f3c7e86c11 // indirect gopkg.in/inf.v0 v0.9.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.21.4 diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index b11802900..6ca3af790 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -27,6 +27,8 @@ import ( "sync" "time" + "golang.org/x/time/rate" + "github.com/apache/camel-k/pkg/util" authorization "k8s.io/api/authorization/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -44,10 +46,13 @@ import ( ) var ( - toFileName = regexp.MustCompile(`[^(\w/\.)]`) - diskCachedDiscoveryClient discovery.CachedDiscoveryInterface - memoryCachedDiscoveryClient discovery.CachedDiscoveryInterface - discoveryClientLock sync.Mutex + toFileName = regexp.MustCompile(`[^(\w/\.)]`) + + lock sync.Mutex + rateLimiter = rate.NewLimiter(rate.Every(time.Minute), 1) + collectableGVKs = make(map[schema.GroupVersionKind]struct{}) + memoryCachedDiscovery discovery.CachedDiscoveryInterface + diskCachedDiscovery discovery.CachedDiscoveryInterface ) type discoveryCacheType string @@ -187,6 +192,15 @@ func (t *garbageCollectorTrait) canBeDeleted(e *Environment, u unstructured.Unst } func (t *garbageCollectorTrait) getDeletableTypes(e *Environment) (map[schema.GroupVersionKind]struct{}, error) { + lock.Lock() + defer lock.Unlock() + + // Rate limit to avoid Discovery and SelfSubjectRulesReview requests at every reconciliation. + if !rateLimiter.Allow() { + // Return the cached set of garbage collectable GVKs. + return collectableGVKs, nil + } + // We rely on the discovery API to retrieve all the resources GVK, // that results in an unbounded set that can impact garbage collection latency when scaling up. discoveryClient, err := t.discoveryClient() @@ -196,7 +210,7 @@ func (t *garbageCollectorTrait) getDeletableTypes(e *Environment) (map[schema.Gr resources, err := discoveryClient.ServerPreferredNamespacedResources() // Swallow group discovery errors, e.g., Knative serving exposes // an aggregated API for custom.metrics.k8s.io that requires special - // authentication scheme while discovering preferred resources + // authentication scheme while discovering preferred resources. if err != nil && !discovery.IsGroupDiscoveryFailedError(err) { return nil, err } @@ -237,32 +251,30 @@ func (t *garbageCollectorTrait) getDeletableTypes(e *Environment) (map[schema.Gr } } } + collectableGVKs = GVKs - return GVKs, nil + return collectableGVKs, nil } func (t *garbageCollectorTrait) discoveryClient() (discovery.DiscoveryInterface, error) { - discoveryClientLock.Lock() - defer discoveryClientLock.Unlock() - switch *t.DiscoveryCache { case diskDiscoveryCache: - if diskCachedDiscoveryClient != nil { - return diskCachedDiscoveryClient, nil + if diskCachedDiscovery != nil { + return diskCachedDiscovery, nil } config := t.Client.GetConfig() httpCacheDir := filepath.Join(mustHomeDir(), ".kube", "http-cache") diskCacheDir := filepath.Join(mustHomeDir(), ".kube", "cache", "discovery", toHostDir(config.Host)) var err error - diskCachedDiscoveryClient, err = disk.NewCachedDiscoveryClientForConfig(config, diskCacheDir, httpCacheDir, 10*time.Minute) - return diskCachedDiscoveryClient, err + diskCachedDiscovery, err = disk.NewCachedDiscoveryClientForConfig(config, diskCacheDir, httpCacheDir, 10*time.Minute) + return diskCachedDiscovery, err case memoryDiscoveryCache: - if memoryCachedDiscoveryClient != nil { - return
[camel-k] 01/06: feat(gc): Use SelfSubjectRulesReview to scan for garbage collectable resources
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit f841aa6d9489c83963fc0e8da28b22329a2a9936 Author: Antonin Stefanutti AuthorDate: Wed Jun 1 16:10:58 2022 +0200 feat(gc): Use SelfSubjectRulesReview to scan for garbage collectable resources (cherry picked from commit 8caeee372112d2dd60e9f5121af84e52de5355e4) --- pkg/trait/gc.go | 100 +--- 1 file changed, 60 insertions(+), 40 deletions(-) diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index 1ff3204f5..b11802900 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -19,6 +19,7 @@ package trait import ( "context" + "fmt" "path/filepath" "regexp" "strconv" @@ -26,6 +27,8 @@ import ( "sync" "time" + "github.com/apache/camel-k/pkg/util" + authorization "k8s.io/api/authorization/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -35,7 +38,6 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/discovery/cached/disk" "k8s.io/client-go/discovery/cached/memory" - ctrl "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" @@ -81,8 +83,7 @@ func (t *garbageCollectorTrait) Configure(e *Environment) (bool, error) { t.DiscoveryCache = } - return e.IntegrationInPhase(v1.IntegrationPhaseInitialization) || e.IntegrationInRunningPhases(), - nil + return e.IntegrationInPhase(v1.IntegrationPhaseInitialization) || e.IntegrationInRunningPhases(), nil } func (t *garbageCollectorTrait) Apply(e *Environment) error { @@ -92,12 +93,9 @@ func (t *garbageCollectorTrait) Apply(e *Environment) error { // Register a post action that deletes the existing resources that are labelled // with the previous integration generations. // TODO: this should be refined so that it's run when all the replicas for the newer generation - // are ready. This is to be added when the integration scale status is refined with ready replicas + // are ready. e.PostActions = append(e.PostActions, func(env *Environment) error { - // The collection and deletion are performed asynchronously to avoid blocking - // the reconciliation loop. - go t.garbageCollectResources(env) - return nil + return t.garbageCollectResources(env) }) fallthrough @@ -121,43 +119,40 @@ func (t *garbageCollectorTrait) Apply(e *Environment) error { return nil } -func (t *garbageCollectorTrait) garbageCollectResources(e *Environment) { +func (t *garbageCollectorTrait) garbageCollectResources(e *Environment) error { + deletableGVKs, err := t.getDeletableTypes(e) + if err != nil { + return fmt.Errorf("cannot discover GVK types: %v", err) + } + integration, _ := labels.NewRequirement(v1.IntegrationLabel, selection.Equals, []string{e.Integration.Name}) generation, err := labels.NewRequirement("camel.apache.org/generation", selection.LessThan, []string{strconv.FormatInt(e.Integration.GetGeneration(), 10)}) if err != nil { - t.L.ForIntegration(e.Integration).Errorf(err, "cannot determine generation requirement") - return + return fmt.Errorf("cannot determine generation requirement: %v", err) } selector := labels.NewSelector(). Add(*integration). Add(*generation) - deletableGVKs, err := t.getDeletableTypes(e) - if err != nil { - t.L.ForIntegration(e.Integration).Errorf(err, "cannot discover GVK types") - return - } - - t.deleteEachOf(deletableGVKs, e, selector) + return t.deleteEachOf(e.Ctx, deletableGVKs, e, selector) } -func (t *garbageCollectorTrait) deleteEachOf(gvks map[schema.GroupVersionKind]struct{}, e *Environment, selector labels.Selector) { - for gvk := range gvks { +func (t *garbageCollectorTrait) deleteEachOf(ctx context.Context, GVKs map[schema.GroupVersionKind]struct{}, e *Environment, selector labels.Selector) error { + for GVK := range GVKs { resources := unstructured.UnstructuredList{ Object: map[string]interface{}{ - "apiVersion": gvk.GroupVersion().String(), - "kind": gvk.Kind, + "apiVersion": GVK.GroupVersion().String(), + "kind": GVK.Kind,
[camel-k] 05/06: fix: Use status change predicate to filter updates on owned resources
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 7cdb9220be7a7aa02e55dc2e38dd10ed2572a21b Author: Antonin Stefanutti AuthorDate: Wed May 18 09:15:20 2022 +0200 fix: Use status change predicate to filter updates on owned resources (cherry picked from commit 85483d4054457dad390b691c95a78cd2087a728b) --- .../integration/integration_controller.go | 7 ++- pkg/controller/integration/predicate.go| 57 ++ 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go index fb2dd202c..45aa0828c 100644 --- a/pkg/controller/integration/integration_controller.go +++ b/pkg/controller/integration/integration_controller.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/builder" ctrl "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/event" @@ -203,9 +202,9 @@ func add(mgr manager.Manager, c client.Client, r reconcile.Reconciler) error { return requests })). // Watch for the owned Deployments - Owns({}). + Owns({}, builder.WithPredicates(StatusChangedPredicate{})). // Watch for the owned CronJobs - Owns({}). + Owns({}, builder.WithPredicates(StatusChangedPredicate{})). // Watch for the Integration Pods Watches({Type: {}}, handler.EnqueueRequestsFromMapFunc(func(a ctrl.Object) []reconcile.Request { @@ -234,7 +233,7 @@ func add(mgr manager.Manager, c client.Client, r reconcile.Reconciler) error { if ok, err = kubernetes.CheckPermission(ctx, c, serving.GroupName, "services", platform.GetOperatorWatchNamespace(), "", "watch"); err != nil { return err } else if ok { - b.Owns({}) + b.Owns({}, builder.WithPredicates(StatusChangedPredicate{})) } } diff --git a/pkg/controller/integration/predicate.go b/pkg/controller/integration/predicate.go new file mode 100644 index 0..79d61556a --- /dev/null +++ b/pkg/controller/integration/predicate.go @@ -0,0 +1,57 @@ +/* +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 integration + +import ( + "reflect" + + "k8s.io/apimachinery/pkg/api/equality" + "sigs.k8s.io/controller-runtime/pkg/event" + "sigs.k8s.io/controller-runtime/pkg/predicate" +) + +// StatusChangedPredicate implements a generic update predicate function on status change. +type StatusChangedPredicate struct { + predicate.Funcs +} + +// Update implements default UpdateEvent filter for validating status change. +func (StatusChangedPredicate) Update(e event.UpdateEvent) bool { + if e.ObjectOld == nil { + Log.Error(nil, "Update event has no old object to update", "event", e) + return false + } + if e.ObjectNew == nil { + Log.Error(nil, "Update event has no new object to update", "event", e) + return false + } + + s1 := reflect.ValueOf(e.ObjectOld).Elem().FieldByName("Status") + if !s1.IsValid() { + Log.Error(nil, "Update event old object has no Status field", "event", e) + return false + } + + s2 := reflect.ValueOf(e.ObjectNew).Elem().FieldByName("Status") + if !s2.IsValid() { + Log.Error(nil, "Update event new object has no Status field", "event", e) + return false + } + + return !equality.Semantic.DeepDerivative(s1.Interface(), s2.Interface()) +}
[camel-k] 04/06: feat(gc): Skip GC for first integration generation
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 3b5d83595c56cc93527931506d64eef7be934ecb Author: Antonin Stefanutti AuthorDate: Thu Jun 2 10:02:29 2022 +0200 feat(gc): Skip GC for first integration generation (cherry picked from commit 0dd6d8cb68d771ddfabb81a19a5d104e08b3e451) --- pkg/trait/gc.go | 46 +- pkg/trait/gc_test.go | 16 ++-- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index a088367fb..ef20ae7b1 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -93,34 +93,30 @@ func (t *garbageCollectorTrait) Configure(e *Environment) (bool, error) { } func (t *garbageCollectorTrait) Apply(e *Environment) error { - switch e.Integration.Status.Phase { - - case v1.IntegrationPhaseDeploying, v1.IntegrationPhaseRunning, v1.IntegrationPhaseError: + if e.IntegrationInRunningPhases() && e.Integration.GetGeneration() > 1 { // Register a post action that deletes the existing resources that are labelled - // with the previous integration generations. - // TODO: this should be refined so that it's run when all the replicas for the newer generation - // are ready. + // with the previous integration generation(s). + // We make the assumption generation is a monotonically increasing strictly positive integer, + // in which case we can skip garbage collection on the first generation. + // TODO: this should be refined so that it's run when all the replicas for the newer generation are ready. e.PostActions = append(e.PostActions, func(env *Environment) error { return t.garbageCollectResources(env) }) + } - fallthrough - - default: - // Register a post processor that adds the required labels to the new resources - e.PostProcessors = append(e.PostProcessors, func(env *Environment) error { - generation := strconv.FormatInt(env.Integration.GetGeneration(), 10) - env.Resources.VisitMetaObject(func(resource metav1.Object) { - labels := resource.GetLabels() - // Label the resource with the current integration generation - labels["camel.apache.org/generation"] = generation - // Make sure the integration label is set - labels[v1.IntegrationLabel] = env.Integration.Name - resource.SetLabels(labels) - }) - return nil + // Register a post processor that adds the required labels to the new resources + e.PostProcessors = append(e.PostProcessors, func(env *Environment) error { + generation := strconv.FormatInt(env.Integration.GetGeneration(), 10) + env.Resources.VisitMetaObject(func(resource metav1.Object) { + labels := resource.GetLabels() + // Label the resource with the current integration generation + labels["camel.apache.org/generation"] = generation + // Make sure the integration label is set + labels[v1.IntegrationLabel] = env.Integration.Name + resource.SetLabels(labels) }) - } + return nil + }) return nil } @@ -222,12 +218,12 @@ func (t *garbageCollectorTrait) getDeletableTypes(e *Environment) (map[schema.Gr // Retrieve the permissions granted to the operator service account. // We assume the operator has only to garbage collect the resources it has created. - srr := { + ssrr := { Spec: authorization.SelfSubjectRulesReviewSpec{ Namespace: e.Integration.Namespace, }, } - res, err := e.Client.AuthorizationV1().SelfSubjectRulesReviews().Create(e.Ctx, srr, metav1.CreateOptions{}) + ssrr, err = e.Client.AuthorizationV1().SelfSubjectRulesReviews().Create(e.Ctx, ssrr, metav1.CreateOptions{}) if err != nil { return nil, err } @@ -236,7 +232,7 @@ func (t *garbageCollectorTrait) getDeletableTypes(e *Environment) (map[schema.Gr for _, APIResourceList := range APIResourceLists { for _, resource := range APIResourceList.APIResources { rule: - for _, rule := range res.Status.ResourceRules { + for _, rule := range ssrr.Status.ResourceRules { if
[camel-k] 03/06: chore(gc): Fix lint errors
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d5711f64407ba4c9cc202fabc5709a3da1564e8c Author: Antonin Stefanutti AuthorDate: Wed Jun 1 19:07:20 2022 +0200 chore(gc): Fix lint errors (cherry picked from commit 8a267fc3eb4de93d7a1a56f963870babb224f0d6) --- pkg/trait/gc.go | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index 6ca3af790..a088367fb 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -27,9 +27,9 @@ import ( "sync" "time" + "github.com/pkg/errors" "golang.org/x/time/rate" - "github.com/apache/camel-k/pkg/util" authorization "k8s.io/api/authorization/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -43,6 +43,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util" ) var ( @@ -127,13 +128,13 @@ func (t *garbageCollectorTrait) Apply(e *Environment) error { func (t *garbageCollectorTrait) garbageCollectResources(e *Environment) error { deletableGVKs, err := t.getDeletableTypes(e) if err != nil { - return fmt.Errorf("cannot discover GVK types: %v", err) + return errors.Wrap(err, "cannot discover GVK types") } integration, _ := labels.NewRequirement(v1.IntegrationLabel, selection.Equals, []string{e.Integration.Name}) generation, err := labels.NewRequirement("camel.apache.org/generation", selection.LessThan, []string{strconv.FormatInt(e.Integration.GetGeneration(), 10)}) if err != nil { - return fmt.Errorf("cannot determine generation requirement: %v", err) + return errors.Wrap(err, "cannot determine generation requirement") } selector := labels.NewSelector(). Add(*integration). @@ -142,8 +143,8 @@ func (t *garbageCollectorTrait) garbageCollectResources(e *Environment) error { return t.deleteEachOf(e.Ctx, deletableGVKs, e, selector) } -func (t *garbageCollectorTrait) deleteEachOf(ctx context.Context, GVKs map[schema.GroupVersionKind]struct{}, e *Environment, selector labels.Selector) error { - for GVK := range GVKs { +func (t *garbageCollectorTrait) deleteEachOf(ctx context.Context, deletableGVKs map[schema.GroupVersionKind]struct{}, e *Environment, selector labels.Selector) error { + for GVK := range deletableGVKs { resources := unstructured.UnstructuredList{ Object: map[string]interface{}{ "apiVersion": GVK.GroupVersion().String(), @@ -156,7 +157,7 @@ func (t *garbageCollectorTrait) deleteEachOf(ctx context.Context, GVKs map[schem } if err := t.Client.List(ctx, , options...); err != nil { if !k8serrors.IsNotFound(err) { - return fmt.Errorf("cannot list child resources: %v", err) + return errors.Wrap(err, "cannot list child resources") } continue }
[camel-k] branch release-1.8.x updated (2d8ba4839 -> 8f64c6b53)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch release-1.8.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 2d8ba4839 [TEST] Add kamel reset test new f841aa6d9 feat(gc): Use SelfSubjectRulesReview to scan for garbage collectable resources new 92ef377dc feat(gc): Rate limit Discovery and SelfSubjectRulesReview requests new d5711f644 chore(gc): Fix lint errors new 3b5d83595 feat(gc): Skip GC for first integration generation new 7cdb9220b fix: Use status change predicate to filter updates on owned resources new 8f64c6b53 chore(trait): Add an option to disable SSA in deployer trait The 6 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: docs/modules/traits/pages/deployer.adoc| 5 + go.mod | 1 + go.sum | 3 +- pkg/cmd/run_test.go| 4 +- .../integration/integration_controller.go | 7 +- pkg/controller/integration/predicate.go| 57 +++ pkg/resources/resources.go | 4 +- pkg/trait/deployer.go | 5 +- pkg/trait/gc.go| 183 - pkg/trait/gc_test.go | 16 +- resources/traits.yaml | 5 + 11 files changed, 201 insertions(+), 89 deletions(-) create mode 100644 pkg/controller/integration/predicate.go
[GitHub] [camel-k] tadayosi merged pull request #3405: [Backport 1.8.x] dev sandbox fixes
tadayosi merged PR #3405: URL: https://github.com/apache/camel-k/pull/3405 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new aa7eb7f4eb9 Regen aa7eb7f4eb9 is described below commit aa7eb7f4eb9fbc0850356a23ae867d2cba70dc3d Author: Claus Ibsen AuthorDate: Thu Jun 30 06:34:01 2022 +0200 Regen --- docs/components/modules/others/examples/json/cxf-transport.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/others/examples/json/cxf-transport.json b/docs/components/modules/others/examples/json/cxf-transport.json index efeb3d1036e..d17681bff01 12 --- a/docs/components/modules/others/examples/json/cxf-transport.json +++ b/docs/components/modules/others/examples/json/cxf-transport.json @@ -1 +1 @@ -../../../../../../components/camel-cxf/camel-cxf-spring-transport/src/generated/resources/cxf-transport.json \ No newline at end of file +../../../../../../components/camel-cxf/camel-cxf-transport/src/generated/resources/cxf-transport.json \ No newline at end of file
[GitHub] [camel-karaf] davsclaus merged pull request #168: [Github Actions] Periodic Sync Camel Karaf Main Branch
davsclaus merged PR #168: URL: https://github.com/apache/camel-karaf/pull/168 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch main updated: [create-pull-request] automated change (#168)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new fb55a29f [create-pull-request] automated change (#168) fb55a29f is described below commit fb55a29fe700682e46025f6fdc0ae92aba5370f8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jun 30 06:33:45 2022 +0200 [create-pull-request] automated change (#168) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../camel/catalog/karaf/components.properties | 1 - .../apache/camel/catalog/karaf/components/cxf.json | 79 -- 2 files changed, 80 deletions(-) diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties index 0c6e9f81..54a5fd59 100644 --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties +++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties @@ -47,7 +47,6 @@ corda couchdb cron crypto -cxf dataformat dataset digitalocean diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json deleted file mode 100644 index 50b823b8.. --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "component": { -"kind": "component", -"name": "cxf", -"title": "CXF", -"description": "Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.", -"deprecated": false, -"firstVersion": "1.0.0", -"label": "soap,webservice", -"javaType": "org.apache.camel.component.cxf.CxfComponent", -"supportLevel": "Stable", -"groupId": "org.apache.camel", -"artifactId": "camel-cxf", -"version": "3.18.0-SNAPSHOT", -"scheme": "cxf", -"extendsScheme": "", -"syntax": "cxf:beanId:address", -"async": true, -"api": false, -"consumerOnly": false, -"producerOnly": false, -"lenientProperties": false - }, - "componentProperties": { -"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 me [...] -"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...] -"allowStreaming": { "kind": "property", "displayName": "Allow Streaming", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "description": "This option controls whether the CXF component, when running in PAYLOAD mode, will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some [...] -"autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] -"headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
[GitHub] [camel-karaf] davsclaus merged pull request #167: [CAMEL-9627]update camel-cxf karaf feauture
davsclaus merged PR #167: URL: https://github.com/apache/camel-karaf/pull/167 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch main updated: [CAMEL-9627]update camel-cxf karaf feauture (#167)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 1e692e68 [CAMEL-9627]update camel-cxf karaf feauture (#167) 1e692e68 is described below commit 1e692e683facc122eee2aa2e7e17e204b7857c80 Author: Freeman(Yue) Fang AuthorDate: Thu Jun 30 00:33:30 2022 -0400 [CAMEL-9627]update camel-cxf karaf feauture (#167) --- platforms/karaf/features/src/main/resources/features.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index fdb4a31c..35c542ef 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -18,7 +18,7 @@ --> http://karaf.apache.org/xmlns/features/v1.5.0; name='camel-${project.version}'> - mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version-range}/xml/features + mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features mvn:org.ops4j.pax.cdi/pax-cdi-features/[1,2)/xml/features @@ -718,7 +718,9 @@ cxf-features-logging mvn:org.apache.camel/camel-attachments/${project.version} mvn:org.apache.camel/camel-http-base/${project.version} -mvn:org.apache.camel/camel-cxf/${project.version} +mvn:org.apache.camel/camel-cxf-common/${project.version} +mvn:org.apache.camel/camel-cxf-soap/${project.version} +mvn:org.apache.camel/camel-cxf-rest/${project.version} mvn:org.apache.camel/camel-cxf-transport/${project.version} mvn:org.apache.camel.karaf/camel-cxf-blueprint/${project.version} mvn:org.apache.camel.karaf/camel-cxf-transport-blueprint/${project.version}
[GitHub] [camel-k] tadayosi opened a new pull request, #3409: chore(ci): regen docs & add generate workflow to test `make generate`
tadayosi opened a new pull request, #3409: URL: https://github.com/apache/camel-k/pull/3409 **Release Note** ```release-note NONE ``` -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] github-actions[bot] closed pull request #1387: [Github Actions] Periodic Sync Camel-kafka-connector main Branch
github-actions[bot] closed pull request #1387: [Github Actions] Periodic Sync Camel-kafka-connector main Branch URL: https://github.com/apache/camel-kafka-connector/pull/1387 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch automatic-periodic-sync updated (57ffaef65 -> eb9c37383)
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-kafka-connector.git omit 57ffaef65 [create-pull-request] automated change This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/automatic-periodic-sync (eb9c37383) \ O -- O -- O (57ffaef65) 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: .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java | 3 ++- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java | 3 ++- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java | 3 ++- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java | 3 ++- .../kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java | 3 ++- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java | 3 ++- .../CamelAwsddbstreamssourceSourceConnectorConfig.java | 3 ++- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java| 3 ++- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java | 3 ++- .../kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java | 3 ++- .../CamelAwskinesisfirehosesinkSinkConnector.java | 3 ++- .../CamelAwskinesisfirehosesinkSinkConnectorConfig.java| 3 ++- .../awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java| 3 ++- .../awskinesissink/CamelAwskinesissinkSinkConnector.java | 3 ++- .../awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java | 3 ++- .../awskinesissource/CamelAwskinesissourceSourceConnector.java | 3 ++- .../awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java | 3 ++- .../awskinesissource/CamelAwskinesissourceSourceTask.java | 3 ++- .../kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java | 3 ++- .../awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java | 3 ++- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java | 3 ++- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java | 3 ++- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java | 3 ++- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnectorConfig.java | 3 ++- .../awsredshiftsource/CamelAwsredshiftsourceSourceTask.java| 3 ++- .../camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java| 3 ++- .../kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java| 3 ++- .../apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java | 3 ++- .../kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java| 3 ++- .../awss3source/CamelAwss3sourceSourceConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awss3source/CamelAwss3sourceSourceTask.java | 3 ++- .../CamelAwss3streaminguploadsinkSinkConnector.java| 3 ++- .../CamelAwss3streaminguploadsinkSinkConnectorConfig.java | 3 ++- .../CamelAwss3streaminguploadsinkSinkTask.java | 3 ++- .../awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java | 3 ++- .../CamelAwssecretsmanagersinkSinkConnectorConfig.java | 3 ++- .../awssecretsmanagersink/CamelAwssecretsmanagersinkSinkTask.java | 3 ++- .../camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java | 3 ++- .../kafkaconnector/awssessink/CamelAwssessinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java | 3 ++- .../awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java | 3 ++- .../awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkTask.java | 3 ++- .../camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java | 3 ++- .../kafkaconnector/awssnssink/CamelAwssnssinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkTask.java | 3 ++- .../awssqsbatchsink/CamelAwssqsbatchsinkSinkConnector.java | 3 ++- .../awssqsbatchsink/CamelAwssqsbatchsinkSinkConnectorConfig.java | 3 ++-
[GitHub] [camel-k] tadayosi closed issue #3236: `make generate-doc` doesn't update CRD API doc when using Go 1.16.x
tadayosi closed issue #3236: `make generate-doc` doesn't update CRD API doc when using Go 1.16.x URL: https://github.com/apache/camel-k/issues/3236 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on issue #3236: `make generate-doc` doesn't update CRD API doc when using Go 1.16.x
tadayosi commented on issue #3236: URL: https://github.com/apache/camel-k/issues/3236#issuecomment-1170716565 Should be fixed once #2845. I go ahead and close this. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new aa890af7cd Updated CHANGELOG.md aa890af7cd is described below commit aa890af7cd0db69807afa6a8b85d9b8325047cff Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jun 30 03:43:12 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 38 +++--- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e0d3efafa..bc9b5fc474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,23 +2,22 @@ ## [Unreleased](https://github.com/apache/camel-quarkus/tree/HEAD) -[Full Changelog](https://github.com/apache/camel-quarkus/compare/2.10.0...HEAD) - -**Fixed bugs:** - -- PDF extension encryption does not work in native mode [\#3871](https://github.com/apache/camel-quarkus/issues/3871) +[Full Changelog](https://github.com/apache/camel-quarkus/compare/2.7.2...HEAD) **Closed issues:** -- 2.10.0 not able to boot NoClassDefFoundError: org/apache/camel/builder/ErrorHandlerBuilder [\#3870](https://github.com/apache/camel-quarkus/issues/3870) -- arangodb integration tests failing with can not start container [\#3864](https://github.com/apache/camel-quarkus/issues/3864) -- quarkus-bootstrap-maven-plugin is deprecated [\#3863](https://github.com/apache/camel-quarkus/issues/3863) -- paho-mqtt5 test failing with `Error: Unable to create websockets listener on port 9001` [\#3860](https://github.com/apache/camel-quarkus/issues/3860) -- Camel TypeConverterLoader in native mode [\#3857](https://github.com/apache/camel-quarkus/issues/3857) -- Reduce the number of `timer-log` example projects [\#3708](https://github.com/apache/camel-quarkus/issues/3708) +- Upgrade quarkus-artemis to 1.2.0 [\#3884](https://github.com/apache/camel-quarkus/issues/3884) +- Consider removing configuration for `camel.main.source-location-enabled` [\#3858](https://github.com/apache/camel-quarkus/issues/3858) +- Clarify usage of Quarkus Quartz clustering support [\#3850](https://github.com/apache/camel-quarkus/issues/3850) **Merged pull requests:** +- Fix \#3858 rename to quarkus.camel.source-location-enabled [\#3886](https://github.com/apache/camel-quarkus/pull/3886) ([zhfeng](https://github.com/zhfeng)) +- Fix \#3884 upgrade quarkus-artemis to 1.2.0 [\#3885](https://github.com/apache/camel-quarkus/pull/3885) ([zhfeng](https://github.com/zhfeng)) +- Remove redundant Spring dependencies from JDBC extension [\#3883](https://github.com/apache/camel-quarkus/pull/3883) ([jamesnetherton](https://github.com/jamesnetherton)) +- Simplify support for Quartz clustering [\#3882](https://github.com/apache/camel-quarkus/pull/3882) ([jamesnetherton](https://github.com/jamesnetherton)) +- Parametrize infinispan image [\#3881](https://github.com/apache/camel-quarkus/pull/3881) ([llowinge](https://github.com/llowinge)) +- Upgrade artemiscloud/activemq-artemis-broker to 1.0.5 [\#3880](https://github.com/apache/camel-quarkus/pull/3880) ([zhfeng](https://github.com/zhfeng)) - Ensure new extensions are generated to reference quarkus-extension-maven-plugin [\#3874](https://github.com/apache/camel-quarkus/pull/3874) ([jamesnetherton](https://github.com/jamesnetherton)) - Remove redundant BOM imports from integration tests [\#3873](https://github.com/apache/camel-quarkus/pull/3873) ([jamesnetherton](https://github.com/jamesnetherton)) - Fix PDF encryption in native mode [\#3872](https://github.com/apache/camel-quarkus/pull/3872) ([jamesnetherton](https://github.com/jamesnetherton)) @@ -1121,6 +1120,23 @@ - org.apache.camel.quarkus.main.CamelMainApplication should be registered for reflection [\#1454](https://github.com/apache/camel-quarkus/pull/1454) ([lburgazzoli](https://github.com/lburgazzoli)) - Document how to use mock in JVM mode tests \#1449 [\#1452](https://github.com/apache/camel-quarkus/pull/1452) ([JiriOndrusek](https://github.com/JiriOndrusek)) +## [2.7.2](https://github.com/apache/camel-quarkus/tree/2.7.2) (2022-06-29) + +[Full Changelog](https://github.com/apache/camel-quarkus/compare/2.10.0...2.7.2) + +**Fixed bugs:** + +- PDF extension encryption does not work in native mode [\#3871](https://github.com/apache/camel-quarkus/issues/3871) + +**Closed issues:** + +- 2.10.0 not able to boot NoClassDefFoundError: org/apache/camel/builder/ErrorHandlerBuilder [\#3870](https://github.com/apache/camel-quarkus/issues/3870) +- arangodb integration tests failing with can not start container [\#3864](https://github.com/apache/camel-quarkus/issues/3864) +- quarkus-bootstrap-maven-plugin is deprecated [\#3863](https://github.com/apache/camel-quarkus/issues/3863) +- paho-mqtt5 test failing with `Error: Unable to create websockets listener on port 9001`
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 4c25f464 Updated CHANGELOG.md 4c25f464 is described below commit 4c25f4646a47d096f0fc3bc840956d78a1961360 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jun 30 03:33:27 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58a33000..d815548e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ **Merged pull requests:** +- chore\(deps\): Bump dependency versions [\#840](https://github.com/apache/camel-k-runtime/pull/840) ([christophd](https://github.com/christophd)) - build\(deps\): bump maven-common-artifact-filters from 3.2.0 to 3.3.0 [\#834](https://github.com/apache/camel-k-runtime/pull/834) ([dependabot[bot]](https://github.com/apps/dependabot)) - Add new module for structural Maven logging [\#833](https://github.com/apache/camel-k-runtime/pull/833) ([christophd](https://github.com/christophd)) - build\(deps\): bump maven-enforcer-plugin from 3.0.0 to 3.1.0 [\#832](https://github.com/apache/camel-k-runtime/pull/832) ([dependabot[bot]](https://github.com/apps/dependabot))
[GitHub] [camel-k] tadayosi commented on pull request #3403: allow setting resources & securityContext in Helm Chart values
tadayosi commented on PR #3403: URL: https://github.com/apache/camel-k/pull/3403#issuecomment-1170702498 As I don't know much about helm I cannot check if it's ok or not. Can anyone review this? @squakez @phantomjinx -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng commented on issue #3809: Configuration of ActiveMQ broker URL properties may require reflective access
zhfeng commented on issue #3809: URL: https://github.com/apache/camel-quarkus/issues/3809#issuecomment-1170701647 It looks like we need to add all implementor of `Transport` and `org.apache.activemq.command.ConsumerInfo`, maybe others. `activemq` uses `IntrospectionSupport.setProperties` to do the reflection, I'm invesigating it is used. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Fix #3858 rename to quarkus.camel.source-location-enabled (#3886)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new fa14018903 Fix #3858 rename to quarkus.camel.source-location-enabled (#3886) fa14018903 is described below commit fa140189032562b31def771eeacc75c8f484e1b9 Author: Amos Feng AuthorDate: Thu Jun 30 11:06:06 2022 +0800 Fix #3858 rename to quarkus.camel.source-location-enabled (#3886) --- docs/modules/ROOT/pages/reference/extensions/core.adoc | 6 ++ .../apache/camel/quarkus/core/deployment/CamelContextProcessor.java | 6 -- .../camel/quarkus/core/deployment/CamelSourceLocationTest.java | 2 +- .../src/main/java/org/apache/camel/quarkus/core/CamelConfig.java| 6 ++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc index 436f8d4c1c..1a92ce4cac 100644 --- a/docs/modules/ROOT/pages/reference/extensions/core.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc @@ -254,6 +254,12 @@ Whether to enable the bridging of Camel events to CDI events. | `boolean` | `true` +|icon:lock[title=Fixed at build time] [[quarkus.camel.source-location-enabled]]`link:#quarkus.camel.source-location-enabled[quarkus.camel.source-location-enabled]` + +Build time configuration options for enable/disable camel source location +| `boolean` +| `false` + |icon:lock[title=Fixed at build time] [[quarkus.camel.main.shutdown.timeout]]`link:#quarkus.camel.main.shutdown.timeout[quarkus.camel.main.shutdown.timeout]` A timeout (with millisecond precision) to wait for `CamelMain++#++stop()` to finish diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java index 674b4c8275..9bcfc024c8 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java @@ -112,7 +112,7 @@ public class CamelContextProcessor { } /** - * Enable source location if camel.quarkus.source-location-enabled=true + * Enable source location if quarkus.camel.source-location-enabled=true * * @param recorder the recorder * @param producer producer of context customizer build item @@ -177,9 +177,11 @@ public class CamelContextProcessor { } public static final class SourceLocationEnabled implements BooleanSupplier { +CamelConfig config; + @Override public boolean getAsBoolean() { -return CamelSupport.getOptionalConfigValue("camel.quarkus.source-location-enabled", Boolean.class, false); +return config.sourceLocationEnabled; } } } diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelSourceLocationTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelSourceLocationTest.java index a643be9f10..6dafc2d327 100644 --- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelSourceLocationTest.java +++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelSourceLocationTest.java @@ -49,7 +49,7 @@ public class CamelSourceLocationTest { Writer writer = new StringWriter(); Properties props = new Properties(); -props.setProperty("camel.quarkus.source-location-enabled", "true"); +props.setProperty("quarkus.camel.source-location-enabled", "true"); try { props.store(writer, ""); diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java index 0249167f5d..9c62934b18 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java @@ -72,6 +72,12 @@ public class CamelConfig { @ConfigItem public EventBridgeConfig eventBridge; +/** + * Build time configuration options for enable/disable camel source location + */ +@ConfigItem(defaultValue = "false") +public boolean sourceLocationEnabled; + @ConfigGroup public static class BootstrapConfig { /**
[GitHub] [camel-quarkus] zhfeng closed issue #3858: Consider removing configuration for `camel.main.source-location-enabled`
zhfeng closed issue #3858: Consider removing configuration for `camel.main.source-location-enabled` URL: https://github.com/apache/camel-quarkus/issues/3858 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng merged pull request #3886: Fix #3858 rename to quarkus.camel.source-location-enabled
zhfeng merged PR #3886: URL: https://github.com/apache/camel-quarkus/pull/3886 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Fix #3884 upgrade quarkus-artemis to 1.2.0 (#3885)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 152221f018 Fix #3884 upgrade quarkus-artemis to 1.2.0 (#3885) 152221f018 is described below commit 152221f018ac68578d51eebe342d899166954483 Author: Amos Feng AuthorDate: Thu Jun 30 11:05:54 2022 +0800 Fix #3884 upgrade quarkus-artemis to 1.2.0 (#3885) --- integration-tests/jms-artemis-client/pom.xml | 5 - .../camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java| 5 - integration-tests/jta/pom.xml | 5 - .../component/jta/it/XAConnectionFactoryConfiguration.java| 8 ++-- integration-tests/jta/src/main/resources/application.properties | 3 +++ .../java/org/apache/camel/quarkus/component/jta/it/JtaTest.java | 5 - integration-tests/sjms-artemis-client/pom.xml | 5 - .../camel/quarkus/component/sjms/artemis/it/SjmsArtemisTest.java | 5 - integration-tests/sjms2-artemis-client/pom.xml| 5 - .../quarkus/component/sjms2/artemis/it/Sjms2ArtemisTest.java | 5 - pom.xml | 2 +- 11 files changed, 6 insertions(+), 47 deletions(-) diff --git a/integration-tests/jms-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml index b28a31cbbb..5e4837e0aa 100644 --- a/integration-tests/jms-artemis-client/pom.xml +++ b/integration-tests/jms-artemis-client/pom.xml @@ -65,11 +65,6 @@ rest-assured test - -org.apache.camel.quarkus - camel-quarkus-integration-tests-support-activemq -test - diff --git a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java index 15bbf7e34a..2c32a22daa 100644 --- a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java +++ b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisTest.java @@ -16,20 +16,15 @@ */ package org.apache.camel.quarkus.component.jms.artemis.it; -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.common.ResourceArg; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import org.apache.camel.quarkus.messaging.jms.AbstractJmsMessagingTest; -import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; @QuarkusTest -@QuarkusTestResource(initArgs = { -@ResourceArg(name = "modules", value = "quarkus.artemis") }, value = ActiveMQTestResource.class) class JmsArtemisTest extends AbstractJmsMessagingTest { @Test diff --git a/integration-tests/jta/pom.xml b/integration-tests/jta/pom.xml index 1ec2f78734..f64cfd0d21 100644 --- a/integration-tests/jta/pom.xml +++ b/integration-tests/jta/pom.xml @@ -84,11 +84,6 @@ rest-assured test - -org.apache.camel.quarkus - camel-quarkus-integration-tests-support-activemq -test - diff --git a/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java b/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java index f5d487ba6c..3b78dab297 100644 --- a/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java +++ b/integration-tests/jta/src/main/java/org/apache/camel/quarkus/component/jta/it/XAConnectionFactoryConfiguration.java @@ -23,8 +23,6 @@ import javax.jms.ConnectionFactory; import javax.jms.XAConnectionFactory; import javax.transaction.TransactionManager; -import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig; -import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory; import org.jboss.narayana.jta.jms.ConnectionFactoryProxy; import org.jboss.narayana.jta.jms.TransactionHelperImpl; @@ -35,10 +33,8 @@ public class XAConnectionFactoryConfiguration { // And the ConnectionFactory could be integrated with TransactionManager @Produces @Named("xaConnectionFactory") -public ConnectionFactory getXAConnectionFactory(TransactionManager tm, ArtemisRuntimeConfig config) { -XAConnectionFactory cf = new ActiveMQXAConnectionFactory( -config.url, config.username.orElse(null),
[GitHub] [camel-quarkus] zhfeng closed issue #3884: Upgrade quarkus-artemis to 1.2.0
zhfeng closed issue #3884: Upgrade quarkus-artemis to 1.2.0 URL: https://github.com/apache/camel-quarkus/issues/3884 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng merged pull request #3885: Fix #3884 upgrade quarkus-artemis to 1.2.0
zhfeng merged PR #3885: URL: https://github.com/apache/camel-quarkus/pull/3885 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on issue #3127: Log a warn message once the component used has not a quarkus extension
tadayosi commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1170695183 It's still a nice-to-have and shouldn't be stale. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] barius commented on issue #1238: Multi-architecture support
barius commented on issue #1238: URL: https://github.com/apache/camel-k/issues/1238#issuecomment-1170653027 @squakez yes pls take a look #3408 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] barius opened a new issue, #3408: Buildah pods will wait for Istio container to finish then timeout
barius opened a new issue, #3408: URL: https://github.com/apache/camel-k/issues/3408 When Istio auto-injection is enabled, the camel-k builder always wait for the Istio container to complete (which will never happen), and triggers the default 5 min timeout (though Buildah finished in around 1~2 min and after the timeout the build still succeeds). Using #3309 built on a M1 Max Macbook, with self-built arm64 version of quarkus-mandrel (that does not seems the culprit?), Docker Desktop 4.9. Haven't tested other builds yet. My install command is ``` kamel install --build-publish-strategy=Buildah --registry host.docker.internal:15000 --registry-insecure --operator-image host.docker.internal:15000/bariusss/camel-k:1.10.0-SNAPSHOT --maven-repository "http://nexus.nexus.svc.cluster.local/repository/maven-central/@id=nexus@name=nexus@mirrorOf=central; ``` -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karaf] github-actions[bot] opened a new pull request, #168: [Github Actions] Periodic Sync Camel Karaf Main Branch
github-actions[bot] opened a new pull request, #168: URL: https://github.com/apache/camel-karaf/pull/168 Periodic Sync of Camel Karaf Main Branch with main Camel Main. see https://github.com/apache/camel-karaf/blob/main/.github/workflows/automatic-sync-main.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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch automatic-periodic-sync updated (18488f15 -> d444312f)
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-karaf.git from 18488f15 [create-pull-request] automated change (#166) add d444312f [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../camel/catalog/karaf/components.properties | 1 - .../apache/camel/catalog/karaf/components/cxf.json | 79 -- 2 files changed, 80 deletions(-) delete mode 100644 catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json
[camel-spring-boot] branch automatic-periodic-sync updated (6acd15dc29e -> 69348f7927c)
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 6acd15dc29e [create-pull-request] automated change add 389fcd532f2 [create-pull-request] automated change (#585) add cef3a4b42f9 [CAMEL-9627]to make spring-boot runtime happy (#586) add 32a6a4d8371 Regen add 69348f7927c [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 (6acd15dc29e) \ N -- N -- N refs/heads/automatic-periodic-sync (69348f7927c) 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: .../camel/springboot/catalog/components/cxf.json | 10 +- .../camel/springboot/catalog/components/cxfrs.json | 2 +- .../pom.xml| 21 ++- .../src/main/docs/cxf-rest.json| 63 .../src/main/docs/cxf.json | 0 .../CxfRsComponentAutoConfiguration.java | 0 .../springboot/CxfRsComponentConfiguration.java| 0 .../jaxrs/springboot/CxfRsComponentConverter.java | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../src/main/resources/META-INF/spring.factories | 2 - .../src/main/resources/META-INF/spring.provides| 2 +- .../cxf/jaxrs/testbean/CustomException.java| 27 .../component/cxf/jaxrs/testbean/Customer.java | 75 ++ .../cxf/jaxrs/testbean/CustomerService.java| 153 .../testbean/CustomerServiceNoAnnotations.java | 25 .../jaxrs/testbean/CustomerServiceResource.java| 51 +++ .../component/cxf/jaxrs/testbean/EchoService.java | 41 ++ .../camel/component/cxf/jaxrs/testbean/Order.java | 67 + .../component/cxf/jaxrs/testbean/Product.java | 41 ++ .../component/cxf/jaxrs/testbean/ServiceUtil.java | 24 .../rest/springboot/CxfRsConsumerWithBeanTest.java | 109 ++ .../rest/springboot/CxfRsProducerSessionTest.java | 126 .../cxf/rest/springboot/CxfRsStreamCacheTest.java | 160 + .../routes/CxfRsSpringProducerSession.xml | 53 +++ .../routes/CxfRsSpringProducerSessionRoute.xml | 59 .../pom.xml| 46 +- .../src/main/docs/cxf-soap.json| 69 + .../src/main/docs/cxf.json | 58 +--- .../springboot/CxfComponentAutoConfiguration.java | 4 +- .../springboot/CxfComponentConfiguration.java | 2 +- .../jaxws}/springboot/CxfComponentConverter.java | 2 +- .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../src/main/resources/META-INF/spring.factories} | 7 +- .../src/main/resources/META-INF/spring.provides| 2 +- .../camel/component/cxf/jaxws/HelloService.java| 34 + .../cxf/soap/springboot/CXFMultiPartTest.java | 106 ++ .../soap/springboot/CxfConsumerMessageTest.java| 137 ++ .../CxfConsumerPayLoadConverterTest.java | 98 + .../soap/springboot/CxfConsumerPayloadTest.java| 135 + .../soap/springboot/CxfConsumerProviderTest.java | 129 + .../cxf/soap/springboot/MultiPartInvokeImpl.java | 52 +++ .../cxf/soap/springboot/ServiceProvider.java | 34 + .../springboot/WriteXmlDeclarationInterceptor.java | 38 + .../src/test/resources/MultiPartTest.wsdl | 56 .../src/test/resources/routes/MultiPartTest.xml| 53 +++ .../src/test/resources/routes/multipartRoute.xml | 27 .../camel-cxf-transport-starter/pom.xml| 2 +- components-starter/camel-hbase-starter/pom.xml | 4 + components-starter/camel-soap-starter/pom.xml | 8 +- components-starter/pom.xml | 3 +- tooling/camel-spring-boot-bom/pom.xml | 7 +- tooling/camel-spring-boot-dependencies/pom.xml | 68 +++-- 54 files changed, 2198 insertions(+), 94 deletions(-) copy components-starter/{camel-cxf-starter => camel-cxf-rest-starter}/pom.xml (75%) create mode 100644
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #587: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #587: URL: https://github.com/apache/camel-spring-boot/pull/587 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] dependabot[bot] closed pull request #3392: chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.7.5
dependabot[bot] closed pull request #3392: chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.7.5 URL: https://github.com/apache/camel-k/pull/3392 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] dependabot[bot] commented on pull request #3392: chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.7.5
dependabot[bot] commented on PR #3392: URL: https://github.com/apache/camel-k/pull/3392#issuecomment-1170622493 Superseded by #3407. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/github.com/stretchr/testify-1.8.0 created (now 1e96eca9b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/stretchr/testify-1.8.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 1e96eca9b chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0 No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #3407: chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0
dependabot[bot] opened a new pull request, #3407: URL: https://github.com/apache/camel-k/pull/3407 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.4 to 1.8.0. Commits https://github.com/stretchr/testify/commit/181cea6eab8b2de7071383eca4be32a424db38dd;>181cea6 impr: CallerInfo should print full paths to the terminal (https://github-redirect.dependabot.com/stretchr/testify/issues/1201;>#1201) https://github.com/stretchr/testify/commit/cf1284f8dd6f0bf34eed4ab8808ef88f40f7d00f;>cf1284f Allow mock expectations to be ordered (https://github-redirect.dependabot.com/stretchr/testify/issues/1106;>#1106) https://github.com/stretchr/testify/commit/66eef0ef3adb4691cdc275620c9a129f2f98935a;>66eef0e fix: assert.MapSubset (or just support maps in assert.Subset) (https://github-redirect.dependabot.com/stretchr/testify/issues/1178;>#1178) https://github.com/stretchr/testify/commit/2fab6dffcf101c5a79fc8f3cd67a3541432db5fd;>2fab6df Add WithinTimeRange method (https://github-redirect.dependabot.com/stretchr/testify/issues/1188;>#1188) https://github.com/stretchr/testify/commit/b5ce16571001d6e96e1693ac891fed5c2510c651;>b5ce165 fixing panic in calls to assertion with nil m.mutex (https://github-redirect.dependabot.com/stretchr/testify/issues/1212;>#1212) https://github.com/stretchr/testify/commit/c206b2e823e70c1e4e7ca8eded9e410acc8f71be;>c206b2e Mock can be deadlocked by a panic (https://github-redirect.dependabot.com/stretchr/testify/issues/1157;>#1157) https://github.com/stretchr/testify/commit/1b73601ae8d1c3e389e93092f595b1f6e3d68251;>1b73601 suite: correctly set stats on test panic (https://github-redirect.dependabot.com/stretchr/testify/issues/1195;>#1195) https://github.com/stretchr/testify/commit/ba1076d8b3b67cdaf7bf92c95b3641636a039be2;>ba1076d Add .Unset method to mock (https://github-redirect.dependabot.com/stretchr/testify/issues/982;>#982) https://github.com/stretchr/testify/commit/c31ea0312f8a96ca55801db5ebdf62119800fb70;>c31ea03 Support comparing byte slice (https://github-redirect.dependabot.com/stretchr/testify/issues/1202;>#1202) See full diff in https://github.com/stretchr/testify/compare/v1.7.4...v1.8.0;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/stretchr/testify=go_modules=1.7.4=1.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #3127: Log a warn message once the component used has not a quarkus extension
github-actions[bot] commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1170615908 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #3147: Service Binding trait usage example
github-actions[bot] commented on issue #3147: URL: https://github.com/apache/camel-k/issues/3147#issuecomment-1170615895 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #402: Improvements
mgubaidullin merged PR #402: URL: https://github.com/apache/camel-karavan/pull/402 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7942: Documentation of XQuery, Timer components - typos and formatting
github-actions[bot] commented on PR #7942: URL: https://github.com/apache/camel/pull/7942#issuecomment-1170569709 :warning: This PR changes Camel components and will be tested automatically. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] lfabriko opened a new pull request, #7942: Documentation of XQuery, Timer components - typos and formatting
lfabriko opened a new pull request, #7942: URL: https://github.com/apache/camel/pull/7942 - XQuery component: typo, broken link to w3schools tutorial - Timer component: typos, formatting of parameters -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (7fdf3ac65fb -> 472332ce573)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7fdf3ac65fb CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3 add 472332ce573 (chores) camel-quartz: test cleanups (#7941) No new revisions were added by this update. Summary of changes: components/camel-quartz/pom.xml| 5 + .../component/quartz/QuartzAutoStartTest.java | 6 +- .../component/quartz/QuartzRouteRestartTest.java | 8 +- ...pringQuartzPersistentStoreRestartRouteTest.java | 8 +- .../quartz/CronScheduledRoutePolicyTest.java | 553 +++-- .../quartz/SimpleScheduledRoutePolicyTest.java | 426 6 files changed, 513 insertions(+), 493 deletions(-)
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new d8f774ae51b Regen d8f774ae51b is described below commit d8f774ae51bcd4810982f7ca98a2e8c49ff05040 Author: Claus Ibsen AuthorDate: Wed Jun 29 21:37:41 2022 +0200 Regen --- docs/components/modules/others/examples/json/cxf-transport.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/others/examples/json/cxf-transport.json b/docs/components/modules/others/examples/json/cxf-transport.json index d17681bff01..efeb3d1036e 12 --- a/docs/components/modules/others/examples/json/cxf-transport.json +++ b/docs/components/modules/others/examples/json/cxf-transport.json @@ -1 +1 @@ -../../../../../../components/camel-cxf/camel-cxf-transport/src/generated/resources/cxf-transport.json \ No newline at end of file +../../../../../../components/camel-cxf/camel-cxf-spring-transport/src/generated/resources/cxf-transport.json \ No newline at end of file
[camel] branch main updated: (chores) camel-quartz: test cleanups (#7941)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 472332ce573 (chores) camel-quartz: test cleanups (#7941) 472332ce573 is described below commit 472332ce5736aa038c2c7bc0ab5377fa7119bd40 Author: Otavio Rodolfo Piske AuthorDate: Wed Jun 29 21:34:45 2022 +0200 (chores) camel-quartz: test cleanups (#7941) * (chores) camel-quartz: replaced Thread.sleep with Awaitility * (chores) camel-quartz: ensure cron tests do run * (chores) camel-quartz: ensure tests in SimpleScheduledRoutePolicyTest do run * (chores) camel-quartz: use assert throws for exception testing --- components/camel-quartz/pom.xml| 5 + .../component/quartz/QuartzAutoStartTest.java | 6 +- .../component/quartz/QuartzRouteRestartTest.java | 8 +- ...pringQuartzPersistentStoreRestartRouteTest.java | 8 +- .../quartz/CronScheduledRoutePolicyTest.java | 553 +++-- .../quartz/SimpleScheduledRoutePolicyTest.java | 426 6 files changed, 513 insertions(+), 493 deletions(-) diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml index d2bfd910746..e9ff5485baf 100644 --- a/components/camel-quartz/pom.xml +++ b/components/camel-quartz/pom.xml @@ -111,6 +111,11 @@ spring-context-support test + +org.awaitility +awaitility +test + diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java index 7f77cfbe254..67e21483b77 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzAutoStartTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.quartz; +import java.util.concurrent.TimeUnit; + import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,7 +35,8 @@ public class QuartzAutoStartTest extends BaseQuartzTest { QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class); assertFalse(quartz.getScheduler().isStarted(), "Should not have started scheduler"); -Thread.sleep(2000); +Awaitility.await().atMost(2, TimeUnit.SECONDS) +.untilAsserted(() -> assertMockEndpointsSatisfied()); assertMockEndpointsSatisfied(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java index ec1030c5fc0..fdac8239c2a 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteRestartTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.quartz; +import java.util.concurrent.TimeUnit; + import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; public class QuartzRouteRestartTest extends BaseQuartzTest { @@ -35,9 +38,8 @@ public class QuartzRouteRestartTest extends BaseQuartzTest { mock.expectedMessageCount(0); // wait a bit -Thread.sleep(2000); - -assertMockEndpointsSatisfied(); +Awaitility.await().atMost(2, TimeUnit.SECONDS) +.untilAsserted(() -> assertMockEndpointsSatisfied()); // start route, and we got messages again mock.reset(); diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java index a4f302fd0af..9743875a92e 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartRouteTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.quartz; +import java.util.concurrent.TimeUnit; + import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.awaitility.Awaitility; import org.junit.jupiter.api.Test;
[GitHub] [camel] davsclaus merged pull request #7941: (chores) camel-quartz: test cleanups
davsclaus merged PR #7941: URL: https://github.com/apache/camel/pull/7941 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7940: Bump hadoop-common from 2.10.2 to 3.2.3 in /components/camel-hbase
github-actions[bot] commented on PR #7940: URL: https://github.com/apache/camel/pull/7940#issuecomment-1170363296 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7941: (chores) camel-quartz: test cleanups
github-actions[bot] commented on PR #7941: URL: https://github.com/apache/camel/pull/7941#issuecomment-1170359627 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (6ba0bce499d -> 7fdf3ac65fb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 6ba0bce499d CAMEL-18249: rename test properties (#7939) add 7fdf3ac65fb CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- components/camel-hbase/pom.xml | 5 + parent/pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #7941: (chores) camel-quartz: test cleanups
github-actions[bot] commented on PR #7941: URL: https://github.com/apache/camel/pull/7941#issuecomment-1170305342 :warning: This PR changes Camel components and will be tested automatically. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #7941: (chores) camel-quartz: test cleanups
orpiske opened a new pull request, #7941: URL: https://github.com/apache/camel/pull/7941 - Fix a few test cases that were not being run - A couple of Thread.sleep removals - Cleanup some exception tests -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7940: Bump hadoop-common from 2.10.2 to 3.2.3 in /components/camel-hbase
github-actions[bot] commented on PR #7940: URL: https://github.com/apache/camel/pull/7940#issuecomment-1170287921 :warning: This PR changes Camel components and will be tested automatically. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch dependabot/maven/components/camel-hbase/org.apache.hadoop-hadoop-common-3.2.3 created (now 8583412295d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/components/camel-hbase/org.apache.hadoop-hadoop-common-3.2.3 in repository https://gitbox.apache.org/repos/asf/camel.git at 8583412295d Bump hadoop-common from 2.10.2 to 3.2.3 in /components/camel-hbase No new revisions were added by this update.
[GitHub] [camel] dependabot[bot] opened a new pull request, #7940: Bump hadoop-common from 2.10.2 to 3.2.3 in /components/camel-hbase
dependabot[bot] opened a new pull request, #7940: URL: https://github.com/apache/camel/pull/7940 Bumps hadoop-common from 2.10.2 to 3.2.3. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.hadoop:hadoop-common=maven=2.10.2=3.2.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel/network/alerts). -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 7fdf3ac65fb CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3 7fdf3ac65fb is described below commit 7fdf3ac65fb8d57682a565b9f31a03d046a182e0 Author: aldettinger AuthorDate: Wed Jun 29 13:23:57 2022 +0200 CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3 --- camel-dependencies/pom.xml | 2 +- components/camel-hbase/pom.xml | 5 + parent/pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 12ecc1ab499..b461b0e7cba 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -244,7 +244,7 @@ 28.2-jre 3.0 29.0-jre -3.3.2 +3.3.3 2.2 2.3 4.2.0 diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml index 05c30c747e5..a3d8e135695 100644 --- a/components/camel-hbase/pom.xml +++ b/components/camel-hbase/pom.xml @@ -36,6 +36,11 @@ org.apache.camel camel-support + +org.apache.hadoop +hadoop-common +2.10.2 + org.apache.hbase hbase-client diff --git a/parent/pom.xml b/parent/pom.xml index b3de11168e2..bc65f373f3e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -224,7 +224,7 @@ 2.9.0 28.2-jre 3.0 -3.3.2 +3.3.3 29.0-jre 2.2 2.3
[GitHub] [camel] aldettinger merged pull request #7928: CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3
aldettinger merged PR #7928: URL: https://github.com/apache/camel/pull/7928 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] aldettinger commented on pull request #7928: CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3
aldettinger commented on PR #7928: URL: https://github.com/apache/camel/pull/7928#issuecomment-1170284618 Ok, let's merge then. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (27f6d2bd93b -> 6ba0bce499d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 27f6d2bd93b (chores) More Thread.sleep cleanups (#7935) add 6ba0bce499d CAMEL-18249: rename test properties (#7939) No new revisions were added by this update. Summary of changes: .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename components/camel-activemq/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-amqp/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-jms/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-mllp/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-paho/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-sjms/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-sjms2/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%) rename components/camel-stomp/src/test/resources/{log4j2.properties => log4j2-test.properties} (100%)
[camel] branch regen_bot updated (16f106350c9 -> 27f6d2bd93b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 16f106350c9 camel-hbase: fix deprecation warnings (#7936) add c99492dcc19 Regen for commit 027e471fdf8cdea3899dfeb30d41dbbc448e8384 (#7938) add 27f6d2bd93b (chores) More Thread.sleep cleanups (#7935) No new revisions were added by this update. Summary of changes: components/camel-hazelcast/pom.xml | 5 +++ .../HazelcastReplicatedmapConsumerTest.java| 7 ++-- .../hl7/HL7MLLPCodecMessageFloodingTest.java | 4 +- ...IrcChat.java => CodehausIrcChatManualTest.java} | 6 +-- .../jetty/JettyContinuationDisabledTest.java | 11 ++ .../JettyEndpointContinuationDisabledTest.java | 11 ++ .../cluster/KubernetesClusterServiceTest.java | 7 ++-- .../cluster/TimedLeaderNotifierTest.java | 44 -- ...bernetesReplicationControllersProducerTest.java | 10 ++--- components/camel-leveldb/pom.xml | 5 +++ .../LevelDBAggregateDiscardOnTimeoutTest.java | 5 ++- ...DBAggregateNotLostRemovedWhenConfirmedTest.java | 8 +++- .../leveldb/LevelDBAggregateNotLostTest.java | 8 +++- 13 files changed, 73 insertions(+), 58 deletions(-) rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{CodehausIrcChat.java => CodehausIrcChatManualTest.java} (97%)
[camel] branch regen_bot updated (a6e570859af -> 16f106350c9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit a6e570859af Regen for commit 027e471fdf8cdea3899dfeb30d41dbbc448e8384 add b0170fddb2e Regen for commit eb0acef79b59e12843bef08c27cd3a352ccd2a42 (#7933) add f5ca4dbace4 CAMEL-18248: @BeanInject can inject ProducerTemplate/FluentProducerTemplate/ConsumerTemplate add ebb9d8cdf8c Regen for commit eb0acef79b59e12843bef08c27cd3a352ccd2a42 (#7934) add 16f106350c9 camel-hbase: fix deprecation warnings (#7936) 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 (a6e570859af) \ N -- N -- N refs/heads/regen_bot (16f106350c9) 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: .../camel/component/hbase/HBaseProducer.java | 4 +-- .../hbase/mapping/CellMappingStrategyFactory.java | 2 +- .../impl/engine/CamelPostProcessorHelper.java | 27 +++ ...st.java => BeanInjectProducerTemplateTest.java} | 31 ++ 4 files changed, 38 insertions(+), 26 deletions(-) copy core/camel-core/src/test/java/org/apache/camel/impl/{BeanInjectRouteBuilderTest.java => BeanInjectProducerTemplateTest.java} (65%)
[camel-spring-boot] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 32a6a4d8371 Regen 32a6a4d8371 is described below commit 32a6a4d8371c5b15408a755b177621ad89fb6183 Author: Claus Ibsen AuthorDate: Wed Jun 29 18:55:36 2022 +0200 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 61 -- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 2761ac3d3c1..c385ad24750 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -2532,6 +2532,41 @@ camel-cxf 3.18.0-SNAPSHOT + +org.apache.camel +camel-cxf-common +3.18.0-SNAPSHOT + + +org.apache.camel +camel-cxf-rest +3.18.0-SNAPSHOT + + +org.apache.camel +camel-cxf-soap +3.18.0-SNAPSHOT + + +org.apache.camel +camel-cxf-spring-common +3.18.0-SNAPSHOT + + +org.apache.camel +camel-cxf-spring-rest +3.18.0-SNAPSHOT + + +org.apache.camel +camel-cxf-spring-soap +3.18.0-SNAPSHOT + + +org.apache.camel +camel-cxf-spring-transport +3.18.0-SNAPSHOT + org.apache.camel camel-cxf-transport @@ -4789,67 +4824,67 @@ org.testcontainers cassandra -1.17.2 +1.17.3 org.testcontainers couchbase -1.17.2 +1.17.3 org.testcontainers elasticsearch -1.17.2 +1.17.3 org.testcontainers gcloud -1.17.2 +1.17.3 org.testcontainers jdbc -1.17.2 +1.17.3 org.testcontainers junit-jupiter -1.17.2 +1.17.3 org.testcontainers kafka -1.17.2 +1.17.3 org.testcontainers localstack -1.17.2 +1.17.3 org.testcontainers mongodb -1.17.2 +1.17.3 org.testcontainers postgresql -1.17.2 +1.17.3 org.testcontainers pulsar -1.17.2 +1.17.3 org.testcontainers rabbitmq -1.17.2 +1.17.3 org.testcontainers testcontainers -1.17.2 +1.17.3 stax
[camel-spring-boot] branch main updated: [CAMEL-9627]to make spring-boot runtime happy (#586)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new cef3a4b42f9 [CAMEL-9627]to make spring-boot runtime happy (#586) cef3a4b42f9 is described below commit cef3a4b42f947369c9659752aa5566a3af0e1de8 Author: Freeman(Yue) Fang AuthorDate: Wed Jun 29 12:53:20 2022 -0400 [CAMEL-9627]to make spring-boot runtime happy (#586) --- .../camel/springboot/catalog/components/cxf.json | 10 +- .../camel/springboot/catalog/components/cxfrs.json | 2 +- .../pom.xml| 21 ++- .../src/main/docs/cxf-rest.json| 63 .../src/main/docs/cxf.json | 0 .../CxfRsComponentAutoConfiguration.java | 0 .../springboot/CxfRsComponentConfiguration.java| 0 .../jaxrs/springboot/CxfRsComponentConverter.java | 0 .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../src/main/resources/META-INF/spring.factories | 2 - .../src/main/resources/META-INF/spring.provides| 2 +- .../cxf/jaxrs/testbean/CustomException.java| 27 .../component/cxf/jaxrs/testbean/Customer.java | 75 ++ .../cxf/jaxrs/testbean/CustomerService.java| 153 .../testbean/CustomerServiceNoAnnotations.java | 25 .../jaxrs/testbean/CustomerServiceResource.java| 51 +++ .../component/cxf/jaxrs/testbean/EchoService.java | 41 ++ .../camel/component/cxf/jaxrs/testbean/Order.java | 67 + .../component/cxf/jaxrs/testbean/Product.java | 41 ++ .../component/cxf/jaxrs/testbean/ServiceUtil.java | 24 .../rest/springboot/CxfRsConsumerWithBeanTest.java | 109 ++ .../rest/springboot/CxfRsProducerSessionTest.java | 126 .../cxf/rest/springboot/CxfRsStreamCacheTest.java | 160 + .../routes/CxfRsSpringProducerSession.xml | 53 +++ .../routes/CxfRsSpringProducerSessionRoute.xml | 59 .../pom.xml| 46 +- .../src/main/docs/cxf-soap.json| 69 + .../src/main/docs/cxf.json | 58 +--- .../springboot/CxfComponentAutoConfiguration.java | 4 +- .../springboot/CxfComponentConfiguration.java | 2 +- .../jaxws}/springboot/CxfComponentConverter.java | 2 +- .../src/main/resources/META-INF/LICENSE.txt| 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../src/main/resources/META-INF/spring.factories} | 7 +- .../src/main/resources/META-INF/spring.provides| 2 +- .../camel/component/cxf/jaxws/HelloService.java| 34 + .../cxf/soap/springboot/CXFMultiPartTest.java | 106 ++ .../soap/springboot/CxfConsumerMessageTest.java| 137 ++ .../CxfConsumerPayLoadConverterTest.java | 98 + .../soap/springboot/CxfConsumerPayloadTest.java| 135 + .../soap/springboot/CxfConsumerProviderTest.java | 129 + .../cxf/soap/springboot/MultiPartInvokeImpl.java | 52 +++ .../cxf/soap/springboot/ServiceProvider.java | 34 + .../springboot/WriteXmlDeclarationInterceptor.java | 38 + .../src/test/resources/MultiPartTest.wsdl | 56 .../src/test/resources/routes/MultiPartTest.xml| 53 +++ .../src/test/resources/routes/multipartRoute.xml | 27 .../camel-cxf-transport-starter/pom.xml| 2 +- components-starter/camel-soap-starter/pom.xml | 8 +- components-starter/pom.xml | 3 +- tooling/camel-spring-boot-bom/pom.xml | 7 +- tooling/camel-spring-boot-dependencies/pom.xml | 7 +- 53 files changed, 2146 insertions(+), 81 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json index 43a23b95b0c..9a641827625 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json @@ -7,10 +7,10 @@ "deprecated": false, "firstVersion": "1.0.0", "label": "soap,webservice", -"javaType": "org.apache.camel.component.cxf.CxfComponent", +"javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent", "supportLevel": "Stable", "groupId": "org.apache.camel.springboot", -"artifactId": "camel-cxf-starter", +"artifactId": "camel-cxf-soap-starter", "version":
[GitHub] [camel-spring-boot] davsclaus merged pull request #586: [CAMEL-9627]to make spring-boot runtime happy
davsclaus merged PR #586: URL: https://github.com/apache/camel-spring-boot/pull/586 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #7683: ✨ camel-whatsapp component
davsclaus commented on PR #7683: URL: https://github.com/apache/camel/pull/7683#issuecomment-1170233678 @Croway we are closing in on releasing 3.18.0. Do you think this PR is a good start and then you can continue to improve this component for upcoming releases. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3883: Remove redundant Spring dependencies from JDBC extension
jamesnetherton merged PR #3883: URL: https://github.com/apache/camel-quarkus/pull/3883 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Remove redundant Spring dependencies from JDBC extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 83a8c60c78 Remove redundant Spring dependencies from JDBC extension 83a8c60c78 is described below commit 83a8c60c7894fa413910f832813d78543b2fc0a7 Author: James Netherton AuthorDate: Wed Jun 29 14:12:58 2022 +0100 Remove redundant Spring dependencies from JDBC extension --- extensions/jdbc/deployment/pom.xml| 4 extensions/jdbc/runtime/pom.xml | 4 poms/bom/pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 6 files changed, 40 deletions(-) diff --git a/extensions/jdbc/deployment/pom.xml b/extensions/jdbc/deployment/pom.xml index c10202cdce..eca04800a4 100644 --- a/extensions/jdbc/deployment/pom.xml +++ b/extensions/jdbc/deployment/pom.xml @@ -41,10 +41,6 @@ org.apache.camel.quarkus camel-quarkus-core-deployment - -org.apache.camel.quarkus -camel-quarkus-support-spring-deployment - org.apache.camel.quarkus camel-quarkus-jdbc diff --git a/extensions/jdbc/runtime/pom.xml b/extensions/jdbc/runtime/pom.xml index 941e882052..4bfb4feab7 100644 --- a/extensions/jdbc/runtime/pom.xml +++ b/extensions/jdbc/runtime/pom.xml @@ -38,10 +38,6 @@ org.apache.camel.quarkus camel-quarkus-core - -org.apache.camel.quarkus -camel-quarkus-support-spring - io.quarkus quarkus-agroal diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e4103de949..f53c63dcee 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -3189,14 +3189,6 @@ jakarta.xml.bind jakarta.xml.bind-api - -org.springframework -spring-beans - - -org.springframework -spring-core - diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0ee3f20506..2ea7b8c7e1 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -3135,14 +3135,6 @@ jakarta.xml.bind jakarta.xml.bind-api - -org.springframework -spring-beans - - -org.springframework -spring-core - diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 4f307b1d4c..e978720738 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -3135,14 +3135,6 @@ jakarta.xml.bind jakarta.xml.bind-api - -org.springframework -spring-beans - - -org.springframework -spring-core - diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 8591b25086..d379b675a1 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -3135,14 +3135,6 @@ jakarta.xml.bind jakarta.xml.bind-api - -org.springframework -spring-beans - - -org.springframework -spring-core -
[camel-quarkus] branch main updated: Simplify support for Quartz clustering
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 858727e46d Simplify support for Quartz clustering 858727e46d is described below commit 858727e46d6930aefafe302d35d339e7f73e6de6 Author: James Netherton AuthorDate: Wed Jun 29 11:15:15 2022 +0100 Simplify support for Quartz clustering Fixes #3850 --- .../modules/ROOT/pages/migration-guide/2.11.0.adoc | 9 ++ docs/modules/ROOT/pages/migration-guide/index.adoc | 1 + .../ROOT/pages/reference/extensions/quartz.adoc| 116 +++- .../quartz/deployment/QuartzProcessor.java | 7 +- extensions/quartz/runtime/pom.xml | 5 - .../quartz/runtime/src/main/doc/limitations.adoc | 4 - extensions/quartz/runtime/src/main/doc/usage.adoc | 114 +++ .../CamelQuarkusQuartzConnectionProvider.java | 66 --- integration-tests/pom.xml | 1 + .../{quartz => quartz-clustered}/pom.xml | 78 +++-- .../quartz/it/QuartzClusteredResource.java | 56 ++ .../component/quartz/it/QuartzClusteredRoutes.java | 36 ++ .../src/main/resources/application.properties | 39 +++ .../db/migration/V1.0.1__QuarkusQuartz.sql | 0 .../component/quartz/it/QuartzClusteredIT.java | 24 .../component/quartz/it/QuartzClusteredTest.java | 121 + integration-tests/quartz/pom.xml | 37 --- .../component/quartz/it/QuartzResource.java| 21 .../quarkus/component/quartz/it/QuartzRoutes.java | 13 --- .../src/main/resources/application.properties | 31 +- .../src/main/resources/quartz-node-A.properties| 62 --- .../src/main/resources/quartz-node-B.properties| 63 --- .../src/main/resources/quartz-node-C.properties| 67 .../quarkus/component/quartz/it/QuartzTest.java| 31 -- tooling/scripts/test-categories.yaml | 1 + tooling/test-list/pom.xml | 1 + 26 files changed, 469 insertions(+), 535 deletions(-) diff --git a/docs/modules/ROOT/pages/migration-guide/2.11.0.adoc b/docs/modules/ROOT/pages/migration-guide/2.11.0.adoc new file mode 100644 index 00..6c247cfdd1 --- /dev/null +++ b/docs/modules/ROOT/pages/migration-guide/2.11.0.adoc @@ -0,0 +1,9 @@ += Camel Quarkus 2.11.0 Migration Guide + +The following guide outlines how to adapt your code to changes that were made in Camel Quarkus 2.11.0 & Quarkus 2.11.0.Final. + +== Changes to Quartz clustering support + +In previous releases the Camel Quarkus Quartz documention listed various means of configuring Quartz for clustering. This has now been simplified +to a single set of instructions that leverages Quarkus Quartz. If you are using one of the previous methods of clustering, it is advised to update your +application to the new method documented in the xref:reference/extensions/quartz.adoc[Quartz extension guide]. diff --git a/docs/modules/ROOT/pages/migration-guide/index.adoc b/docs/modules/ROOT/pages/migration-guide/index.adoc index 8786e8b4ba..b064749165 100644 --- a/docs/modules/ROOT/pages/migration-guide/index.adoc +++ b/docs/modules/ROOT/pages/migration-guide/index.adoc @@ -4,6 +4,7 @@ We do frequent releases, a release almost every month, and even though we strive Listed here are guides on how to migrate between major versions and anything of significance to watch for when upgrading from minor versions. +* xref:migration-guide/2.11.0.adoc[Camel Quarkus 2.10.0 to Camel Quarkus 2.11.0 migration guide] * xref:migration-guide/2.10.0.adoc[Camel Quarkus 2.9.0 to Camel Quarkus 2.10.0 migration guide] * xref:migration-guide/2.8.0.adoc[Camel Quarkus 2.7.0 to Camel Quarkus 2.8.0 migration guide] * xref:migration-guide/2.7.0.adoc[Camel Quarkus 2.6.0 to Camel Quarkus 2.7.0 migration guide] diff --git a/docs/modules/ROOT/pages/reference/extensions/quartz.adoc b/docs/modules/ROOT/pages/reference/extensions/quartz.adoc index 9ddb850b18..03a679f665 100644 --- a/docs/modules/ROOT/pages/reference/extensions/quartz.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/quartz.adoc @@ -43,65 +43,75 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ === Clustering -There are two options how to run Quartz in clustered mode: +Support for Quartz clustering is provided by the Quarkus Quartz extension. The following steps outline how to configure Quarkus Quartz for use with Camel. - Quarkus based - -This is the preferred option. Follow the https://quarkus.io/guides/quartz[scheduling periodic tasks quartz guide]. - -- Define database configuration in `application.properties`. -- Use for example `flyway` to create database tables required for
[GitHub] [camel-quarkus] jamesnetherton closed issue #3850: Clarify usage of Quarkus Quartz clustering support
jamesnetherton closed issue #3850: Clarify usage of Quarkus Quartz clustering support URL: https://github.com/apache/camel-quarkus/issues/3850 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3882: Simplify support for Quartz clustering
jamesnetherton merged PR #3882: URL: https://github.com/apache/camel-quarkus/pull/3882 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #7928: CAMEL-18246: Upgrade hadoop-common >= 2.10.2, 3.3.3
davsclaus commented on PR #7928: URL: https://github.com/apache/camel/pull/7928#issuecomment-1170232518 I think we can merge this as its good to upgrade on main branch. Then you can follow up with new PRs for more work if needed. Is that okay? -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18249: rename test properties (#7939)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 6ba0bce499d CAMEL-18249: rename test properties (#7939) 6ba0bce499d is described below commit 6ba0bce499d2cdad1951f292e54d27b9a2aedaf8 Author: Otavio Rodolfo Piske AuthorDate: Wed Jun 29 18:49:25 2022 +0200 CAMEL-18249: rename test properties (#7939) Logging changes in Apache ActiveMQ version 5.17.x have caused some of our test logs to stop working. For some reason, the tests are ignoring the log4j.properties file and not creating the test log file. When we upgraded it 7aac02347cca64d1cf84c790292c61ec5c5ec20e they stopped working. Renaming the files to the default name used by log4j fixes the issue. --- .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 .../src/test/resources/{log4j2.properties => log4j2-test.properties} | 0 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/components/camel-activemq/src/test/resources/log4j2.properties b/components/camel-activemq/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-activemq/src/test/resources/log4j2.properties rename to components/camel-activemq/src/test/resources/log4j2-test.properties diff --git a/components/camel-amqp/src/test/resources/log4j2.properties b/components/camel-amqp/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-amqp/src/test/resources/log4j2.properties rename to components/camel-amqp/src/test/resources/log4j2-test.properties diff --git a/components/camel-jms/src/test/resources/log4j2.properties b/components/camel-jms/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-jms/src/test/resources/log4j2.properties rename to components/camel-jms/src/test/resources/log4j2-test.properties diff --git a/components/camel-mllp/src/test/resources/log4j2.properties b/components/camel-mllp/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-mllp/src/test/resources/log4j2.properties rename to components/camel-mllp/src/test/resources/log4j2-test.properties diff --git a/components/camel-paho/src/test/resources/log4j2.properties b/components/camel-paho/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-paho/src/test/resources/log4j2.properties rename to components/camel-paho/src/test/resources/log4j2-test.properties diff --git a/components/camel-sjms/src/test/resources/log4j2.properties b/components/camel-sjms/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-sjms/src/test/resources/log4j2.properties rename to components/camel-sjms/src/test/resources/log4j2-test.properties diff --git a/components/camel-sjms2/src/test/resources/log4j2.properties b/components/camel-sjms2/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-sjms2/src/test/resources/log4j2.properties rename to components/camel-sjms2/src/test/resources/log4j2-test.properties diff --git a/components/camel-stomp/src/test/resources/log4j2.properties b/components/camel-stomp/src/test/resources/log4j2-test.properties similarity index 100% rename from components/camel-stomp/src/test/resources/log4j2.properties rename to components/camel-stomp/src/test/resources/log4j2-test.properties
[GitHub] [camel] davsclaus merged pull request #7939: CAMEL-18249: rename test properties
davsclaus merged PR #7939: URL: https://github.com/apache/camel/pull/7939 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7939: CAMEL-18249: rename test properties
github-actions[bot] commented on PR #7939: URL: https://github.com/apache/camel/pull/7939#issuecomment-1170224289 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **8 component(s) tested** -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] claudio4j commented on pull request #954: Add Splunk sources and sinks
claudio4j commented on PR #954: URL: https://github.com/apache/camel-kamelets/pull/954#issuecomment-1170223157 @squakez @christophd for review. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] claudio4j opened a new pull request, #954: Add Splunk sources and sinks
claudio4j opened a new pull request, #954: URL: https://github.com/apache/camel-kamelets/pull/954 * splunk and splunk-hec -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) More Thread.sleep cleanups (#7935)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 27f6d2bd93b (chores) More Thread.sleep cleanups (#7935) 27f6d2bd93b is described below commit 27f6d2bd93bf7aebce7ce5f79f1c0b7cc7ed9ed9 Author: Otavio Rodolfo Piske AuthorDate: Wed Jun 29 18:27:40 2022 +0200 (chores) More Thread.sleep cleanups (#7935) * (chores) camel-hazelcast: replaced Thread.sleep with Awaitility * (chores) camel-hl7: replaced Thread.sleep with delay EIP * (chores) camel-irc: renamed manual test * (chores) camel-jetty: removed calls to Thread.sleep * (chores) camel-kubernetes: replaced Thread.sleep with Awaitility * (chores) camel-leveldb: replaced Thread.sleep with Awaitility --- components/camel-hazelcast/pom.xml | 5 +++ .../HazelcastReplicatedmapConsumerTest.java| 7 ++-- .../hl7/HL7MLLPCodecMessageFloodingTest.java | 4 +- ...IrcChat.java => CodehausIrcChatManualTest.java} | 6 +-- .../jetty/JettyContinuationDisabledTest.java | 11 ++ .../JettyEndpointContinuationDisabledTest.java | 11 ++ .../cluster/KubernetesClusterServiceTest.java | 7 ++-- .../cluster/TimedLeaderNotifierTest.java | 44 -- ...bernetesReplicationControllersProducerTest.java | 10 ++--- components/camel-leveldb/pom.xml | 5 +++ .../LevelDBAggregateDiscardOnTimeoutTest.java | 5 ++- ...DBAggregateNotLostRemovedWhenConfirmedTest.java | 8 +++- .../leveldb/LevelDBAggregateNotLostTest.java | 8 +++- 13 files changed, 73 insertions(+), 58 deletions(-) diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml index d34dc9e8520..4bc56279eea 100644 --- a/components/camel-hazelcast/pom.xml +++ b/components/camel-hazelcast/pom.xml @@ -79,6 +79,11 @@ camel-spring-main test + +org.awaitility +awaitility +test + diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java index 00e2db40b84..d1de844a98a 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java @@ -26,6 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; +import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -75,12 +76,12 @@ public class HazelcastReplicatedmapConsumerTest extends CamelTestSupport { * mail from talip (hazelcast) on 21.02.2011: MultiMap doesn't support eviction yet. We can and should add this feature. */ @Test -public void testEvict() throws InterruptedException { +public void testEvict() { MockEndpoint out = getMockEndpoint("mock:evicted"); out.expectedMessageCount(1); map.put("4711", "my-foo", 100, TimeUnit.MILLISECONDS); -Thread.sleep(150); -assertMockEndpointsSatisfied(3, TimeUnit.MILLISECONDS); +Awaitility.await().atMost(3, TimeUnit.MILLISECONDS).untilAsserted( +() -> assertMockEndpointsSatisfied()); } @Test diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java index fabb6af27b0..2f9057712a7 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java @@ -53,8 +53,8 @@ public class HL7MLLPCodecMessageFloodingTest extends HL7TestSupport { Message input = exchange.getIn().getBody(Message.class); Message response = input.generateACK(); exchange.getMessage().setBody(response); -Thread.sleep(50); // simulate some processing time -}).to("mock:result"); +}).delay(50) // simulate some processing time +.to("mock:result"); } }; } diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChat.java
[GitHub] [camel] davsclaus merged pull request #7935: (chores) More Thread.sleep cleanups
davsclaus merged PR #7935: URL: https://github.com/apache/camel/pull/7935 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit 027e471fdf8cdea3899dfeb30d41dbbc448e8384 (#7938)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new c99492dcc19 Regen for commit 027e471fdf8cdea3899dfeb30d41dbbc448e8384 (#7938) c99492dcc19 is described below commit c99492dcc1922e4ec04344f8cc077b986fc7dc92 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jun 29 18:27:22 2022 +0200 Regen for commit 027e471fdf8cdea3899dfeb30d41dbbc448e8384 (#7938) Signed-off-by: GitHub Co-authored-by: davsclaus
[GitHub] [camel] davsclaus merged pull request #7938: Generated sources regen
davsclaus merged PR #7938: URL: https://github.com/apache/camel/pull/7938 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: camel-hbase: fix deprecation warnings (#7936)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 16f106350c9 camel-hbase: fix deprecation warnings (#7936) 16f106350c9 is described below commit 16f106350c994a11ab3f1307ef566c45309634f5 Author: Alexandre Gallice AuthorDate: Wed Jun 29 18:26:38 2022 +0200 camel-hbase: fix deprecation warnings (#7936) --- .../src/main/java/org/apache/camel/component/hbase/HBaseProducer.java | 4 ++-- .../camel/component/hbase/mapping/CellMappingStrategyFactory.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java index 5a7a6bdd128..962ee4fa567 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java @@ -93,9 +93,9 @@ public class HBaseProducer extends DefaultProducer { } else if (!deleteOperations.isEmpty()) { table.delete(deleteOperations); } else if (!getOperationResult.isEmpty()) { -mappingStrategy.applyGetResults(exchange.getOut(), new HBaseData(getOperationResult)); +mappingStrategy.applyGetResults(exchange.getMessage(), new HBaseData(getOperationResult)); } else if (!scanOperationResult.isEmpty()) { -mappingStrategy.applyScanResults(exchange.getOut(), new HBaseData(scanOperationResult)); +mappingStrategy.applyScanResults(exchange.getMessage(), new HBaseData(scanOperationResult)); } } } diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java index 212ce2554ea..579d8feddc1 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java @@ -63,7 +63,7 @@ public class CellMappingStrategyFactory { if (classLoader != null) { try { Class clazz = classLoader.loadClass(strategyClassName); -return (CellMappingStrategy) clazz.newInstance(); +return (CellMappingStrategy) clazz.getDeclaredConstructor().newInstance(); } catch (Throwable e) { LOG.warn("Failed to load HBase cell mapping strategy from class {}.", strategyClassName); }
[GitHub] [camel] davsclaus merged pull request #7936: camel-hbase: fix deprecation warnings
davsclaus merged PR #7936: URL: https://github.com/apache/camel/pull/7936 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] phantomjinx commented on pull request #3382: Improves reliability of e2e testing
phantomjinx commented on PR #3382: URL: https://github.com/apache/camel-k/pull/3382#issuecomment-1170178367 @squakez You might like to review the changes I have made to promotion in the final commit of this series. The promotion tests now all pass successfully (locally at least) with these changes. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7939: CAMEL-18249: rename test properties
github-actions[bot] commented on PR #7939: URL: https://github.com/apache/camel/pull/7939#issuecomment-1170141762 :warning: This PR changes Camel components and will be tested automatically. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org