[camel-spring-boot] 01/01: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7fe8611e154b604f7db9aa6428924cb900879c6b
Author: Claus Ibsen
AuthorDate: Fri Apr 29 06:30:18 2022 +0200
Regen
---
.../catalog/components/debezium-mongodb.json | 10 ++--
.../catalog/components/debezium-mysql.json | 28 +
.../catalog/components/debezium-postgres.json | 12 ++--
.../catalog/components/debezium-sqlserver.json | 8 ++-
.../src/main/docs/debezium-mongodb.json| 11 +++-
.../DebeziumMongodbComponentConfiguration.java | 26 +++--
.../src/main/docs/debezium-mysql.json | 26 +++--
.../DebeziumMySqlComponentConfiguration.java | 56 +-
.../src/main/docs/debezium-postgres.json | 21 +++
.../DebeziumPostgresComponentConfiguration.java| 42 +++---
.../src/main/docs/debezium-sqlserver.json | 16 +-
.../DebeziumSqlserverComponentConfiguration.java | 34 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 66 +++---
13 files changed, 237 insertions(+), 119 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
index fcba9f7d3c1..73d9bda7f23 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
@@ -59,7 +59,7 @@
"mongodbConnectTimeoutMs": { "kind": "property", "displayName": "Mongodb
Connect Timeout Ms", "group": "mongodb", "label": "consumer,mongodb",
"required": false, "type": "duration", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10s",
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The connection timeout,
given [...]
"mongodbHosts": { "kind": "property", "displayName": "Mongodb Hosts",
"group": "mongodb", "label": "consumer,mongodb", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The hostname and port
pairs (in the form 'host' or 'host:port') of [...]
"mongodbMembersAutoDiscover": { "kind": "property", "displayName":
"Mongodb Members Auto Discover", "group": "mongodb", "label":
"consumer,mongodb", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Specifies whether the
[...]
-"mongodbName": { "kind": "property", "displayName": "Mongodb Name",
"group": "mongodb", "label": "consumer,mongodb", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Unique name that
identifies the MongoDB replic [...]
+"mongodbName": { "kind": "property", "displayName": "Mongodb Name",
"group": "mongodb", "label": "consumer,mongodb", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Unique name that
identifies the MongoDB replic [...]
"mongodbPassword": { "kind": "property", "displayName": "Mongodb
Password", "group": "mongodb", "label": "consumer,mongodb", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Password to be used
when connecting to [...]
"mongodbPollIntervalMs": { "kind": "property", "displayName": "Mongodb
Poll Interval Ms", "group":
[camel-spring-boot] branch main created (now 7fe8611e154)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 7fe8611e154 Regen This branch includes the following new commits: new 7fe8611e154 Regen The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-spring-boot] oscerd merged pull request #548: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged PR #548: URL: https://github.com/apache/camel-spring-boot/pull/548 -- 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] haanhvu commented on pull request #3185: Add settings security to Maven build
haanhvu commented on PR #3185: URL: https://github.com/apache/camel-k/pull/3185#issuecomment-1112885096 @squakez I'm still stuck at one thing: How to make `kubeclt` know about the new update (`settingsSecurity`)? Do we have to run `make install-minikube` or something? If that's the case, the `make install-minikube` doesn't work on Windows. Can you suggest any workaround? (I'm transferring the project to Ubuntu in the upcoming days, but it would be good to have a workaround for now) -- 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 (d16b83727c7 -> 519393807eb)
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 d16b83727c7 Regen for commit 708701eb6327df34e087755fd8e1fefb58ab459d (#7525) add 519393807eb CAMEL-18032: camel-jbang - Skip including docker-compose files No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 1 file changed, 4 insertions(+)
[GitHub] [camel] oscerd commented on pull request #7279: CAMEL-17803: Fix/reimplement automatic complete/abandon of messages
oscerd commented on PR #7279: URL: https://github.com/apache/camel/pull/7279#issuecomment-1112880624 @davsclaus can you take a look too? -- 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_3.14.x updated (75425bdaf56 -> c438ea6a0b2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git omit 75425bdaf56 Regen for commit 5215dcc14bf572d22ad8ba7dfe62f726d8d9ab6b add c438ea6a0b2 Regen for commit 5215dcc14bf572d22ad8ba7dfe62f726d8d9ab6b (#7526) 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 (75425bdaf56) \ N -- N -- N refs/heads/regen_bot_3.14.x (c438ea6a0b2) 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] branch regen_bot updated (5fee142eb06 -> d16b83727c7)
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 5fee142eb06 Regen for commit 708701eb6327df34e087755fd8e1fefb58ab459d add d16b83727c7 Regen for commit 708701eb6327df34e087755fd8e1fefb58ab459d (#7525) 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 (5fee142eb06) \ N -- N -- N refs/heads/regen_bot (d16b83727c7) 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] branch regen_bot-3.11.x updated (31e20c70ebc -> b8d22690b75)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git omit 31e20c70ebc Regen for commit 5f7afda685d849bfa90fab5384c8d7194c60d44c add b8d22690b75 Regen for commit 5f7afda685d849bfa90fab5384c8d7194c60d44c (#7527) 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 (31e20c70ebc) \ N -- N -- N refs/heads/regen_bot-3.11.x (b8d22690b75) 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:
[GitHub] [camel-kamelets] oscerd commented on a diff in pull request #902: Provide IBM MQ Sink and Source Kamelets
oscerd commented on code in PR #902: URL: https://github.com/apache/camel-kamelets/pull/902#discussion_r861456061 ## kamelets/jms-ibm-mq-sink.kamelet.yaml: ## @@ -0,0 +1,124 @@ +# --- +# 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. +# --- +apiVersion: camel.apache.org/v1alpha1 +kind: Kamelet +metadata: + name: jms-ibm-mq-sink + annotations: +camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTczLjA4IDU3Ni45NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7fS5jbHMtMntmaWxsOiM1YTc3YjU7fS5jbHMtM3tmaWxsOiNhZmJlZTA7fS5jbHMtNHtjbGlwLXBhdGg6dXJsKCNjbGlwLXBhdGgpO30uY2xzLTV7Y2xpcC1wYXRoOnVybCgjY2xpcC1wYXRoLTIpO308L3N0eWxlPjxjbGlwUGF0aCBpZD0iY2xpcC1wYXRoIj48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xNjQuNSw1MTAuODhWNDU3aDQuMDh2NTMuOTFabTQ3Ljc4LTI3LjcxYTEzLjE0LDEzLjE0LDAsMCwxLDkuMjMsMTNjMCw5LjYyLTYuMjgsMTQuNjktMTUuODIsMTQuNjlIMTg1LjI0VjQ1N2gxOS44NGM4Ljk0LDAsMTUuNiw1LjE1LDE1LjYsMTQuMDhhMTIuMzgsMTIuMzgsMCwwLDEtOC40LDEyLjEyWm0tMjIuOTUsMjQuMDhoMTUuOWM3LjM1LDAsMTIuMTktNC4xNywxMi4xOS0xMS4wNnMtNC44NC0xMS4wNS0xMi4xOS0xMS4wNWgtMTUuOXYyMi4xMVptMTUuMy00Ni42NWgtMTUuM3YyMC45aDE1LjNjNi41MSwwLDEyLTMsMTItMTAuNDVzLTUuNDUtMTAuNDUtMTItMTAuNDVabTcyLjYxLDUwLjI4VjQ2Ni40M2wtMTYuMzUsMzYuODh IMjU2LjhsLTE2LjY2LTM2Ljg4djQ0LjQ1aC00LjA5VjQ1N2g0LjA5bDE4Ljc4LDQxLjU3TDI3Ny4yNCw0NTdoNC4wOXY1My45MVoiLz48L2NsaXBQYXRoPjxjbGlwUGF0aCBpZD0iY2xpcC1wYXRoLTIiPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTM0OS43LDUxMC44NFY0NzcuMjhoLS4xOGwtMTAuOTEsMjUuODRIMzMybC0xMC45MS0yNS44NEgzMjF2MzMuNTZoLTcuOVY0NTdoNy40NGwxNSwzNS4wN0wzNTAuMTMsNDU3aDcuNDZ2NTMuODFabTU0LjItMTAsNi44OCw1LjY1LTQuNjksNS42MS02LjU4LTUuNDRxLTQuNjIsNC41MS0xMi4zLDQuNjZhMTcuODksMTcuODksMCwwLDEtMTAuMjUtMy4xLDE3LjcsMTcuNywwLDAsMS02LjA4LTYuNTdjLS4zOC0uODEtLjczLTEuNTktMS0yLjMyYTE1LjQ1LDE1LjQ1LDAsMCwxLS43Mi0yLjg4LDE0NS4yOSwxNDUuMjksMCwwLDEsMC0yNSwxNS4zOCwxNS4zOCwwLDAsMSwxLjc1LTUuMTMsMTguMzMsMTguMzMsMCwwLDEsNi4wOC02LjY0LDE3LjQ3LDE3LjQ3LDAsMCwxLDEwLjI1LTMsMTcuNzYsMTcuNzYsMCwwLDEsMTAuMzYsMywxOCwxOCwwLDAsMSw1Ljk0LDYuNjQsMTIuNzksMTIuNzksMCwwLDEsMS44Miw1LjEzLDEwNy4yMywxMDcuMjMsMCwwLDEsLjQ2LDEyLjU1cTAsOC4zOC0uMzYsMTEuN2ExNC41MSwxNC41MSwwLDAsMS0xLjUzLDUuMTdabS02LjU0LTI3LjcxYTExLjI2LDExLjI2LDAsMCwwLTUuMjYtNy4yNCwxMS4xOCwxMS4xOCwwLDAsMC00LjkxLTEuMTUsMTAuNjMs MTAuNjMsMCwwLDAtNC44LDEuMTUsMTAuMDksMTAuMDksMCwwLDAtMy4yOSwyLjc3LDksOSwwLDAsMC0yLDQuNDgsNjYuNyw2Ni43LDAsMCwwLS41NywxMC44Myw2NS40Nyw2NS40NywwLDAsMCwuNTcsMTAuNzcsOSw5LDAsMCwwLDIsNC41NCw5LjQ3LDkuNDcsMCwwLDAsMy4yOSwyLjcxLDkuMTEsOS4xMSwwLDAsMCw0LjgsMS4yMiw4LjYyLDguNjIsMCwwLDAsNS44NC0xLjg5bC02LjY2LTUuNDcsNC42OS01LjU5LDYuMDksNXEuNzUtMi43My43NS0xMS4yOGE3MC42LDcwLjYsMCwwLDAtLjU0LTEwLjg0WiIvPjwvY2xpcFBhdGg+PC9kZWZzPjx0aXRsZT5JQk0gSVE8L3RpdGxlPjxjaXJjbGUgY2xhc3M9ImNscy0yIiBjeD0iMjg3LjY0IiBjeT0iMjg3LjIiIHI9IjI3OC41Ii8+PHBvbHlnb24gY2xhc3M9ImNscy0zIiBwb2ludHM9IjQ1OC4xNyA0MjYuNjcgMTE3LjExIDQyNi42NyAxMTcuMTEgMTUzLjU1IDcwLjkxIDE1My41NSA3MC45MSAxMzEuNTUgMTM5LjExIDEzMS41NSAxMzkuMTEgNDA0LjY3IDQzNi4xNyA0MDQuNjcgNDM2LjE3IDEzMS41NSA1MDQuMzcgMTMxLjU1IDUwNC4zNyAxNTMuNTUgNDU4LjE3IDE1My41NSA0NTguMTcgNDI2LjY3Ii8+PHBvbHlnb24gY2xhc3M9ImNscy0xIiBwb2ludHM9IjQyMC4yNiAyNTMuMTIgNDIwLjI2IDI0MS43NyAxNTUuMDIgMjQxLjc3IDE1NS4wMiAyNTIuODUgMjg3Ljg4IDMyOS40OSA0MjAuMjYgMjUzLjEyIi8+PHBvbHlnb24gY2xhc3M9ImNscy0xIiBwb2ludHM9IjI4N
[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 7fe8611e154 Regen
7fe8611e154 is described below
commit 7fe8611e154b604f7db9aa6428924cb900879c6b
Author: Claus Ibsen
AuthorDate: Fri Apr 29 06:30:18 2022 +0200
Regen
---
.../catalog/components/debezium-mongodb.json | 10 ++--
.../catalog/components/debezium-mysql.json | 28 +
.../catalog/components/debezium-postgres.json | 12 ++--
.../catalog/components/debezium-sqlserver.json | 8 ++-
.../src/main/docs/debezium-mongodb.json| 11 +++-
.../DebeziumMongodbComponentConfiguration.java | 26 +++--
.../src/main/docs/debezium-mysql.json | 26 +++--
.../DebeziumMySqlComponentConfiguration.java | 56 +-
.../src/main/docs/debezium-postgres.json | 21 +++
.../DebeziumPostgresComponentConfiguration.java| 42 +++---
.../src/main/docs/debezium-sqlserver.json | 16 +-
.../DebeziumSqlserverComponentConfiguration.java | 34 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 66 +++---
13 files changed, 237 insertions(+), 119 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
index fcba9f7d3c1..73d9bda7f23 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
@@ -59,7 +59,7 @@
"mongodbConnectTimeoutMs": { "kind": "property", "displayName": "Mongodb
Connect Timeout Ms", "group": "mongodb", "label": "consumer,mongodb",
"required": false, "type": "duration", "javaType": "int", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10s",
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The connection timeout,
given [...]
"mongodbHosts": { "kind": "property", "displayName": "Mongodb Hosts",
"group": "mongodb", "label": "consumer,mongodb", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The hostname and port
pairs (in the form 'host' or 'host:port') of [...]
"mongodbMembersAutoDiscover": { "kind": "property", "displayName":
"Mongodb Members Auto Discover", "group": "mongodb", "label":
"consumer,mongodb", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Specifies whether the
[...]
-"mongodbName": { "kind": "property", "displayName": "Mongodb Name",
"group": "mongodb", "label": "consumer,mongodb", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Unique name that
identifies the MongoDB replic [...]
+"mongodbName": { "kind": "property", "displayName": "Mongodb Name",
"group": "mongodb", "label": "consumer,mongodb", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Unique name that
identifies the MongoDB replic [...]
"mongodbPassword": { "kind": "property", "displayName": "Mongodb
Password", "group": "mongodb", "label": "consumer,mongodb", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Password to be used
when
[camel] branch main updated: CAMEL-18032: camel-jbang - Skip including docker-compose files
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 519393807eb CAMEL-18032: camel-jbang - Skip including docker-compose
files
519393807eb is described below
commit 519393807eb6f9e147c301880a09555dba8d7d5f
Author: Claus Ibsen
AuthorDate: Fri Apr 29 06:19:26 2022 +0200
CAMEL-18032: camel-jbang - Skip including docker-compose files
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4
1 file changed, 4 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 4408b813f15..05059433f4d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -513,6 +513,10 @@ class Run implements Callable {
if ("camel-runner.jar".equals(name)) {
return true;
}
+if ("docker-compose.yml".equals(name) ||
"docker-compose.yaml".equals(name) || "compose.yml".equals(name)
+|| "compose.yaml".equals(name)) {
+return true;
+}
// skip dirs
File f = new File(name);
[GitHub] [camel] davsclaus merged pull request #7527: Generated sources regen
davsclaus merged PR #7527: URL: https://github.com/apache/camel/pull/7527 -- 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 merged pull request #7526: Generated sources regen
davsclaus merged PR #7526: URL: https://github.com/apache/camel/pull/7526 -- 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 708701eb6327df34e087755fd8e1fefb58ab459d (#7525)
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 d16b83727c7 Regen for commit 708701eb6327df34e087755fd8e1fefb58ab459d
(#7525)
d16b83727c7 is described below
commit d16b83727c79b863c3b62f4ac647ddf1cab5d6ce
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 29 06:11:33 2022 +0200
Regen for commit 708701eb6327df34e087755fd8e1fefb58ab459d (#7525)
Signed-off-by: GitHub
Co-authored-by: davsclaus
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 7ef863639ed..4408b813f15 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -18,7 +18,6 @@ package org.apache.camel.dsl.jbang.core.commands;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -64,7 +63,8 @@ class Run implements Callable {
private File lockFile;
private ScheduledExecutorService executor;
-@Parameters(description = "The Camel file(s) to run. If no files specified
then application.properties is used as source for which files to run.", arity =
"0..9")
+@Parameters(description = "The Camel file(s) to run. If no files specified
then application.properties is used as source for which files to run.",
+arity = "0..9")
private String[] files;
//CHECKSTYLE:OFF
@@ -217,7 +217,6 @@ class Run implements Callable {
return line;
}
-
private int run() throws Exception {
File work = new File(WORK_DIR);
FileUtil.removeDir(work);
[GitHub] [camel] davsclaus merged pull request #7525: Generated sources regen
davsclaus merged PR #7525: URL: https://github.com/apache/camel/pull/7525 -- 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, #902: Provide IBM MQ Sink and Source Kamelets
claudio4j opened a new pull request, #902: URL: https://github.com/apache/camel-kamelets/pull/902 Fix https://github.com/apache/camel-kamelets/issues/901 -- 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 900e5e1be3 Updated CHANGELOG.md 900e5e1be3 is described below commit 900e5e1be3e0d2e12c6285b31e7d7a492d6ee9c2 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Apr 29 03:39:21 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 555adcca0f..ba530e710f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ **Merged pull requests:** +- Upgrade Quarkus to 2.9.0.CR1 [\#3753](https://github.com/apache/camel-quarkus/pull/3753) ([jamesnetherton](https://github.com/jamesnetherton)) +- Fix MockEndpoint usage in gRPC tests [\#3752](https://github.com/apache/camel-quarkus/pull/3752) ([jamesnetherton](https://github.com/jamesnetherton)) - Remove c3p0 from Quartz extension [\#3751](https://github.com/apache/camel-quarkus/pull/3751) ([jamesnetherton](https://github.com/jamesnetherton)) - Fix MockEndpoint usage in Infinispan tests [\#3747](https://github.com/apache/camel-quarkus/pull/3747) ([jamesnetherton](https://github.com/jamesnetherton)) - Fix compilation warnings in Azure Vert.x HTTP Client [\#3744](https://github.com/apache/camel-quarkus/pull/3744) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-k] 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.git The following commit(s) were added to refs/heads/main by this push: new 8ef795ee7 Updated CHANGELOG.md 8ef795ee7 is described below commit 8ef795ee77bae697c10195b7bb634679ace03251 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Apr 29 03:36:59 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6bca659f..da93180e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,10 @@ - Operators: `make prepare-operators` should use the same folder structure of the Kubernetes output for the Openshift ecosystem [\#3237](https://github.com/apache/camel-k/issues/3237) - Jitpack example deployment fails [\#3207](https://github.com/apache/camel-k/issues/3207) +- Mount trait usage example [\#3140](https://github.com/apache/camel-k/issues/3140) - `Kamel kit create` to use mount/camel traits [\#2915](https://github.com/apache/camel-k/issues/2915) - Make knative broker name configurable [\#2864](https://github.com/apache/camel-k/issues/2864) +- \[CLI\] Format long subcommand descriptions [\#2318](https://github.com/apache/camel-k/issues/2318) - Camel K CLI asks for an OpenAPI v2 when also v3 is supported [\#2238](https://github.com/apache/camel-k/issues/2238) - Traits to configure the container image and location fo the sources [\#2232](https://github.com/apache/camel-k/issues/2232) - Lower priority of modeline options [\#1843](https://github.com/apache/camel-k/issues/1843)
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1112829242 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 2243056430-736-16cbfd4d-9baf-4fc8-b38e-f7f2a8b66967 * Camel Quarkus Commit: 699dcc5dcd173651be916627aa645c18aa4385ec * Quarkus Main Commit: Unknown * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2243056430 -- 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 automatic-periodic-sync updated (6f97ea0efe9 -> b5a5a9fbc6a)
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 6f97ea0efe9 [create-pull-request] automated change
add f0cf1c79c29 [create-pull-request] automated change
add d9455c20f82 Add more failure detail to the UnitTestCommand assertion -
itest failures were being swallowed, now providing failure messages and the
stack of the last failure (#546)
add 5b027d2446f [CAMEL-18005]add tests in camel-paho-starter (#543)
add 3438944eedc Fix SQL flaky test (#541)
add f5ff9ec832a CAMEL-18011: upgrade to spring boot 2.6.7
add b5a5a9fbc6a [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 (6f97ea0efe9)
\
N -- N -- N refs/heads/automatic-periodic-sync (b5a5a9fbc6a)
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:
archetypes/camel-archetype-spring-boot/pom.xml | 2 +-
.../catalog/components/debezium-mongodb.json | 10 +-
.../catalog/components/debezium-mysql.json | 28 +--
.../catalog/components/debezium-postgres.json | 12 +-
.../catalog/components/debezium-sqlserver.json | 8 +-
.../src/main/docs/debezium-mongodb.json| 11 +-
.../DebeziumMongodbComponentConfiguration.java | 26 ++-
.../src/main/docs/debezium-mysql.json | 26 ++-
.../DebeziumMySqlComponentConfiguration.java | 56 +++--
.../src/main/docs/debezium-postgres.json | 21 +-
.../DebeziumPostgresComponentConfiguration.java| 42 ++--
.../src/main/docs/debezium-sqlserver.json | 16 +-
.../DebeziumSqlserverComponentConfiguration.java | 34 ++-
components-starter/camel-paho-starter/pom.xml | 7 +
.../paho/springboot/PahoComponentTest.java | 228 +
.../PahoComponentVerifierExtensionTest.java| 105 ++
.../paho/springboot/PahoOverrideTopicTest.java}| 53 +++--
.../springboot/PahoReconnectAfterFailureTest.java | 203 ++
.../paho/springboot/PahoToDSendDynamicTest.java} | 74 ---
.../component/paho/springboot/PahoToDTest.java}| 87
components-starter/camel-sql-starter/pom.xml | 5 +
.../org/apache/camel/component/sql/BaseSql.java| 2 +-
pom.xml| 2 +-
.../itest/springboot/command/UnitTestCommand.java | 14 +-
tooling/camel-spring-boot-dependencies/pom.xml | 66 +++---
25 files changed, 913 insertions(+), 225 deletions(-)
create mode 100644
components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentTest.java
create mode 100644
components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentVerifierExtensionTest.java
copy
components-starter/{camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/FileConsumerQuartzSchedulerRestartTest.java
=>
camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoOverrideTopicTest.java}
(60%)
create mode 100644
components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoReconnectAfterFailureTest.java
copy
components-starter/{camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzManagementTest.java
=>
camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDSendDynamicTest.java}
(53%)
copy
components-starter/{camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipSplitterRouteIssueTest.java
=>
camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDTest.java}
(55%)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #548: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #548: URL: https://github.com/apache/camel-spring-boot/pull/548 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
[camel] branch regen_bot updated (dbde0cfdcbe -> 5fee142eb06)
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 dbde0cfdcbe Regen for commit 944e65b0ae245e157aa5df2405edaf57c918d63a add 708701eb632 Dependency upgrades add 5fee142eb06 Regen for commit 708701eb6327df34e087755fd8e1fefb58ab459d 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 (dbde0cfdcbe) \ N -- N -- N refs/heads/regen_bot (5fee142eb06) 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-dependencies/pom.xml | 14 +++--- parent/pom.xml | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-)
[camel] branch regen_bot-3.11.x updated (939844d60dd -> 31e20c70ebc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git from 939844d60dd CAMEL-16287 - camel-aws2-sqs should use pagination for deciding which aws sqs queues it should create add 5f7afda685d CAMEL-18011: Depedency upgrades in preparing for spring boot 2.5.x upgrade add 31e20c70ebc Regen for commit 5f7afda685d849bfa90fab5384c8d7194c60d44c No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 14 +++--- parent/pom.xml | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #7527: Generated sources regen
github-actions[bot] opened a new pull request, #7527: URL: https://github.com/apache/camel/pull/7527 Regen bot :robot: found some uncommited changes after running build on :camel: camel-3.11.x. Please do not delete `regen_bot-3.11.x` branch after merge/rebase. -- 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_3.14.x updated (287e0a1a824 -> 75425bdaf56)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git from 287e0a1a824 CAMEL-17992: don't overwrite ssl from configuration with uri add 5440c6ab01a CAMEL-17704: camel-netty-starter - Unable to set camel.component.netty.decoders add 726f7467810 Upgrade spring 5.3.19 add 5215dcc14bf CAMEL-18011: Depedency upgrades in preparing for spring boot 2.6.7 upgrade add 75425bdaf56 Regen for commit 5215dcc14bf572d22ad8ba7dfe62f726d8d9ab6b No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 14 +-- .../camel/catalog/components/netty-http.json | 8 +- .../org/apache/camel/catalog/components/netty.json | 8 +- .../http/NettyHttpConfigurationConfigurer.java | 28 +++-- .../camel/component/netty/http/netty-http.json | 8 +- .../netty/http/HttpClientInitializerFactory.java | 4 +- .../netty/http/HttpServerInitializerFactory.java | 4 +- .../netty/http/NettyHttpConfiguration.java | 8 +- components/camel-netty/pom.xml | 5 + .../component/netty/NettyComponentConfigurer.java | 10 +- .../netty/NettyConfigurationConfigurer.java| 28 +++-- .../component/netty/NettyEndpointConfigurer.java | 10 +- .../org/apache/camel/component/netty/netty.json| 8 +- .../netty/DefaultClientInitializerFactory.java | 4 +- .../netty/DefaultServerInitializerFactory.java | 4 +- .../camel/component/netty/NettyConfiguration.java | 97 +++- .../component/netty/MainNettyCustomCodecTest.java | 60 ++ .../dsl/NettyComponentBuilderFactory.java | 16 +-- .../dsl/NettyHttpComponentBuilderFactory.java | 16 +-- .../endpoint/dsl/NettyEndpointBuilderFactory.java | 127 + .../dsl/NettyHttpEndpointBuilderFactory.java | 127 + parent/pom.xml | 14 +-- 22 files changed, 246 insertions(+), 362 deletions(-) create mode 100644 components/camel-netty/src/test/java/org/apache/camel/component/netty/MainNettyCustomCodecTest.java
[GitHub] [camel] github-actions[bot] opened a new pull request, #7526: Generated sources regen
github-actions[bot] opened a new pull request, #7526: URL: https://github.com/apache/camel/pull/7526 Regen bot :robot: found some uncommited changes after running build on :camel: camel-3.14.x. Please do not delete `regen_bot_3.14.x` branch after merge/rebase. -- 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: Dependency upgrades
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 708701eb632 Dependency upgrades
708701eb632 is described below
commit 708701eb6327df34e087755fd8e1fefb58ab459d
Author: Claus Ibsen
AuthorDate: Thu Apr 28 22:36:59 2022 +0200
Dependency upgrades
---
camel-dependencies/pom.xml | 15 ---
parent/pom.xml | 14 +++---
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index cd0e7d084e3..ea8dd04353f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -156,8 +156,8 @@
4.8
3.2.0
4.3.0
-3.5.1
-3.5.1
+3.5.2
+3.5.2
[3.5,3.6)
3.3.1
3.3.1
@@ -245,6 +245,7 @@
29.0-jre
3.3.2
2.2
+2.3
4.2.0
2.3
1.11
@@ -320,7 +321,7 @@
${jetty-version}
org.eclipse.jetty
${jetty9-version}
-9.4.45.v20220203
+9.4.46.v20220331
6.1.0.202203080745-r
1.8
1.0.8
@@ -397,7 +398,7 @@
3.0.0-M4
3.3.1
4.2.9
-1.8.4
+1.8.5
2.0.1
3.0
3.0.1
@@ -498,10 +499,10 @@
2.1-groovy-3.0
4.3.5
2.6.2
-5.5.10
+5.5.11
2.3.6.RELEASE
2.4.2
-5.6.2
+5.6.3
${spring5-version}
[5,6)
3.1.3
@@ -523,7 +524,7 @@
false
7.55.3
4.0.7
-2.2.16.Final
+2.2.17.Final
2.9.1
2.0.1.Final
0.10.2
diff --git a/parent/pom.xml b/parent/pom.xml
index 9af40454b6f..2dda06a5273 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -140,9 +140,9 @@
4.8
3.2.0
4.3.0
-3.5.1
+3.5.2
[3.5,3.6)
-3.5.1
+3.5.2
3.3.1
3.3.1
@@ -302,7 +302,7 @@
2.0
3.7.1
0.5.11
-9.4.45.v20220203
+9.4.46.v20220331
${jetty9-version}
${jetty-version}
org.eclipse.jetty
@@ -385,7 +385,7 @@
3.0.0-M4
3.3.1
4.2.9
-1.8.4
+1.8.5
2.0.1
3.0.1
3.0
@@ -487,13 +487,13 @@
2.1-groovy-3.0
4.3.5
2.6.2
-5.5.10
+5.5.11
2.3.6.RELEASE
[5,6)
${spring5-version}
5.3.19
2.4.2
-5.6.2
+5.6.3
3.1.3
1.5
3.14.7
@@ -511,7 +511,7 @@
2.3.0
7.55.3
4.0.7
-2.2.16.Final
+2.2.17.Final
2.9.1
2.0.1.Final
0.10.2
[camel-spring-boot] branch main updated: CAMEL-18011: upgrade to spring boot 2.6.7
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 f5ff9ec832a CAMEL-18011: upgrade to spring boot 2.6.7 f5ff9ec832a is described below commit f5ff9ec832ad3fb65caf7214dedab8c981d52358 Author: Claus Ibsen AuthorDate: Thu Apr 28 22:22:47 2022 +0200 CAMEL-18011: upgrade to spring boot 2.6.7 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index 2dd7ea42541..f259f99b81c 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.6.6 + 2.6.7 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 9a280677754..3df5de14dab 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.6.6 +2.6.7 3.17.0-SNAPSHOT
[camel] branch regen_bot updated (44d0a562917 -> dbde0cfdcbe)
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 discard 44d0a562917 Regen for commit cbe5c7ce6151fed406522c5f0d0391db18da70c0 add 33807af8f58 CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies add 6ccf9cc2723 (chores) camel-kafka: use final fields where possible add 944e65b0ae2 (chores) camel-kafka: ensures all writes to the last error happen through the setter add dbde0cfdcbe Regen for commit 944e65b0ae245e157aa5df2405edaf57c918d63a 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 (44d0a562917) \ N -- N -- N refs/heads/regen_bot (dbde0cfdcbe) 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/kafka/KafkaFetchRecords.java | 20 .../apache/camel/component/kafka/KafkaProducer.java | 4 ++-- .../consumer/errorhandler/KafkaErrorStrategies.java | 2 ++ .../errorhandler/ReconnectErrorStrategy.java | 2 +- .../consumer/errorhandler/StopErrorStrategy.java | 2 +- .../kafka/consumer/support/KafkaResumable.java | 2 +- .../resume/kafka/AbstractKafkaResumeStrategy.java| 4 ++-- 7 files changed, 21 insertions(+), 15 deletions(-)
[camel] branch regen_bot updated (83679fc4d50 -> 44d0a562917)
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 83679fc4d50 Regen for commit 4bcab4258f4d5b275acd82b9957be72c79c36683 add 91b2344cbdb Polished add cbe5c7ce615 (chores) camel-kafka: fix flaky idempotent test add 44d0a562917 Regen for commit cbe5c7ce6151fed406522c5f0d0391db18da70c0 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 (83679fc4d50) \ N -- N -- N refs/heads/regen_bot (44d0a562917) 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: .../kafka/KafkaIdempotentRepositoryPersistenceIT.java | 14 ++ .../src/main/resources/templates/java.tmpl | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-)
[camel-karaf] branch camel-karaf-3.14.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-karaf-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/camel-karaf-3.14.x by this
push:
new 020a5007 Regen
020a5007 is described below
commit 020a5007b740476a79bc8740b73ee0bea188dbcf
Author: Claus Ibsen
AuthorDate: Thu Apr 28 22:09:37 2022 +0200
Regen
---
.../org/apache/camel/catalog/karaf/components/netty-http.json | 8
.../org/apache/camel/catalog/karaf/components/netty.json | 8
.../org/apache/camel/catalog/karaf/dataformats/fhirJson.json | 2 +-
.../org/apache/camel/catalog/karaf/dataformats/fhirXml.json | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/netty-http.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/netty-http.json
index a18f1103..01aaa847 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/netty-http.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/netty-http.json
@@ -80,9 +80,9 @@
"allowDefaultCodec": { "kind": "property", "displayName": "Allow Default
Codec", "group": "codec", "label": "codec", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "The netty component installs a default codec
if both, encoder\/decoder is null and textline is fal [...]
"autoAppendDelimiter": { "kind": "property", "displayName": "Auto Append
Delimiter", "group": "codec", "label": "codec", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Whether or not to auto append missing end
delimiter when sending using the textline codec." },
"decoderMaxLineLength": { "kind": "property", "displayName": "Decoder Max
Line Length", "group": "codec", "label": "codec", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1024, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "The max line length to use for the textline
codec." },
-"decoders": { "kind": "property", "displayName": "Decoders", "group":
"codec", "label": "codec", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "A list of decoders to be used. You can use a
String which have values separated by comma, and have the [...]
+"decoders": { "kind": "property", "displayName": "Decoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "A list of decoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the Re [...]
"delimiter": { "kind": "property", "displayName": "Delimiter", "group":
"codec", "label": "codec", "required": false, "type": "object", "javaType":
"org.apache.camel.component.netty.TextLineDelimiter", "enum": [ "LINE", "NULL"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"LINE", "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "The delimiter to use for the textline codec.
[...]
-"encoders": { "kind": "property", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "A list of encoders to be used. You can use a
String which have values separated by comma, and have the [...]
+"encoders": { "kind": "property", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false,
[camel-karaf] branch camel-karaf-3.11.x updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-karaf-3.11.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/camel-karaf-3.11.x by this push: new 8ba76eca Regen 8ba76eca is described below commit 8ba76ecab8e9ca42ced2234b6f4f7809a5993b3b Author: Claus Ibsen AuthorDate: Thu Apr 28 22:08:39 2022 +0200 Regen --- .../resources/org/apache/camel/catalog/karaf/components/eventadmin.json | 2 +- .../resources/org/apache/camel/catalog/karaf/components/paxlogging.json | 2 +- .../main/resources/org/apache/camel/catalog/karaf/others/blueprint.json | 2 +- .../src/main/resources/org/apache/camel/catalog/karaf/others/kura.json | 2 +- .../resources/org/apache/camel/catalog/karaf/others/osgi-activator.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-bean-osgi/src/generated/resources/bean-osgi.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../src/generated/resources/bean-validator-osgi.json| 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../camel-blueprint-main/src/generated/resources/blueprint-main.json| 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-blueprint/src/generated/resources/blueprint.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-cmis-osgi/src/generated/resources/cmis-osgi.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../camel-cxf-blueprint/src/generated/resources/cxf-blueprint.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../src/generated/resources/cxf-transport-blueprint.json| 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- .../resources/org/apache/camel/component/eventadmin/eventadmin.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-jcache-osgi/src/generated/resources/jcache-osgi.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-kura/src/generated/resources/kura.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../camel-osgi-activator/src/generated/resources/osgi-activator.json| 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- .../resources/org/apache/camel/component/paxlogging/paxlogging.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-servlet-osgi/src/generated/resources/servlet-osgi.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../camel-test-blueprint/src/generated/resources/test-blueprint.json| 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-test-karaf/src/generated/resources/test-karaf.json | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- .../src/generated/resources/zookeeper-master-osgi.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/eventadmin.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/eventadmin.json index 4de2e7ae..e1e21995 100644 --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/eventadmin.json +++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/eventadmin.json @@ -11,7 +11,7 @@ "supportLevel": "Stable", "groupId": "org.apache.camel.karaf", "artifactId": "camel-eventadmin", -"version": "3.11.6-SNAPSHOT", +"version": "3.11.7-SNAPSHOT", "scheme": "eventadmin", "extendsScheme": "", "syntax": "eventadmin:topic", diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/paxlogging.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/paxlogging.json index a386ce3a..d2d9f520 100644 --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/paxlogging.json +++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/paxlogging.json @@ -11,7 +11,7 @@ "supportLevel": "Stable", "groupId": "org.apache.camel.karaf", "artifactId": "camel-paxlogging", -"version": "3.11.6-SNAPSHOT", +"version": "3.11.7-SNAPSHOT",
[GitHub] [camel-k] phantomjinx commented on issue #3053: Add log-level setting on Camel K operator
phantomjinx commented on issue #3053: URL: https://github.com/apache/camel-k/issues/3053#issuecomment-1112598071 Fixed by https://github.com/apache/camel-k/pull/3245. -- 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 issue #3243: Preflight Test: Failure
phantomjinx commented on issue #3243: URL: https://github.com/apache/camel-k/issues/3243#issuecomment-1112597486 Fixed by https://github.com/apache/camel-k/pull/3245. -- 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 opened a new pull request, #3245: #3053 #3242 Fixes e2e preflight and adds debug level to logging
phantomjinx opened a new pull request, #3245: URL: https://github.com/apache/camel-k/pull/3245 **Release Note** ```release-note Using `kamel install -v debug`, it is now possible to switch on debug logging messages in the operator pod log. The `-v` switch has the effect of adding an environment variable (LOG_LEVEL) to the operator deployment resource. The value of this variable can be either `info`, `debug` or an integer. ``` -- 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 camel-spring-boot-3.11.x updated: CAMEL-18011: upgrade to spring boot 2.5.13
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.11.x by this push: new e189a4f5221 CAMEL-18011: upgrade to spring boot 2.5.13 e189a4f5221 is described below commit e189a4f5221cd29def964ded87a06dcd31dae347 Author: Claus Ibsen AuthorDate: Thu Apr 28 21:38:05 2022 +0200 CAMEL-18011: upgrade to spring boot 2.5.13 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index 63cceb6eb60..85d54651273 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.5.12 + 2.5.13 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 829c4deeb34..b131b1a4810 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.5.12 +2.5.13 3.11.7-SNAPSHOT
[camel] 01/03: CAMEL-17704: camel-netty-starter - Unable to set camel.component.netty.decoders
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 5440c6ab01a5a4683b2d1b34383037b26571c070 Author: Claus Ibsen AuthorDate: Tue Mar 1 16:09:24 2022 +0100 CAMEL-17704: camel-netty-starter - Unable to set camel.component.netty.decoders --- .../http/NettyHttpConfigurationConfigurer.java | 28 +-- .../camel/component/netty/http/netty-http.json | 8 +- .../netty/http/HttpClientInitializerFactory.java | 4 +- .../netty/http/HttpServerInitializerFactory.java | 4 +- .../netty/http/NettyHttpConfiguration.java | 8 +- components/camel-netty/pom.xml | 5 ++ .../component/netty/NettyComponentConfigurer.java | 10 +-- .../netty/NettyConfigurationConfigurer.java| 28 +-- .../component/netty/NettyEndpointConfigurer.java | 10 +-- .../org/apache/camel/component/netty/netty.json| 8 +- .../netty/DefaultClientInitializerFactory.java | 4 +- .../netty/DefaultServerInitializerFactory.java | 4 +- .../camel/component/netty/NettyConfiguration.java | 97 +++--- .../component/netty/MainNettyCustomCodecTest.java | 60 + 14 files changed, 200 insertions(+), 78 deletions(-) diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpConfigurationConfigurer.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpConfigurationConfigurer.java index 2fc676d9298..f81752b3585 100644 --- a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpConfigurationConfigurer.java +++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpConfigurationConfigurer.java @@ -56,7 +56,9 @@ public class NettyHttpConfigurationConfigurer extends org.apache.camel.support.c case "decodermaxlinelength": case "DecoderMaxLineLength": target.setDecoderMaxLineLength(property(camelContext, int.class, value)); return true; case "decoders": -case "Decoders": target.setDecoders(property(camelContext, java.util.List.class, value)); return true; +case "Decoders": target.setDecoders(property(camelContext, java.lang.String.class, value)); return true; +case "decodersaslist": +case "DecodersAsList": target.setDecodersAsList(property(camelContext, java.util.List.class, value)); return true; case "delimiter": case "Delimiter": target.setDelimiter(property(camelContext, org.apache.camel.component.netty.TextLineDelimiter.class, value)); return true; case "disablestreamcache": @@ -68,7 +70,9 @@ public class NettyHttpConfigurationConfigurer extends org.apache.camel.support.c case "enabledprotocols": case "EnabledProtocols": target.setEnabledProtocols(property(camelContext, java.lang.String.class, value)); return true; case "encoders": -case "Encoders": target.setEncoders(property(camelContext, java.util.List.class, value)); return true; +case "Encoders": target.setEncoders(property(camelContext, java.lang.String.class, value)); return true; +case "encodersaslist": +case "EncodersAsList": target.setEncodersAsList(property(camelContext, java.util.List.class, value)); return true; case "encoding": case "Encoding": target.setEncoding(property(camelContext, java.lang.String.class, value)); return true; case "host": @@ -239,7 +243,9 @@ public class NettyHttpConfigurationConfigurer extends org.apache.camel.support.c case "decodermaxlinelength": case "DecoderMaxLineLength": return int.class; case "decoders": -case "Decoders": return java.util.List.class; +case "Decoders": return java.lang.String.class; +case "decodersaslist": +case "DecodersAsList": return java.util.List.class; case "delimiter": case "Delimiter": return org.apache.camel.component.netty.TextLineDelimiter.class; case "disablestreamcache": @@ -251,7 +257,9 @@ public class NettyHttpConfigurationConfigurer extends org.apache.camel.support.c case "enabledprotocols": case "EnabledProtocols": return java.lang.String.class; case "encoders": -case "Encoders": return java.util.List.class; +case "Encoders": return java.lang.String.class; +case "encodersaslist": +case "EncodersAsList": return java.util.List.class; case "encoding": case "Encoding": return java.lang.String.class; case "host": @@ -424,6 +432,8 @@ public class NettyHttpConfigurationConfigurer extends org.apache.camel.support.c case "DecoderMaxLineLength": return target.getDecoderMaxLineLength(); case "decoders": case "Decoders": return target.getDecoders(); +
[camel] 02/03: Upgrade spring 5.3.19
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 726f7467810d05482a510c4c6c2bc642c2c885be
Author: Claus Ibsen
AuthorDate: Thu Apr 28 21:06:00 2022 +0200
Upgrade spring 5.3.19
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 95830849145..ea09a0aab0f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -523,7 +523,7 @@
${spring5-version}
[5,6)
3.1.3
-5.3.18
+5.3.19
1.5
3.14.7
1.17.2
diff --git a/parent/pom.xml b/parent/pom.xml
index 860ebed28fe..0139861b7c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -510,7 +510,7 @@
2.3.6.RELEASE
[5,6)
${spring5-version}
-5.3.18
+5.3.19
2.4.2
5.6.2
3.1.3
[camel] branch camel-3.14.x updated (287e0a1a824 -> 5215dcc14bf)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git from 287e0a1a824 CAMEL-17992: don't overwrite ssl from configuration with uri new 5440c6ab01a CAMEL-17704: camel-netty-starter - Unable to set camel.component.netty.decoders new 726f7467810 Upgrade spring 5.3.19 new 5215dcc14bf CAMEL-18011: Depedency upgrades in preparing for spring boot 2.6.7 upgrade 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: camel-dependencies/pom.xml |14 +- .../camel/catalog/components/netty-http.json | 8 +- .../org/apache/camel/catalog/components/netty.json | 8 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 14329 +++ .../http/NettyHttpConfigurationConfigurer.java |28 +- .../camel/component/netty/http/netty-http.json | 8 +- .../netty/http/HttpClientInitializerFactory.java | 4 +- .../netty/http/HttpServerInitializerFactory.java | 4 +- .../netty/http/NettyHttpConfiguration.java | 8 +- components/camel-netty/pom.xml | 5 + .../component/netty/NettyComponentConfigurer.java |10 +- .../netty/NettyConfigurationConfigurer.java|28 +- .../component/netty/NettyEndpointConfigurer.java |10 +- .../org/apache/camel/component/netty/netty.json| 8 +- .../netty/DefaultClientInitializerFactory.java | 4 +- .../netty/DefaultServerInitializerFactory.java | 4 +- .../camel/component/netty/NettyConfiguration.java |97 +- .../component/netty/MainNettyCustomCodecTest.java |60 + .../dsl/NettyComponentBuilderFactory.java |16 +- .../dsl/NettyHttpComponentBuilderFactory.java |16 +- .../endpoint/dsl/NettyEndpointBuilderFactory.java | 127 +- .../dsl/NettyHttpEndpointBuilderFactory.java | 127 +- parent/pom.xml |14 +- 23 files changed, 11467 insertions(+), 3470 deletions(-) create mode 100644 components/camel-netty/src/test/java/org/apache/camel/component/netty/MainNettyCustomCodecTest.java
[camel-spring-boot] 01/02: CAMEL-18011: upgrade to spring boot 2.6.7
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit d42297e852af7b3ce52eb9815a2c8e526d37599c Author: Claus Ibsen AuthorDate: Thu Apr 28 21:32:28 2022 +0200 CAMEL-18011: upgrade to spring boot 2.6.7 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index 5e641fc03c1..2543ef100a8 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.6.6 + 2.6.7 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 2c55144fd94..5367d6b6668 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.6.6 +2.6.7 3.14.3-SNAPSHOT
[camel-spring-boot] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit b16b5e866c0ba0aa5b4613dafef2e29145e9598c
Author: Claus Ibsen
AuthorDate: Thu Apr 28 21:34:33 2022 +0200
Regen
---
.../camel/springboot/catalog/components/netty-http.json| 8
.../apache/camel/springboot/catalog/components/netty.json | 8
.../camel/springboot/catalog/dataformats/fhirJson.json | 2 +-
.../camel/springboot/catalog/dataformats/fhirXml.json | 2 +-
.../camel-fhir-starter/src/main/docs/fhir.json | 8
.../fhir/springboot/FhirJsonDataFormatConfiguration.java | 4 ++--
.../fhir/springboot/FhirXmlDataFormatConfiguration.java| 4 ++--
.../camel-netty-http-starter/src/main/docs/netty-http.json | 4 ++--
.../http/springboot/NettyHttpComponentConfiguration.java | 14 ++
.../camel-netty-starter/src/main/docs/netty.json | 4 ++--
.../netty/springboot/NettyComponentConfiguration.java | 14 ++
11 files changed, 34 insertions(+), 38 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
index 2d6245d081d..8032e34111a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
@@ -80,9 +80,9 @@
"allowDefaultCodec": { "kind": "property", "displayName": "Allow Default
Codec", "group": "codec", "label": "codec", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "The netty component installs a default codec
if both, encoder\/decoder is null and textline is fal [...]
"autoAppendDelimiter": { "kind": "property", "displayName": "Auto Append
Delimiter", "group": "codec", "label": "codec", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Whether or not to auto append missing end
delimiter when sending using the textline codec." },
"decoderMaxLineLength": { "kind": "property", "displayName": "Decoder Max
Line Length", "group": "codec", "label": "codec", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1024, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "The max line length to use for the textline
codec." },
-"decoders": { "kind": "property", "displayName": "Decoders", "group":
"codec", "label": "codec", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "A list of decoders to be used. You can use a
String which have values separated by comma, and have the [...]
+"decoders": { "kind": "property", "displayName": "Decoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "A list of decoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the Re [...]
"delimiter": { "kind": "property", "displayName": "Delimiter", "group":
"codec", "label": "codec", "required": false, "type": "object", "javaType":
"org.apache.camel.component.netty.TextLineDelimiter", "enum": [ "LINE", "NULL"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"LINE", "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "The delimiter to use for the textline codec.
[...]
-"encoders": { "kind": "property", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
[camel-spring-boot] branch camel-spring-boot-3.14.x updated (5b18ff7799a -> b16b5e866c0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 5b18ff7799a Upgrade to spring boot 2.6.6 new d42297e852a CAMEL-18011: upgrade to spring boot 2.6.7 new b16b5e866c0 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- .../camel/springboot/catalog/components/netty-http.json| 8 .../apache/camel/springboot/catalog/components/netty.json | 8 .../camel/springboot/catalog/dataformats/fhirJson.json | 2 +- .../camel/springboot/catalog/dataformats/fhirXml.json | 2 +- .../camel-fhir-starter/src/main/docs/fhir.json | 8 .../fhir/springboot/FhirJsonDataFormatConfiguration.java | 4 ++-- .../fhir/springboot/FhirXmlDataFormatConfiguration.java| 4 ++-- .../camel-netty-http-starter/src/main/docs/netty-http.json | 4 ++-- .../http/springboot/NettyHttpComponentConfiguration.java | 14 ++ .../camel-netty-starter/src/main/docs/netty.json | 4 ++-- .../netty/springboot/NettyComponentConfiguration.java | 14 ++ pom.xml| 2 +- 13 files changed, 36 insertions(+), 40 deletions(-)
[camel] branch main updated (33807af8f58 -> 944e65b0ae2)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 33807af8f58 CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies new 6ccf9cc2723 (chores) camel-kafka: use final fields where possible new 944e65b0ae2 (chores) camel-kafka: ensures all writes to the last error happen through the setter The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/camel/component/kafka/KafkaFetchRecords.java| 14 +- .../org/apache/camel/component/kafka/KafkaProducer.java| 4 ++-- .../consumer/errorhandler/ReconnectErrorStrategy.java | 2 +- .../kafka/consumer/errorhandler/StopErrorStrategy.java | 2 +- .../component/kafka/consumer/support/KafkaResumable.java | 2 +- .../resume/kafka/AbstractKafkaResumeStrategy.java | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-)
[camel] 02/02: (chores) camel-kafka: ensures all writes to the last error happen through the setter
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 944e65b0ae245e157aa5df2405edaf57c918d63a
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 16:23:20 2022 +0200
(chores) camel-kafka: ensures all writes to the last error happen through
the setter
---
.../apache/camel/component/kafka/KafkaFetchRecords.java| 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index 0f090a34d41..b1befdfa5c3 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -154,7 +154,7 @@ public class KafkaFetchRecords implements Runnable {
setConnected(true);
}
-lastError = null;
+setLastError(null);
startPolling();
} while ((pollExceptionStrategy.canContinue() || isReconnect()) &&
isKafkaConsumerRunnable());
@@ -172,7 +172,7 @@ public class KafkaFetchRecords implements Runnable {
String msg = "Gave up subscribing
org.apache.kafka.clients.consumer.KafkaConsumer " +
threadId + " to " + topic + " after " + max + " attempts
(elapsed: " + time + ").";
LOG.warn(msg);
-lastError = new KafkaConsumerFatalException(msg, lastError);
+setLastError(new KafkaConsumerFatalException(msg, lastError));
}
private void setupCreateConsumerException(ForegroundTask task, int max) {
@@ -180,7 +180,8 @@ public class KafkaFetchRecords implements Runnable {
String topic = getPrintableTopic();
String msg = "Gave up creating
org.apache.kafka.clients.consumer.KafkaConsumer "
+ threadId + " to " + topic + " after " + max + "
attempts (elapsed: " + time + ").";
-lastError = new KafkaConsumerFatalException(msg, lastError);
+
+setLastError(new KafkaConsumerFatalException(msg, lastError));
}
private boolean initializeConsumerTask() {
@@ -191,7 +192,7 @@ public class KafkaFetchRecords implements Runnable {
// ensure this is logged so users can see the problem
LOG.warn("Error subscribing
org.apache.kafka.clients.consumer.KafkaConsumer due to: {}", e.getMessage(),
e);
-lastError = e;
+setLastError(e);
return false;
}
@@ -219,7 +220,7 @@ public class KafkaFetchRecords implements Runnable {
// ensure this is logged so users can see the problem
LOG.warn("Error creating
org.apache.kafka.clients.consumer.KafkaConsumer due to: {}", e.getMessage(),
e);
-lastError = e;
+setLastError(e);
return false;
}
@@ -551,4 +552,7 @@ public class KafkaFetchRecords implements Runnable {
state = State.RESUME_REQUESTED;
}
+private synchronized void setLastError(Exception lastError) {
+this.lastError = lastError;
+}
}
[camel] 01/02: (chores) camel-kafka: use final fields where possible
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6ccf9cc272359491388cd6f704e1300a12b6ccf1
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 15:57:48 2022 +0200
(chores) camel-kafka: use final fields where possible
---
.../src/main/java/org/apache/camel/component/kafka/KafkaProducer.java | 4 ++--
.../component/kafka/consumer/errorhandler/ReconnectErrorStrategy.java | 2 +-
.../component/kafka/consumer/errorhandler/StopErrorStrategy.java | 2 +-
.../apache/camel/component/kafka/consumer/support/KafkaResumable.java | 2 +-
.../camel/processor/resume/kafka/AbstractKafkaResumeStrategy.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 88f1f0a7e81..bcdf40e406e 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -520,8 +520,8 @@ public class KafkaProducer extends DefaultAsyncProducer {
class KafkaTransactionSynchronization extends SynchronizationAdapter {
private static final Logger LOG =
LoggerFactory.getLogger(KafkaTransactionSynchronization.class);
-private String transactionId;
-private Producer kafkaProducer;
+private final String transactionId;
+private final Producer kafkaProducer;
public KafkaTransactionSynchronization(String transactionId, Producer
kafkaProducer) {
this.transactionId = transactionId;
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/ReconnectErrorStrategy.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/ReconnectErrorStrategy.java
index 0d54cbe0706..77036a9aa07 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/ReconnectErrorStrategy.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/ReconnectErrorStrategy.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
public class ReconnectErrorStrategy implements PollExceptionStrategy {
private static final Logger LOG =
LoggerFactory.getLogger(ReconnectErrorStrategy.class);
-private KafkaFetchRecords recordFetcher;
+private final KafkaFetchRecords recordFetcher;
private boolean retry = true;
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/StopErrorStrategy.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/StopErrorStrategy.java
index 6258ad3ac63..2e649614c22 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/StopErrorStrategy.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/StopErrorStrategy.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
public class StopErrorStrategy implements PollExceptionStrategy {
private static final Logger LOG =
LoggerFactory.getLogger(StopErrorStrategy.class);
-private KafkaFetchRecords recordFetcher;
+private final KafkaFetchRecords recordFetcher;
private boolean retry = true;
public StopErrorStrategy(KafkaFetchRecords recordFetcher) {
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
index a210c475bec..388f47fa3e5 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
@@ -22,7 +22,7 @@ import org.apache.camel.Resumable;
import org.apache.camel.resume.Offsets;
public class KafkaResumable implements Resumable {
-private String partition;
+private final String partition;
private String offset;
public KafkaResumable(String partition, String offset) {
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/AbstractKafkaResumeStrategy.java
b/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/AbstractKafkaResumeStrategy.java
index 80825eeb76d..9960cecccf4 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/AbstractKafkaResumeStrategy.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/AbstractKafkaResumeStrategy.java
@@ -66,8 +66,8 @@ public abstract class
[GitHub] [camel] orpiske merged pull request #7524: camel-kafka: minor cleanups
orpiske merged PR #7524: URL: https://github.com/apache/camel/pull/7524 -- 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-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 33807af8f58 CAMEL-18020: fix a possible NPE due to uninitialized
consumer in poll exception strategies
33807af8f58 is described below
commit 33807af8f5881a4b1619a336db81ccfbafb6858d
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 15:02:41 2022 +0200
CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll
exception strategies
---
.../java/org/apache/camel/component/kafka/KafkaFetchRecords.java| 6 +++---
.../component/kafka/consumer/errorhandler/KafkaErrorStrategies.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index c2002826d7c..0f090a34d41 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -73,7 +73,7 @@ public class KafkaFetchRecords implements Runnable {
private final Pattern topicPattern;
private final String threadId;
private final Properties kafkaProps;
-private final PollExceptionStrategy pollExceptionStrategy;
+private PollExceptionStrategy pollExceptionStrategy;
private final BridgeExceptionHandlerToErrorHandler bridge;
private final ReentrantLock lock = new ReentrantLock();
private CommitManager commitManager;
@@ -98,8 +98,6 @@ public class KafkaFetchRecords implements Runnable {
this.consumerListener = consumerListener;
this.threadId = topicName + "-" + "Thread " + id;
this.kafkaProps = kafkaProps;
-
-this.pollExceptionStrategy = KafkaErrorStrategies.strategies(this,
kafkaConsumer.getEndpoint(), consumer);
}
@Override
@@ -257,6 +255,8 @@ public class KafkaFetchRecords implements Runnable {
}
}
}
+
+this.pollExceptionStrategy = KafkaErrorStrategies.strategies(this,
kafkaConsumer.getEndpoint(), consumer);
} finally {
Thread.currentThread().setContextClassLoader(threadClassLoader);
}
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
index 3541e08dbce..c02bf78d1eb 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/errorhandler/KafkaErrorStrategies.java
@@ -32,6 +32,8 @@ public final class KafkaErrorStrategies {
public static PollExceptionStrategy strategies(
KafkaFetchRecords recordFetcher, KafkaEndpoint endpoint,
Consumer consumer) {
+assert consumer != null;
+
PollExceptionStrategy strategy =
endpoint.getComponent().getPollExceptionStrategy();
if (strategy != null) {
return strategy;
[GitHub] [camel] orpiske merged pull request #7521: CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
orpiske merged PR #7521: URL: https://github.com/apache/camel/pull/7521 -- 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 commented on pull request #7521: CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
orpiske commented on PR #7521: URL: https://github.com/apache/camel/pull/7521#issuecomment-1112579274 The test failure is related to the other PR that fixed the flaky test. -- 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) camel-kafka: fix flaky idempotent test
This is an automated email from the ASF dual-hosted git repository. orpiske 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 cbe5c7ce615 (chores) camel-kafka: fix flaky idempotent test cbe5c7ce615 is described below commit cbe5c7ce6151fed406522c5f0d0391db18da70c0 Author: Otavio Rodolfo Piske AuthorDate: Thu Apr 28 19:39:58 2022 +0200 (chores) camel-kafka: fix flaky idempotent test --- .../kafka/KafkaIdempotentRepositoryPersistenceIT.java | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryPersistenceIT.java b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryPersistenceIT.java index 6ee92db8546..1a495cb7f01 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryPersistenceIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryPersistenceIT.java @@ -18,6 +18,7 @@ package org.apache.camel.processor.idempotent.kafka; import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; import java.util.stream.Stream; import org.apache.camel.EndpointInject; @@ -37,6 +38,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -91,7 +93,8 @@ public class KafkaIdempotentRepositoryPersistenceIT extends BaseEmbeddedKafkaTes sendMessages(count); // all records sent initially -assertEquals(count, mockBefore.getReceivedCounter()); +await().atMost(10, TimeUnit.SECONDS) +.untilAsserted(() -> assertEquals(count, mockBefore.getReceivedCounter())); // filters second attempt with same value assertEquals(5, kafkaIdempotentRepository.getDuplicateCount()); @@ -110,7 +113,8 @@ public class KafkaIdempotentRepositoryPersistenceIT extends BaseEmbeddedKafkaTes sendMessages(count); // all records sent initially -assertEquals(count, mockBefore.getReceivedCounter()); +await().atMost(10, TimeUnit.SECONDS) +.untilAsserted(() -> assertEquals(count, mockBefore.getReceivedCounter())); // the state from the previous test guarantees that all attempts now are blocked assertEquals(count, kafkaIdempotentRepository.getDuplicateCount()); @@ -131,7 +135,8 @@ public class KafkaIdempotentRepositoryPersistenceIT extends BaseEmbeddedKafkaTes } // all records sent initially -assertEquals(count * passes, mockBefore.getReceivedCounter()); +await().atMost(10, TimeUnit.SECONDS) +.untilAsserted(() -> assertEquals(count * passes, mockBefore.getReceivedCounter())); // the state from the previous test guarantees that all attempts now are blocked assertEquals(count * passes, kafkaIdempotentRepository.getDuplicateCount()); @@ -158,7 +163,8 @@ public class KafkaIdempotentRepositoryPersistenceIT extends BaseEmbeddedKafkaTes } // all records sent initially -assertEquals(count, mockBefore.getReceivedCounter()); +await().atMost(10, TimeUnit.SECONDS) +.untilAsserted(() -> assertEquals(count, mockBefore.getReceivedCounter())); // there are no duplicate messages on this pass assertEquals(0, kafkaIdempotentRepository.getDuplicateCount());
[GitHub] [camel] orpiske merged pull request #7523: (chores) camel-kafka: fix flaky idempotent test
orpiske merged PR #7523: URL: https://github.com/apache/camel/pull/7523 -- 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 commented on pull request #7523: (chores) camel-kafka: fix flaky idempotent test
orpiske commented on PR #7523: URL: https://github.com/apache/camel/pull/7523#issuecomment-1112577996 The failure is unrelated to the fixed flaky test, so merging. -- 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 (21e3837537e -> 83679fc4d50)
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 discard 21e3837537e Regen for commit 91b2344cbdb40214da8b6831211174688784166a omit 91b2344cbdb Polished add 83679fc4d50 Regen for commit 4bcab4258f4d5b275acd82b9957be72c79c36683 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 (21e3837537e) \ N -- N -- N refs/heads/regen_bot (83679fc4d50) 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-jbang-core/src/main/resources/templates/java.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (f8c21bc83d8 -> 21e3837537e)
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 f8c21bc83d8 Regen for commit 31440afbb2e4df2d25457cb0c040cc0a9ec7d16c add 4bcab4258f4 CAMEL-18028: camel-jbang - camel run without args add 91b2344cbdb Polished add 21e3837537e Regen for commit 91b2344cbdb40214da8b6831211174688784166a 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 (f8c21bc83d8) \ N -- N -- N refs/heads/regen_bot (21e3837537e) 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: .../apache/camel/dsl/jbang/core/commands/Run.java | 79 +++--- .../src/main/resources/templates/java.tmpl | 4 +- 2 files changed, 57 insertions(+), 26 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #7524: camel-kafka: minor cleanups
github-actions[bot] commented on PR #7524: URL: https://github.com/apache/camel/pull/7524#issuecomment-1112546608 :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 #7521: CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
github-actions[bot] commented on PR #7521: URL: https://github.com/apache/camel/pull/7521#issuecomment-1112541626 :x: Finished component verification: **1 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 #7523: (chores) camel-kafka: fix flaky idempotent test
github-actions[bot] commented on PR #7523: URL: https://github.com/apache/camel/pull/7523#issuecomment-1112541521 :x: Finished component verification: **1 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 (c38892b8bd8 -> f8c21bc83d8)
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 c38892b8bd8 Regen for commit 8fc62490b8c10a843189f41b8d16fba480cc9864 add 31440afbb2e CAMEL-18023. Fix for prefix and formating (#7520) add f8c21bc83d8 Regen for commit 31440afbb2e4df2d25457cb0c040cc0a9ec7d16c 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 (c38892b8bd8) \ N -- N -- N refs/heads/regen_bot (f8c21bc83d8) 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: .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java | 2 +- .../main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java| 2 +- .../java/org/apache/camel/dsl/jbang/core/commands/PropertiesHelper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch regen_bot updated (455af7342a2 -> c38892b8bd8)
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 455af7342a2 Regen for commit a8ae00bfd55baceb0294cdd7732f4c8d44a53656 add 8fc62490b8c CAMEL-18028: camel-jbang - camel run without args add c38892b8bd8 Regen for commit 8fc62490b8c10a843189f41b8d16fba480cc9864 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 (455af7342a2) \ N -- N -- N refs/heads/regen_bot (c38892b8bd8) 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: .../apache/camel/dsl/jbang/core/commands/Run.java | 263 +++-- 1 file changed, 136 insertions(+), 127 deletions(-)
[camel] branch regen_bot updated (b23ab4a047b -> 455af7342a2)
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 b23ab4a047b CAMEL-18000: camel-johnzon - Upgrade to 1.2.17 (#7517)
add ef24ea4fdf6 CAMEL-18023. camel-jbang command options from
application.properties (#7511)
add c86f7405c3f camel-jbang - Add version command
add 54deeae27e0 chore : add a a special hapi-base-version so different
versions of hapi-base and hapi-structures can be used (#7519)
add b1288fbfb0f camel-yaml-dsl - Fix mistake in schema about error handler
should not end in .class
add bd0d9cd7b2a CAMEL-18024: rework the last processed offset tracking
add aa306b7100b CAMEL-18024: use the commit manager for manual commits
add 9f24cf4 (chores) ci: run format and checkstyle builds regularly
add 642e55a0a6e (chores) ci: run format and checkstyle builds regularly
(fixed YAML formatting)
add ff47c2affc2 (chores) ci: run format and checkstyle builds regularly
(fixed non-standard cron)
add a8ae00bfd55 (chores) fix checkstyle in camel-jbang
add 455af7342a2 Regen for commit a8ae00bfd55baceb0294cdd7732f4c8d44a53656
No new revisions were added by this update.
Summary of changes:
...er-push-build.yml => main-checkstyle-build.yml} | 41 ++-
.../{master-push-build.yml => main-push-build.yml} | 8 +-
camel-dependencies/pom.xml | 1 +
components/camel-hl7/pom.xml | 2 +-
.../camel/component/kafka/KafkaFetchRecords.java | 24 ++--
.../kafka/consumer/AbstractCommitManager.java | 10 +-
.../kafka/consumer/AsyncCommitManager.java | 38 +++---
.../component/kafka/consumer/CommitManager.java| 37 --
.../kafka/consumer/CommitToOffsetManager.java | 24 ++--
.../consumer/DefaultKafkaManualAsyncCommit.java| 45 +---
.../DefaultKafkaManualAsyncCommitFactory.java | 27 +
.../kafka/consumer/DefaultKafkaManualCommit.java | 9 +-
.../consumer/DefaultKafkaManualCommitFactory.java | 26 +
.../consumer/DefaultKafkaManualSyncCommit.java | 32 +-
.../kafka/consumer/KafkaAsyncManualCommit.java | 5 +-
.../kafka/consumer/KafkaManualCommitFactory.java | 17 +--
.../kafka/consumer/NoopCommitManager.java | 10 +-
.../component/kafka/consumer/OffsetCache.java | 64 +++
.../kafka/consumer/SyncCommitManager.java | 31 ++---
.../consumer/support/KafkaRecordProcessor.java | 2 +-
.../support/KafkaRecordProcessorFacade.java| 16 +--
.../support/PartitionAssignmentListener.java | 40 +--
.../component/kafka/consumer/OffsetCacheTest.java | 128 +
.../integration/pause/KafkaPausableConsumerIT.java | 12 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_17.adoc| 7 ++
.../dsl/jbang/core/commands/CamelJBangMain.java| 4 +-
.../dsl/jbang/core/commands/PropertiesHelper.java | 112 ++
.../camel/dsl/jbang/core/commands/Version.java | 34 +++---
.../RouteConfigurationDefinitionDeserializer.java | 2 +-
.../src/generated/resources/camel-yaml-dsl.json| 2 +-
.../src/generated/resources/camelYamlDsl.json | 2 +-
parent/pom.xml | 1 +
32 files changed, 482 insertions(+), 331 deletions(-)
copy .github/workflows/{master-push-build.yml => main-checkstyle-build.yml}
(51%)
rename .github/workflows/{master-push-build.yml => main-push-build.yml} (90%)
create mode 100644
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/OffsetCache.java
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/consumer/OffsetCacheTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/PropertiesHelper.java
copy
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/CommitManager.java
=>
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Version.java
(50%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #7525: Generated sources regen
github-actions[bot] opened a new pull request, #7525: URL: https://github.com/apache/camel/pull/7525 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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: Polished
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 91b2344cbdb Polished
91b2344cbdb is described below
commit 91b2344cbdb40214da8b6831211174688784166a
Author: Claus Ibsen
AuthorDate: Thu Apr 28 20:05:26 2022 +0200
Polished
---
.../camel-jbang-core/src/main/resources/templates/java.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
index 722e7fc0fe6..37bc087951e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/java.tmpl
@@ -1,4 +1,4 @@
-// camel-k: language=java property=time=1000
+// camel-k: language=java
import org.apache.camel.builder.RouteBuilder;
@@ -8,7 +8,7 @@ public class {{ .Name }} extends RouteBuilder {
public void configure() throws Exception {
// Write your routes here, for example:
-from("timer:java?period={{time}}").routeId("java")
+from("timer:java?period={{time:1000}}").routeId("java")
.setBody()
.simple("Hello Camel from ${routeId}")
.log("${body}");
[camel] branch main updated: CAMEL-18028: camel-jbang - camel run without args
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 4bcab4258f4 CAMEL-18028: camel-jbang - camel run without args
4bcab4258f4 is described below
commit 4bcab4258f4d5b275acd82b9957be72c79c36683
Author: Claus Ibsen
AuthorDate: Thu Apr 28 20:01:53 2022 +0200
CAMEL-18028: camel-jbang - camel run without args
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 81 +++---
1 file changed, 57 insertions(+), 24 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 3fae81ac6e3..7ef863639ed 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -18,6 +18,7 @@ package org.apache.camel.dsl.jbang.core.commands;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -183,12 +184,46 @@ class Run implements Callable {
return 0;
}
+private OrderedProperties loadApplicationProperties(File source) throws
Exception {
+OrderedProperties prop = new OrderedProperties();
+prop.load(new FileInputStream(source));
+
+// special for routes include pattern that we need to "fix" after
reading from application.properties
+// to make this work in run command
+String value = prop.getProperty("camel.main.routesIncludePattern");
+if (value != null) {
+// if not scheme then must use file: as this is what run command
expects
+StringJoiner sj = new StringJoiner(",");
+for (String part : value.split(",")) {
+if (!part.contains(":")) {
+part = "file:" + part;
+}
+sj.add(part);
+}
+value = sj.toString();
+prop.setProperty("camel.main.routesIncludePattern", value);
+}
+
+return prop;
+}
+
+private static String prefixFile(String line, String key) {
+String value = StringHelper.after(line, key + "=");
+if (value != null) {
+
+value = value.replaceAll("file:", "classpath:");
+line = key + "=" + value;
+}
+return line;
+}
+
+
private int run() throws Exception {
File work = new File(WORK_DIR);
FileUtil.removeDir(work);
work.mkdirs();
-OrderedProperties existingProps = null;
+OrderedProperties applicationProperties = null;
if (files == null || files.length == 0) {
// special when no files have been specified then we use
application.properties as source to know what to run
File source = new File("application.properties");
@@ -196,12 +231,10 @@ class Run implements Callable {
System.out.println("Cannot run because application.properties
file does not exist");
return 1;
}
-
-existingProps = new OrderedProperties();
-existingProps.load(new FileInputStream(source));
+applicationProperties = loadApplicationProperties(source);
// logging level may be configured in the properties file
-loggingLevel = existingProps.getProperty("loggingLevel",
loggingLevel);
+loggingLevel = applicationProperties.getProperty("loggingLevel",
loggingLevel);
}
// configure logging first
@@ -232,18 +265,18 @@ class Run implements Callable {
});
main.setAppName("Apache Camel (JBang)");
-writeSetting(main, existingProps, "camel.main.name", name);
-writeSetting(main, existingProps, "camel.main.shutdownTimeout", "5");
+writeSetting(main, applicationProperties, "camel.main.name", name);
+writeSetting(main, applicationProperties,
"camel.main.shutdownTimeout", "5");
-writeSetting(main, existingProps, "camel.main.routesReloadEnabled",
reload ? "true" : "false");
-writeSetting(main, existingProps, "camel.main.sourceLocationEnabled",
"true");
-writeSetting(main, existingProps, "camel.main.tracing", trace ? "true"
: "false");
-writeSetting(main, existingProps, "camel.main.modeline", modeline ?
"true" : "false");
+writeSetting(main, applicationProperties,
"camel.main.routesReloadEnabled", reload ? "true" : "false");
+writeSetting(main, applicationProperties,
"camel.main.sourceLocationEnabled", "true");
+writeSetting(main, applicationProperties,
[GitHub] [camel] github-actions[bot] commented on pull request #7524: camel-kafka: minor cleanups
github-actions[bot] commented on PR #7524: URL: https://github.com/apache/camel/pull/7524#issuecomment-1112495586 :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, #7524: camel-kafka: minor cleanups
orpiske opened a new pull request, #7524: URL: https://github.com/apache/camel/pull/7524 This depends on #7521 -- 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-18023. Fix for prefix and formating (#7520)
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 31440afbb2e CAMEL-18023. Fix for prefix and formating (#7520)
31440afbb2e is described below
commit 31440afbb2e4df2d25457cb0c040cc0a9ec7d16c
Author: Marat Gubaidullin
AuthorDate: Thu Apr 28 13:44:45 2022 -0400
CAMEL-18023. Fix for prefix and formating (#7520)
* Sync property prefix
* Format
* Jar file default value
* Fix stylecheck issue
---
.../java/org/apache/camel/dsl/jbang/core/commands/Image.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/Manifest.java| 2 +-
.../camel/dsl/jbang/core/commands/PropertiesHelper.java | 11 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
index a56a0e1b796..ea5a1f82613 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java
@@ -57,7 +57,7 @@ public class Image implements Callable {
private boolean helpRequested;
@CommandLine.Option(names = { "-f", "--from" }, description = "Base
Image", defaultValue = "gcr.io/distroless/java:11")
private String from;
-@CommandLine.Option(names = { "-j", "--jar" }, description = "Jar file",
defaultValue = "target/camel-runner.jar")
+@CommandLine.Option(names = { "-j", "--jar" }, description = "Jar file",
defaultValue = "camel-runner.jar")
private String jar;
@CommandLine.Option(names = { "-t", "--tag" }, description = "Image tag")
private String tag;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
index a95220749a1..61ffa8ecc0f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java
@@ -65,7 +65,7 @@ public class Manifest implements Callable {
private boolean minikube;
@CommandLine.Option(names = { "--openshift" }, description = "Target is
openshift")
private boolean openshift;
-@CommandLine.Option(names = { "-j", "--jar" }, description = "Jar file",
defaultValue = "target/camel-runner.jar")
+@CommandLine.Option(names = { "-j", "--jar" }, description = "Jar file",
defaultValue = "camel-runner.jar")
private String jar;
@Override
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/PropertiesHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/PropertiesHelper.java
index 03505bedfd7..0a1f355648d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/PropertiesHelper.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/PropertiesHelper.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
public final class PropertiesHelper {
private static final Logger LOG =
LoggerFactory.getLogger(CamelJBangMain.class);
private static final String APPLICATION_PROPERTIES_FILE =
"application.properties";
-private static final String PROPERTY_PREFIX = "camel-jbang";
+private static final String PROPERTY_PREFIX = "camel.jbang";
private static final String COMMAND_PREFIX = "CamelJBang";
private static final String COMMON_PREFIX = COMMAND_PREFIX + ".project.";
private static final List COMMON_ARGUMENTS = List.of("namespace",
"name", "version");
@@ -50,7 +50,8 @@ public final class PropertiesHelper {
}
private static Properties augmentProperties(Properties properties, final
CommandLine commandLine) {
-List commonArgumentList = commonArgumentList(new
ArrayList<>(), commandLine.getSubcommands(), commandLine.getCommandName());
+List commonArgumentList
+= commonArgumentList(new ArrayList<>(),
commandLine.getSubcommands(), commandLine.getCommandName());
commonArgumentList.forEach(key -> {
if (!properties.contains(key)) {
String[] parts = key.split(Pattern.quote("."));
@@ -64,7 +65,8 @@ public final class PropertiesHelper {
return properties;
}
-private static List commonArgumentList(List list,
Map commandLines, String parentPrefix) {
+private static List commonArgumentList(
+List list, Map commandLines, String
[GitHub] [camel] davsclaus merged pull request #7520: CAMEL-18023. Fix for prefix and formating
davsclaus merged PR #7520: URL: https://github.com/apache/camel/pull/7520 -- 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-18028: camel-jbang - camel run without args
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 8fc62490b8c CAMEL-18028: camel-jbang - camel run without args
8fc62490b8c is described below
commit 8fc62490b8c10a843189f41b8d16fba480cc9864
Author: Claus Ibsen
AuthorDate: Thu Apr 28 19:41:12 2022 +0200
CAMEL-18028: camel-jbang - camel run without args
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 262 +++--
1 file changed, 135 insertions(+), 127 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 584849c4f9e..3fae81ac6e3 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -17,6 +17,7 @@
package org.apache.camel.dsl.jbang.core.commands;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -24,12 +25,14 @@ import java.nio.file.FileSystems;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Locale;
+import java.util.Properties;
import java.util.Set;
import java.util.StringJoiner;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import org.apache.camel.CamelContext;
import org.apache.camel.dsl.jbang.core.common.RuntimeUtil;
@@ -38,6 +41,7 @@ import org.apache.camel.support.ResourceHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
@@ -59,7 +63,7 @@ class Run implements Callable {
private File lockFile;
private ScheduledExecutorService executor;
-@Parameters(description = "The Camel file(s) to run", arity = "1")
+@Parameters(description = "The Camel file(s) to run. If no files specified
then application.properties is used as source for which files to run.", arity =
"0..9")
private String[] files;
//CHECKSTYLE:OFF
@@ -144,6 +148,22 @@ class Run implements Callable {
}
}
+private void writeSetting(KameletMain main, Properties existing, String
key, String value) {
+String val = existing != null ? existing.getProperty(key, value) :
value;
+if (val != null) {
+main.addInitialProperty(key, val);
+writeSettings(key, val);
+}
+}
+
+private void writeSetting(KameletMain main, Properties existing, String
key, Supplier value) {
+String val = existing != null ? existing.getProperty(key, value.get())
: value.get();
+if (val != null) {
+main.addInitialProperty(key, val);
+writeSettings(key, val);
+}
+}
+
private int stop() {
File currentDir = new File(".");
@@ -168,6 +188,22 @@ class Run implements Callable {
FileUtil.removeDir(work);
work.mkdirs();
+OrderedProperties existingProps = null;
+if (files == null || files.length == 0) {
+// special when no files have been specified then we use
application.properties as source to know what to run
+File source = new File("application.properties");
+if (!source.exists()) {
+System.out.println("Cannot run because application.properties
file does not exist");
+return 1;
+}
+
+existingProps = new OrderedProperties();
+existingProps.load(new FileInputStream(source));
+
+// logging level may be configured in the properties file
+loggingLevel = existingProps.getProperty("loggingLevel",
loggingLevel);
+}
+
// configure logging first
if (logging) {
RuntimeUtil.configureLog(loggingLevel);
@@ -196,24 +232,18 @@ class Run implements Callable {
});
main.setAppName("Apache Camel (JBang)");
-main.addInitialProperty("camel.main.name", name);
-writeSettings("camel.main.name", name);
-
-// shutdown quickly
-main.addInitialProperty("camel.main.shutdownTimeout", "5");
-writeSettings("camel.main.shutdownTimeout", "5");
-
-main.addInitialProperty("camel.main.routesReloadEnabled", reload ?
"true" : "false");
-writeSettings("camel.main.routesReloadEnabled", reload ? "true" :
"false");
-
[GitHub] [camel] github-actions[bot] commented on pull request #7523: (chores) camel-kafka: fix flaky idempotent test
github-actions[bot] commented on PR #7523: URL: https://github.com/apache/camel/pull/7523#issuecomment-1112489606 :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, #7523: (chores) camel-kafka: fix flaky idempotent test
orpiske opened a new pull request, #7523: URL: https://github.com/apache/camel/pull/7523 -- 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) fix checkstyle in camel-jbang
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 a8ae00bfd55 (chores) fix checkstyle in camel-jbang
a8ae00bfd55 is described below
commit a8ae00bfd55baceb0294cdd7732f4c8d44a53656
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 18:58:16 2022 +0200
(chores) fix checkstyle in camel-jbang
---
.../apache/camel/dsl/jbang/core/commands/Version.java | 19 ++-
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Version.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Version.java
index 94512c3e0a4..6219c940606 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Version.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Version.java
@@ -16,28 +16,13 @@
*/
package org.apache.camel.dsl.jbang.core.commands;
-import org.apache.camel.CamelContext;
+import java.util.concurrent.Callable;
+
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
-import org.apache.camel.dsl.jbang.core.common.exceptions.ResourceDoesNotExist;
-import org.apache.camel.github.GitHubResourceResolver;
-import org.apache.camel.impl.lw.LightweightCamelContext;
-import org.apache.camel.spi.Resource;
-import org.apache.camel.util.FileUtil;
-import org.apache.camel.util.IOHelper;
-import org.apache.commons.io.IOUtils;
-import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.StringJoiner;
-import java.util.concurrent.Callable;
-
-import static
org.apache.camel.dsl.jbang.core.commands.GitHubHelper.asGithubSingleUrl;
-import static
org.apache.camel.dsl.jbang.core.commands.GitHubHelper.fetchGithubUrls;
-
@Command(name = "init", description = "Display Camel version")
class Version implements Callable {
[GitHub] [camel] orpiske merged pull request #7522: (chores) fix checkstyle in camel-jbang
orpiske merged PR #7522: URL: https://github.com/apache/camel/pull/7522 -- 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 #7522: (chores) fix checkstyle in camel-jbang
github-actions[bot] commented on PR #7522: URL: https://github.com/apache/camel/pull/7522#issuecomment-1112488578 :no_entry_sign: There are (likely) no components to be tested in this PR -- 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 (642e55a0a6e -> ff47c2affc2)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 642e55a0a6e (chores) ci: run format and checkstyle builds regularly (fixed YAML formatting) add ff47c2affc2 (chores) ci: run format and checkstyle builds regularly (fixed non-standard cron) No new revisions were added by this update. Summary of changes: .github/workflows/main-checkstyle-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] commented on pull request #7521: CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
github-actions[bot] commented on PR #7521: URL: https://github.com/apache/camel/pull/7521#issuecomment-1112483895 :x: Finished component verification: **1 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 main updated: (chores) ci: run format and checkstyle builds regularly (fixed YAML formatting)
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 642e55a0a6e (chores) ci: run format and checkstyle builds regularly
(fixed YAML formatting)
642e55a0a6e is described below
commit 642e55a0a6e315d265fa8c0e769b3ea9628d4a26
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 19:32:17 2022 +0200
(chores) ci: run format and checkstyle builds regularly (fixed YAML
formatting)
---
.github/workflows/main-checkstyle-build.yml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/main-checkstyle-build.yml
b/.github/workflows/main-checkstyle-build.yml
index 7aee25b0ae6..076497b39e3 100644
--- a/.github/workflows/main-checkstyle-build.yml
+++ b/.github/workflows/main-checkstyle-build.yml
@@ -45,8 +45,8 @@ jobs:
- name: mvn sourcecheck
run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log
-Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Psourcecheck -Dcheckstyle.failOnViolation=true -DskipTests
checkstyle:checkstyle verify
- name: archive logs
- uses: actions/upload-artifact@v3
- if: always()
- with:
-name: checkstyle.log
-path: checkstyle.log
+uses: actions/upload-artifact@v3
+if: always()
+with:
+ name: checkstyle.log
+ path: checkstyle.log
[camel] branch main updated: (chores) ci: run format and checkstyle builds regularly
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 9f24cf4 (chores) ci: run format and checkstyle builds regularly
9f24cf4 is described below
commit 9f24cf4e827ef7fa92e62f63cf396b108b6b
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 19:30:36 2022 +0200
(chores) ci: run format and checkstyle builds regularly
---
...er-push-build.yml => main-checkstyle-build.yml} | 43 +++---
.../{master-push-build.yml => main-push-build.yml} | 8 ++--
2 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/master-push-build.yml
b/.github/workflows/main-checkstyle-build.yml
similarity index 51%
copy from .github/workflows/master-push-build.yml
copy to .github/workflows/main-checkstyle-build.yml
index 1828324d252..7aee25b0ae6 100644
--- a/.github/workflows/master-push-build.yml
+++ b/.github/workflows/main-checkstyle-build.yml
@@ -15,19 +15,14 @@
# limitations under the License.
#
-name: build
+name: checkstyle build
on:
- push:
-branches:
- - main
-paths-ignore:
- - .github/**/*
- - README.md
- - SECURITY.md
- - Jenkinsfile
- - Jenkinsfile.*
- - NOTICE.txt
+ schedule:
+# Every 5th minute every 3 hours during working days
+- cron: '5 */3 * * 1-5'
+# Every 6 hours during weekends ... we don't want to be flooded with emails
+- cron: '30 */6 * * 6-7'
jobs:
build:
@@ -48,22 +43,10 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn sourcecheck
-run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -Dmvnd.threads=2
-V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Psourcecheck -Dcheckstyle.failOnViolation=true -DskipTests
checkstyle:checkstyle verify
- - name: Create Pull Request
-uses: peter-evans/create-pull-request@v3
-with:
- base: main
- token: ${{ secrets.GITHUB_TOKEN }}
- commit-message: "Regen for commit ${{ github.sha }}"
- committer: GitHub
- author: ${{ github.actor }} <${{ github.actor
}}@users.noreply.github.com>
- signoff: true
- branch: regen_bot
- title: "Generated sources regen"
- body: |
-Regen bot :robot: found some uncommited changes after running
build on :camel: main.
-Please do not delete `regen_bot` branch after merge/rebase.
- labels: |
-regen
-automated pr
- assignees: oscerd
+run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log
-Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Psourcecheck -Dcheckstyle.failOnViolation=true -DskipTests
checkstyle:checkstyle verify
+ - name: archive logs
+ uses: actions/upload-artifact@v3
+ if: always()
+ with:
+name: checkstyle.log
+path: checkstyle.log
diff --git a/.github/workflows/master-push-build.yml
b/.github/workflows/main-push-build.yml
similarity index 90%
rename from .github/workflows/master-push-build.yml
rename to .github/workflows/main-push-build.yml
index 1828324d252..12db7f9ff4a 100644
--- a/.github/workflows/master-push-build.yml
+++ b/.github/workflows/main-push-build.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: build
+name: reformat and build
on:
push:
@@ -47,8 +47,8 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
cache: 'maven'
- - name: mvn sourcecheck
-run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -Dmvnd.threads=2
-V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Psourcecheck -Dcheckstyle.failOnViolation=true -DskipTests
checkstyle:checkstyle verify
+ - name: mvn formatter and build
+run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -Dmvnd.threads=2
-V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress
-Pformat,fastinstall -DskipTests verify
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
@@ -61,7 +61,7 @@ jobs:
branch: regen_bot
title: "Generated sources regen"
body: |
-Regen bot :robot: found some uncommited changes after running
build on :camel: main.
+Regen bot :robot: found some uncommitted changes after running
build on :camel: main.
Please do not delete `regen_bot` branch after merge/rebase.
labels: |
regen
[GitHub] [camel] orpiske opened a new pull request, #7522: (chores) fix checkstyle in camel-jbang
orpiske opened a new pull request, #7522: URL: https://github.com/apache/camel/pull/7522 -- 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] aldettinger opened a new pull request, #3759: paho: add test case for RFC3986 style urls #3758
aldettinger opened a new pull request, #3759: URL: https://github.com/apache/camel-quarkus/pull/3759 -- 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 #7520: CAMEL-18023. Fix for prefix and formating
github-actions[bot] commented on PR #7520: URL: https://github.com/apache/camel/pull/7520#issuecomment-1112436209 :no_entry_sign: There are (likely) no components to be tested in this PR -- 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-karavan] branch dependabot/npm_and_yarn/karavan-app/src/main/webapp/ejs-3.1.7 created (now 11a1a65)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-app/src/main/webapp/ejs-3.1.7 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at 11a1a65 Bump ejs from 3.1.6 to 3.1.7 in /karavan-app/src/main/webapp No new revisions were added by this update.
[GitHub] [camel-karavan] dependabot[bot] opened a new pull request, #331: Bump ejs from 3.1.6 to 3.1.7 in /karavan-app/src/main/webapp
dependabot[bot] opened a new pull request, #331: URL: https://github.com/apache/camel-karavan/pull/331 Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7. Release notes Sourced from https://github.com/mde/ejs/releases;>ejs's releases. v3.1.7 Version 3.1.7 Commits https://github.com/mde/ejs/commit/820855ad75034e303be82c482c5eb8c6616da5c5;>820855a Version 3.1.7 https://github.com/mde/ejs/commit/076dcb643c5aed2e10c2847639c98fd923b72854;>076dcb6 Don't use template literal https://github.com/mde/ejs/commit/faf8b849a4e46db21fa813a08a7cbe00256a188a;>faf8b84 Skip test -- error message vary depending on JS runtime https://github.com/mde/ejs/commit/c028c343c127859f7189c3feee1e5239c199fec9;>c028c34 Update packages https://github.com/mde/ejs/commit/e4180b4fa2dd0e06d811f2c155f9d993ee9d8edd;>e4180b4 Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/629;>#629 from markbrouwer96/main https://github.com/mde/ejs/commit/d5404d6e68d64c165580d238e7562ea6532c2541;>d5404d6 Updated jsdoc to 3.6.7 https://github.com/mde/ejs/commit/7b0845d6aab044d244e8ec3818f0f70d05ef13c1;>7b0845d Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/609;>#609 from mde/dependabot/npm_and_yarn/glob-parent-5.1.2 https://github.com/mde/ejs/commit/32fb8ee387383c67eaa5feff05347ef0504f3b15;>32fb8ee Bump glob-parent from 5.1.1 to 5.1.2 https://github.com/mde/ejs/commit/f21a9e464337032af5e61352c54b9dd8dae8fd1b;>f21a9e4 Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/603;>#603 from mde/mde-null-proto-where-possible https://github.com/mde/ejs/commit/a50e46f002a78544e10982a037742cfb67fc7b80;>a50e46f Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/606;>#606 from akash-55/main Additional commits viewable in https://github.com/mde/ejs/compare/v3.1.6...v3.1.7;>compare view [](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) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/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
[GitHub] [camel-karavan] dependabot[bot] opened a new pull request, #330: Bump ejs from 3.1.6 to 3.1.7 in /karavan-designer
dependabot[bot] opened a new pull request, #330: URL: https://github.com/apache/camel-karavan/pull/330 Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7. Release notes Sourced from https://github.com/mde/ejs/releases;>ejs's releases. v3.1.7 Version 3.1.7 Commits https://github.com/mde/ejs/commit/820855ad75034e303be82c482c5eb8c6616da5c5;>820855a Version 3.1.7 https://github.com/mde/ejs/commit/076dcb643c5aed2e10c2847639c98fd923b72854;>076dcb6 Don't use template literal https://github.com/mde/ejs/commit/faf8b849a4e46db21fa813a08a7cbe00256a188a;>faf8b84 Skip test -- error message vary depending on JS runtime https://github.com/mde/ejs/commit/c028c343c127859f7189c3feee1e5239c199fec9;>c028c34 Update packages https://github.com/mde/ejs/commit/e4180b4fa2dd0e06d811f2c155f9d993ee9d8edd;>e4180b4 Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/629;>#629 from markbrouwer96/main https://github.com/mde/ejs/commit/d5404d6e68d64c165580d238e7562ea6532c2541;>d5404d6 Updated jsdoc to 3.6.7 https://github.com/mde/ejs/commit/7b0845d6aab044d244e8ec3818f0f70d05ef13c1;>7b0845d Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/609;>#609 from mde/dependabot/npm_and_yarn/glob-parent-5.1.2 https://github.com/mde/ejs/commit/32fb8ee387383c67eaa5feff05347ef0504f3b15;>32fb8ee Bump glob-parent from 5.1.1 to 5.1.2 https://github.com/mde/ejs/commit/f21a9e464337032af5e61352c54b9dd8dae8fd1b;>f21a9e4 Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/603;>#603 from mde/mde-null-proto-where-possible https://github.com/mde/ejs/commit/a50e46f002a78544e10982a037742cfb67fc7b80;>a50e46f Merge pull request https://github-redirect.dependabot.com/mde/ejs/issues/606;>#606 from akash-55/main Additional commits viewable in https://github.com/mde/ejs/compare/v3.1.6...v3.1.7;>compare view [](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) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/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-karavan] branch dependabot/npm_and_yarn/karavan-designer/ejs-3.1.7 created (now 5a612cb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-designer/ejs-3.1.7 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at 5a612cb Bump ejs from 3.1.6 to 3.1.7 in /karavan-designer No new revisions were added by this update.
[GitHub] [camel-karavan] mgubaidullin closed issue #328: Upgrade to kamelets 0.8.0
mgubaidullin closed issue #328: Upgrade to kamelets 0.8.0 URL: https://github.com/apache/camel-karavan/issues/328 -- 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 #329: Kamelets 0.8.0
mgubaidullin merged PR #329: URL: https://github.com/apache/camel-karavan/pull/329 -- 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 #7521: CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
github-actions[bot] commented on PR #7521: URL: https://github.com/apache/camel/pull/7521#issuecomment-1112410003 :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, #7521: CAMEL-18020: fix a possible NPE due to uninitialized consumer in poll exception strategies
orpiske opened a new pull request, #7521: URL: https://github.com/apache/camel/pull/7521 -- 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] javaduke commented on pull request #3757: Camel DataSonnet Extension - resolves Issue #2078 (needs Scala >= 2.13)
javaduke commented on PR #3757: URL: https://github.com/apache/camel-quarkus/pull/3757#issuecomment-1112403931 Hmm, not sure what this error means: ``` Caused by: java.lang.RuntimeException: Too little or too much org.apache.camel:* entries in camel-quarkus-bom: [2920](https://github.com/apache/camel-quarkus/runs/6214331067?check_suite_focus=true#step:8:2920) [2921](https://github.com/apache/camel-quarkus/runs/6214331067?check_suite_focus=true#step:8:2921) Extra content at line 89: [2922](https://github.com/apache/camel-quarkus/runs/6214331067?check_suite_focus=true#step:8:2922) ["org.apache.camel:camel-datasonnet"] [2923](https://github.com/apache/camel-quarkus/runs/6214331067?check_suite_focus=true#step:8:2923) [2924](https://github.com/apache/camel-quarkus/runs/6214331067?check_suite_focus=true#step:8:2924) [2925](https://github.com/apache/camel-quarkus/runs/6214331067?check_suite_focus=true#step:8:2925) Consider adding, removing or excluding them in the BOM ``` Are there any dependencies I need to exclude? -- 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] jethomaspanw opened a new issue, #1361: Issue setting up camel-google-storage-source-kafka-connector
jethomaspanw opened a new issue, #1361:
URL: https://github.com/apache/camel-kafka-connector/issues/1361
I'm attempting to set up a [google storage source
connector](https://camel.apache.org/camel-kafka-connector/1.0.x/reference/connectors/camel-google-storage-source-kafka-source-connector.html)
but am running into an error. As far as I can tell, I've set up the
configuration correctly (there are very few options for this connector), so I'm
hoping that I can get some advice on how to debug this error.
Helm Chart Yaml
```
apiVersion: kafka.strimzi.io/v1beta2
kind: KafkaConnector
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.namespace }}
labels:
# The strimzi.io/cluster label identifies the KafkaConnect instance
# in which to create this connector. That KafkaConnect instance
# must have the strimzi.io/use-connector-resources annotation
# set to true.
strimzi.io/cluster: {{ .Values.kafkaConnect.name }}
spec:
class:
org.apache.camel.kafkaconnector.googlestoragesource.CamelGooglestoragesourceSourceConnector
tasksMax: {{ .Values.tasksMax }}
config:
topics: {{ .Values.topics }}
camel.kamelet.google-storage-source.bucketNameOrArn: {{
.Values.bucketName }}
camel.kamelet.google-storage-source.serviceAccountKey: {{ .Values.saKey
}}
camel.kamelet.google-storage-source.deleteAfterRead: {{
.Values.deleteAfterRead }}
```
Values.yaml
```
# Default values for google-storage-source-connector.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
# the connector name
name: google-storage-source
namespace: kafka-namespace
kafkaConnect:
# the Kafka Connect cluster name
name: my-connect-cluster
tasksMax: 2
topics: gsc
bucketName:
saKey:
${file:/opt/kafka/external-configuration/google-storage-source-secret/google-storage-source-secret.properties:serviceAccountKey64}
deleteAfterRead: false
```
StackTrace
```
org.apache.kafka.connect.errors.ConnectException: Failed to create and start
Camel context
at
org.apache.camel.kafkaconnector.CamelSourceTask.start(CamelSourceTask.java:175)
at
org.apache.kafka.connect.runtime.WorkerSourceTask.initializeAndStart(WorkerSourceTask.java:225)
at
org.apache.kafka.connect.runtime.WorkerTask.doRun(WorkerTask.java:186)
at
org.apache.kafka.connect.runtime.WorkerTask.run(WorkerTask.java:243)
at
java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)
at
java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
at java.base/java.lang.Thread.run(Thread.java:829)
Caused by: java.lang.IllegalStateException: Unable to compute endpoint uri.
Reason: uri factory for schema `null` not found
at
org.apache.camel.kafkaconnector.utils.TaskHelper.buildUrl(TaskHelper.java:60)
at
org.apache.camel.kafkaconnector.CamelSourceTask.start(CamelSourceTask.java:142)
... 8 more
```
--
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] github-actions[bot] commented on pull request #7520: CAMEL-18023. Fix for prefix and formating
github-actions[bot] commented on PR #7520: URL: https://github.com/apache/camel/pull/7520#issuecomment-1112381774 :no_entry_sign: There are (likely) no components to be tested in this PR -- 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] 01/02: CAMEL-18024: rework the last processed offset tracking
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bd0d9cd7b2a6dd3f9cbe5481e39ed780a76f
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 08:25:01 2022 +0200
CAMEL-18024: rework the last processed offset tracking
Move the last processed offset tracking code into the commit manager so
it can be handled accordingly to the commit management strategy (sync,
async, noop, etc)
---
.../camel/component/kafka/KafkaFetchRecords.java | 15 +--
.../kafka/consumer/AbstractCommitManager.java | 2 +-
.../kafka/consumer/AsyncCommitManager.java | 24 ++--
.../component/kafka/consumer/CommitManager.java| 27 -
.../kafka/consumer/CommitToOffsetManager.java | 24 ++--
.../kafka/consumer/NoopCommitManager.java | 10 +-
.../component/kafka/consumer/OffsetCache.java | 64 +++
.../kafka/consumer/SyncCommitManager.java | 31 ++---
.../consumer/support/KafkaRecordProcessor.java | 2 +-
.../support/KafkaRecordProcessorFacade.java| 13 +--
.../support/PartitionAssignmentListener.java | 35 +-
.../component/kafka/consumer/OffsetCacheTest.java | 128 +
12 files changed, 282 insertions(+), 93 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index 01f9efa0596..51553f0fa55 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.kafka;
import java.time.Duration;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
@@ -75,7 +73,6 @@ public class KafkaFetchRecords implements Runnable {
private final Pattern topicPattern;
private final String threadId;
private final Properties kafkaProps;
-private final Map lastProcessedOffset = new HashMap<>();
private final PollExceptionStrategy pollExceptionStrategy;
private final BridgeExceptionHandlerToErrorHandler bridge;
private final ReentrantLock lock = new ReentrantLock();
@@ -279,7 +276,7 @@ public class KafkaFetchRecords implements Runnable {
resumeStrategy.setConsumer(consumer);
PartitionAssignmentListener listener = new PartitionAssignmentListener(
-threadId, kafkaConsumer.getEndpoint().getConfiguration(),
lastProcessedOffset,
+threadId, kafkaConsumer.getEndpoint().getConfiguration(),
this::isRunnable, commitManager, resumeStrategy);
if (LOG.isInfoEnabled()) {
@@ -310,7 +307,7 @@ public class KafkaFetchRecords implements Runnable {
}
KafkaRecordProcessorFacade recordProcessorFacade = new
KafkaRecordProcessorFacade(
-kafkaConsumer, lastProcessedOffset, threadId,
commitManager, consumerListener);
+kafkaConsumer, threadId, commitManager, consumerListener);
Duration pollDuration = Duration.ofMillis(pollTimeoutMs);
while (isKafkaConsumerRunnable() && isConnected() &&
pollExceptionStrategy.canContinue()) {
@@ -359,11 +356,11 @@ public class KafkaFetchRecords implements Runnable {
safeUnsubscribe();
} catch (Exception e) {
if (LOG.isDebugEnabled()) {
-LOG.warn("Exception {} caught while polling {} from kafka {}
at offset {}: {}",
-e.getClass().getName(), threadId, getPrintableTopic(),
lastProcessedOffset, e.getMessage(), e);
+LOG.warn("Exception {} caught by thread {} while polling {}
from kafka: {}",
+e.getClass().getName(), threadId, getPrintableTopic(),
e.getMessage(), e);
} else {
-LOG.warn("Exception {} caught while polling {} from kafka {}
at offset {}: {}",
-e.getClass().getName(), threadId, getPrintableTopic(),
lastProcessedOffset, e.getMessage());
+LOG.warn("Exception {} caught by thread {} while polling {}
from kafka: {}",
+e.getClass().getName(), threadId, getPrintableTopic(),
e.getMessage());
}
pollExceptionStrategy.handle(partitionLastOffset, e);
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java
index 8333fa1687f..bce04599f74 100644
---
[camel] branch main updated (b1288fbfb0f -> aa306b7100b)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from b1288fbfb0f camel-yaml-dsl - Fix mistake in schema about error handler should not end in .class new bd0d9cd7b2a CAMEL-18024: rework the last processed offset tracking new aa306b7100b CAMEL-18024: use the commit manager for manual commits The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/component/kafka/KafkaFetchRecords.java | 24 ++-- .../kafka/consumer/AbstractCommitManager.java | 10 +- .../kafka/consumer/AsyncCommitManager.java | 38 +++--- .../component/kafka/consumer/CommitManager.java| 37 -- .../kafka/consumer/CommitToOffsetManager.java | 24 ++-- .../consumer/DefaultKafkaManualAsyncCommit.java| 45 +--- .../DefaultKafkaManualAsyncCommitFactory.java | 27 + .../kafka/consumer/DefaultKafkaManualCommit.java | 9 +- .../consumer/DefaultKafkaManualCommitFactory.java | 26 + .../consumer/DefaultKafkaManualSyncCommit.java | 32 +- .../kafka/consumer/KafkaAsyncManualCommit.java | 5 +- .../kafka/consumer/KafkaManualCommitFactory.java | 17 +-- .../kafka/consumer/NoopCommitManager.java | 10 +- .../component/kafka/consumer/OffsetCache.java | 64 +++ .../kafka/consumer/SyncCommitManager.java | 31 ++--- .../consumer/support/KafkaRecordProcessor.java | 2 +- .../support/KafkaRecordProcessorFacade.java| 16 +-- .../support/PartitionAssignmentListener.java | 40 +-- .../component/kafka/consumer/OffsetCacheTest.java | 128 + .../integration/pause/KafkaPausableConsumerIT.java | 12 +- .../ROOT/pages/camel-3x-upgrade-guide-3_17.adoc| 7 ++ 21 files changed, 327 insertions(+), 277 deletions(-) create mode 100644 components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/OffsetCache.java create mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/consumer/OffsetCacheTest.java
[GitHub] [camel] orpiske merged pull request #7518: CAMEL-18024: rework the last processed offset tracking
orpiske merged PR #7518: URL: https://github.com/apache/camel/pull/7518 -- 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] 02/02: CAMEL-18024: use the commit manager for manual commits
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa306b7100b2d9b4ef7f1556b26b2a37cc63915d
Author: Otavio Rodolfo Piske
AuthorDate: Thu Apr 28 13:39:26 2022 +0200
CAMEL-18024: use the commit manager for manual commits
This avoids duplication of commit code, simplifies the manual commit
factories and remove the need for queueing the async commits
---
.../camel/component/kafka/KafkaFetchRecords.java | 11 +-
.../kafka/consumer/AbstractCommitManager.java | 8 ++--
.../kafka/consumer/AsyncCommitManager.java | 14 +--
.../component/kafka/consumer/CommitManager.java| 12 +++---
.../consumer/DefaultKafkaManualAsyncCommit.java| 45 +++---
.../DefaultKafkaManualAsyncCommitFactory.java | 27 +
.../kafka/consumer/DefaultKafkaManualCommit.java | 9 +
.../consumer/DefaultKafkaManualCommitFactory.java | 26 +
.../consumer/DefaultKafkaManualSyncCommit.java | 32 +++
.../kafka/consumer/KafkaAsyncManualCommit.java | 5 +--
.../kafka/consumer/KafkaManualCommitFactory.java | 17 +---
.../support/KafkaRecordProcessorFacade.java| 3 +-
.../support/PartitionAssignmentListener.java | 5 +--
.../integration/pause/KafkaPausableConsumerIT.java | 12 --
.../ROOT/pages/camel-3x-upgrade-guide-3_17.adoc| 7
15 files changed, 47 insertions(+), 186 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index 51553f0fa55..c2002826d7c 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -276,8 +276,7 @@ public class KafkaFetchRecords implements Runnable {
resumeStrategy.setConsumer(consumer);
PartitionAssignmentListener listener = new PartitionAssignmentListener(
-threadId, kafkaConsumer.getEndpoint().getConfiguration(),
-this::isRunnable, commitManager, resumeStrategy);
+threadId, kafkaConsumer.getEndpoint().getConfiguration(),
commitManager, resumeStrategy);
if (LOG.isInfoEnabled()) {
LOG.info("Subscribing {} to {}", threadId, getPrintableTopic());
@@ -318,9 +317,7 @@ public class KafkaFetchRecords implements Runnable {
}
}
-commitManager.processAsyncCommits();
-
-ProcessingResult result =
recordProcessorFacade.processPolledRecords(allRecords, consumer);
+ProcessingResult result =
recordProcessorFacade.processPolledRecords(allRecords);
if (result.isBreakOnErrorHit()) {
LOG.debug("We hit an error ... setting flags to force
reconnect");
@@ -427,10 +424,6 @@ public class KafkaFetchRecords implements Runnable {
&& !kafkaConsumer.isSuspendingOrSuspended();
}
-private boolean isRunnable() {
-return kafkaConsumer.getEndpoint().getCamelContext().isStopping() &&
!kafkaConsumer.isRunAllowed();
-}
-
private boolean isReconnect() {
return reconnect;
}
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java
index bce04599f74..6b1b3dd4d5d 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/AbstractCommitManager.java
@@ -18,7 +18,6 @@
package org.apache.camel.component.kafka.consumer;
import java.time.Duration;
-import java.util.Collection;
import java.util.Collections;
import org.apache.camel.Exchange;
@@ -53,19 +52,18 @@ public abstract class AbstractCommitManager implements
CommitManager {
protected KafkaManualCommit getManualCommit(
Exchange exchange, TopicPartition partition,
ConsumerRecord record,
-Collection asyncCommits,
KafkaManualCommitFactory manualCommitFactory) {
StateRepository offsetRepository =
configuration.getOffsetRepository();
long commitTimeoutMs = configuration.getCommitTimeoutMs();
KafkaManualCommitFactory.CamelExchangePayload camelExchangePayload =
new KafkaManualCommitFactory.CamelExchangePayload(
-exchange, consumer, threadId, offsetRepository, asyncCommits);
+exchange, consumer, threadId, offsetRepository);
KafkaManualCommitFactory.KafkaRecordPayload kafkaRecordPayload = new
[GitHub] [camel] orpiske commented on pull request #7518: CAMEL-18024: rework the last processed offset tracking
orpiske commented on PR #7518: URL: https://github.com/apache/camel/pull/7518#issuecomment-1112378197 The checkstyle issue is not on this PR code, so it's safe to merge. -- 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 #7518: CAMEL-18024: rework the last processed offset tracking
github-actions[bot] commented on PR #7518: URL: https://github.com/apache/camel/pull/7518#issuecomment-1112376676 :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 #7520: CAMEL-18023. Fix for prefix and formating
github-actions[bot] commented on PR #7520: URL: https://github.com/apache/camel/pull/7520#issuecomment-1112375234 :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 main updated: camel-yaml-dsl - Fix mistake in schema about error handler should not end in .class
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 b1288fbfb0f camel-yaml-dsl - Fix mistake in schema about error handler
should not end in .class
b1288fbfb0f is described below
commit b1288fbfb0ff60a5aca9e1b54bcef1693848ad6f
Author: Claus Ibsen
AuthorDate: Thu Apr 28 17:28:09 2022 +0200
camel-yaml-dsl - Fix mistake in schema about error handler should not end
in .class
---
.../yaml/deserializers/RouteConfigurationDefinitionDeserializer.java| 2 +-
.../camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json | 2 +-
.../camel-yaml-dsl/src/generated/resources/camelYamlDsl.json| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
index 1123731de60..a2011f671c8 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
@@ -42,7 +42,7 @@ import org.snakeyaml.engine.v2.nodes.SequenceNode;
properties = {
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "precondition", type = "string"),
- @YamlProperty(name = "error-handler", type =
"object:org.apache.camel.model.ErrorHandlerDefinition.class"),
+ @YamlProperty(name = "error-handler", type =
"object:org.apache.camel.model.ErrorHandlerDefinition"),
@YamlProperty(name = "intercept", type =
"array:org.apache.camel.model.InterceptDefinition"),
@YamlProperty(name = "intercept-from", type =
"array:org.apache.camel.model.InterceptFromDefinition"),
@YamlProperty(name = "intercept-send-to-endpoint",
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 260ec1996de..6b4ce3c02df 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -2325,7 +2325,7 @@
"type" : "object",
"properties" : {
"error-handler" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.ErrorHandlerDefinition.class"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.ErrorHandlerDefinition"
},
"id" : {
"type" : "string"
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 62c0864d508..f8409dc1f19 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -2229,7 +2229,7 @@
"type" : "object",
"properties" : {
"errorHandler" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.ErrorHandlerDefinition.class"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.ErrorHandlerDefinition"
},
"id" : {
"type" : "string"
