[camel] branch regen_bot updated (e81ba41bb4a -> b2c65d65dc8)
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 e81ba41bb4a Polished add b2c65d65dc8 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. (#10814) No new revisions were added by this update. Summary of changes: .../component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java| 2 ++ 1 file changed, 2 insertions(+)
[camel] branch ksp deleted (was b6123b5161e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch ksp in repository https://gitbox.apache.org/repos/asf/camel.git was b6123b5161e CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. (#10813)
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 02f8914aae5 CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. (#10813) 02f8914aae5 is described below commit 02f8914aae52a848e98ef3d1b4fe082f4a570527 Author: Claus Ibsen AuthorDate: Tue Jul 25 08:53:48 2023 +0200 CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. (#10813) --- .../apache/camel/catalog/components/pulsar.json| 124 +++-- .../pulsar/PulsarComponentConfigurer.java | 6 + .../component/pulsar/PulsarEndpointConfigurer.java | 6 + .../component/pulsar/PulsarEndpointUriFactory.java | 3 +- .../org/apache/camel/component/pulsar/pulsar.json | 124 +++-- .../component/pulsar/PulsarConfiguration.java | 11 ++ .../consumers/CommonCreationStrategyImpl.java | 10 ++ .../dsl/PulsarComponentBuilderFactory.java | 16 +++ .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 15 +++ 9 files changed, 192 insertions(+), 123 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json index 75375ef32d1..4386c84a648 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json @@ -35,37 +35,38 @@ "consumerNamePrefix": { "index": 10, "kind": "property", "displayName": "Consumer Name Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "cons", "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Prefix to add to consumer names when a SHARED or FAILOVER subscri [...] "consumerQueueSize": { "index": 11, "kind": "property", "displayName": "Consumer Queue Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Size of the consumer queue - defaults to 10" }, "deadLetterTopic": { "index": 12, "kind": "property", "displayName": "Dead Letter Topic", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Name of the topic where the messages which fail maxRedeliverCount times will be sent. Note: if [...] -"maxRedeliverCount": { "index": 13, "kind": "property", "displayName": "Max Redeliver Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Maximum number of times that a message will be redelivered before being sent to the dead [...] -"messageListener": { "index": 14, "kind": "property", "displayName": "Message Listener", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Whether to use the messageListener interface, or to receive messages using a separ [...] -"negativeAckRedeliveryBackoff": { "index": 15, "kind": "property", "displayName": "Negative Ack Redelivery Backoff", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.pulsar.client.api.RedeliveryBackoff", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "RedeliveryBackoff to use for negative [...] -"negativeAckRedeliveryDelayMicros": { "index": 16, "kind": "property", "displayName": "Negative Ack Redelivery Delay Micros", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defau
[GitHub] [camel] davsclaus merged pull request #10813: CAMEL-17986: camel-pulsar - Add option to configure key shared policy…
davsclaus merged PR #10813: URL: https://github.com/apache/camel/pull/10813 -- 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] orpiske commented on pull request #5117: Onboard Camel K Runtime
orpiske commented on PR #5117: URL: https://github.com/apache/camel-quarkus/pull/5117#issuecomment-1649230471 > The concept of adding the camel-k-runtime as a camel quarkus module is good. Right now, the runtime release cycle is completely coupled to Camel Quarkus, so, it will simplify the release. > > I can see it misses a few components such as camel-k-cron or camel-k-resume-kafka (not sure if this latest one is fully functional though, cc @orpiske). It also misses the support plugins (such as the catalog generator) or the platform bom which are used directly by Camel K to perform certain actions. I haven't had a chance to try with camel k 2.x yet. AFAIK, we did not have any change on core that could directly affect this, so it should work (as in general - not sure about Camel K side of changes). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch batch deleted (was 8a5db34e166)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch batch in repository https://gitbox.apache.org/repos/asf/camel.git was 8a5db34e166 CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. (#10811)
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 5cd3136bbf5 CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. (#10811) 5cd3136bbf5 is described below commit 5cd3136bbf53ba163123ba6c831b37c795c0827f Author: Claus Ibsen AuthorDate: Tue Jul 25 08:52:24 2023 +0200 CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. (#10811) --- .../aws2/ddbstream/Ddb2StreamConsumer.java | 28 -- .../aws2/ddbstream/Ddb2StreamEndpoint.java | 1 - 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java index 7cc4714b580..d6b0b1b8da1 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java @@ -25,12 +25,12 @@ import java.util.Queue; import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; +import org.apache.camel.ExchangePropertyKey; import org.apache.camel.Processor; import org.apache.camel.health.HealthCheckHelper; import org.apache.camel.health.WritableHealthCheckRepository; import org.apache.camel.support.ScheduledBatchPollingConsumer; import org.apache.camel.util.CastUtils; -import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.services.dynamodb.model.ExpiredIteratorException; @@ -99,16 +99,29 @@ public class Ddb2StreamConsumer extends ScheduledBatchPollingConsumer { @Override public int processBatch(Queue exchanges) throws Exception { -int processedExchanges = 0; -while (!exchanges.isEmpty()) { -final Exchange exchange = ObjectHelper.cast(Exchange.class, exchanges.poll()); +int total = exchanges.size(); +int answer = 0; + +for (int index = 0; index < total && isBatchAllowed(); index++) { +// only loop if we are started (allowed to run) +// use poll to remove the head so it does not consume memory even +// after we have processed it +Exchange exchange = (Exchange) exchanges.poll(); +// add current index and total as properties +exchange.setProperty(ExchangePropertyKey.BATCH_INDEX, index); +exchange.setProperty(ExchangePropertyKey.BATCH_SIZE, total); +exchange.setProperty(ExchangePropertyKey.BATCH_COMPLETE, index == total - 1); + +// update pending number of exchanges +pendingExchanges = total - index - 1; // use default consumer callback AsyncCallback cb = defaultConsumerCallback(exchange, true); getAsyncProcessor().process(exchange, cb); -processedExchanges++; +answer++; } -return processedExchanges; + +return answer; } @Override @@ -122,7 +135,8 @@ public class Ddb2StreamConsumer extends ScheduledBatchPollingConsumer { if (healthCheckRepository != null) { consumerHealthCheck = new Ddb2StreamConsumerHealthCheck(this, getRouteId()); - consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled() && getEndpoint().getComponent().isHealthCheckConsumerEnabled()); + consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled() +&& getEndpoint().getComponent().isHealthCheckConsumerEnabled()); healthCheckRepository.addHealthCheck(consumerHealthCheck); } } diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java index 261ab43c344..715234651ed 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.ddbstream; import java.net.URI; import org.apache.camel.Category; -import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer;
[GitHub] [camel] davsclaus merged pull request #10811: CAMEL-16837: aws2-ddbstream consumer should have batch metadata on ea…
davsclaus merged PR #10811: URL: https://github.com/apache/camel/pull/10811 -- 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 hcc deleted (was b38050123ca)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hcc in repository https://gitbox.apache.org/repos/asf/camel.git was b38050123ca CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k] branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.30 deleted (was 276e388c9)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.30 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 276e388c9 chore(deps): bump github.com/container-tools/spectrum The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch brain deleted (was 3ab478a6bce)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch brain in repository https://gitbox.apache.org/repos/asf/camel.git was 3ab478a6bce CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel] davsclaus merged pull request #10809: CAMEL-15968: camel-braintree - Add more gateway APIs from never versi…
davsclaus merged PR #10809: URL: https://github.com/apache/camel/pull/10809 -- 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-16592: camel-api - CamelContextAware should extend HasCamelContext (#10810)
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 e21f8270c72 CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext (#10810) e21f8270c72 is described below commit e21f8270c72985471c7d398e7e32291c1276fb5d Author: Claus Ibsen AuthorDate: Tue Jul 25 08:51:53 2023 +0200 CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext (#10810) --- .../src/main/java/org/apache/camel/CamelContextAware.java | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java b/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java index f5865f82f8b..e94ab034425 100644 --- a/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java +++ b/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java @@ -16,10 +16,12 @@ */ package org.apache.camel; +import org.apache.camel.spi.HasCamelContext; + /** * An interface to represent an object which wishes to be injected with the {@link CamelContext} */ -public interface CamelContextAware { +public interface CamelContextAware extends HasCamelContext { /** * Set the {@link CamelContext} context if the object is an instance of {@link CamelContextAware}. @@ -32,13 +34,6 @@ public interface CamelContextAware { return object; } -/** - * Get the {@link CamelContext} - * - * @return the Camel context - */ -CamelContext getCamelContext(); - /** * Injects the {@link CamelContext} *
[GitHub] [camel] davsclaus merged pull request #10810: CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext
davsclaus merged PR #10810: URL: https://github.com/apache/camel/pull/10810 -- 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-15968: camel-braintree - Add more gateway APIs from never version of braintree (#10809)
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 0e3e540f81f CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree (#10809) 0e3e540f81f is described below commit 0e3e540f81f49ed096738557adc7e183a3f11d50 Author: Claus Ibsen AuthorDate: Tue Jul 25 08:51:27 2023 +0200 CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree (#10809) --- .../apache/camel/catalog/components/braintree.json | 6 +- components/camel-braintree/pom.xml | 27 .../braintree/BraintreeEndpointUriFactory.java | 4 +- .../OAuthGatewayEndpointConfiguration.java | 55 +++ ...AuthGatewayEndpointConfigurationConfigurer.java | 159 + .../UsBankAccountGatewayEndpointConfiguration.java | 44 ++ ...ountGatewayEndpointConfigurationConfigurer.java | 159 + .../braintree/internal/BraintreeApiCollection.java | 18 +++ .../braintree/internal/BraintreeApiName.java | 4 + .../braintree/internal/OAuthGatewayApiMethod.java | 62 .../internal/UsBankAccountGatewayApiMethod.java| 53 +++ ...ent.braintree.OAuthGatewayEndpointConfiguration | 2 + ...ntree.UsBankAccountGatewayEndpointConfiguration | 2 + .../camel/component/braintree/braintree.json | 6 +- .../builder/endpoint/StaticEndpointBuilders.java | 12 +- .../dsl/BraintreeEndpointBuilderFactory.java | 12 +- 16 files changed, 610 insertions(+), 15 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json index 14bb99f01bf..5b533d22798 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json @@ -28,7 +28,7 @@ "configuration": { "index": 2, "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.braintree.BraintreeConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration" } }, "properties": { -"apiName": { "index": 0, "kind": "path", "displayName": "Api Name", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.braintree.internal.BraintreeApiName", "enum": [ "ADD_ON", "ADDRESS", "CLIENT_TOKEN", "CREDIT_CARD_VERIFICATION", "CUSTOMER", "DISCOUNT", "DISPUTE", "DOCUMENT_UPLOAD", "MERCHANT_ACCOUNT", "PAYMENT_METHOD", "PAYMENT_METHOD_NONCE", "PLAN", "REPORT", "SETTLEMENT_BATCH_SUMMARY", "SUBSCRIPTION", "TRANSACTION", "WEB [...] +"apiName": { "index": 0, "kind": "path", "displayName": "Api Name", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.braintree.internal.BraintreeApiName", "enum": [ "ADD_ON", "ADDRESS", "CLIENT_TOKEN", "CREDIT_CARD_VERIFICATION", "CUSTOMER", "DISCOUNT", "DISPUTE", "DOCUMENT_UPLOAD", "MERCHANT_ACCOUNT", "PAYMENT_METHOD", "PAYMENT_METHOD_NONCE", "OAUTH", "PLAN", "REPORT", "SETTLEMENT_BATCH_SUMMARY", "SUBSCRIPTION", "TRANSACTI [...] "methodName": { "index": 1, "kind": "path", "displayName": "Method Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "accept", "addFileEvidence", "addTextEvidence", "cancel", "cancelRelease", "cloneTransaction", "create", "createForCurrency", "credit", "delete", "fetchMerchantAccounts", "finalize", "find", "generate", "grant", "holdInEscrow", "parse", "refund", "releaseFromEscrow", "removeEvidence", "retryCharge", " [...] "environment": { "index": 2, "kind": "parameter", "displayName": "Environment", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The environment Either SANDBOX or PRODUCTION" }, "inBody": { "index": 3, "kind": "parameter", "displayName": "In Body", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the name of a parameter to be passed in the exchange In Body" }, @@ -52,6 +52,7 @@ "dispute": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Dispute objects", "methods": { "accept"
[camel-k] branch main updated: chore(deps): bump github.com/container-tools/spectrum
This is an automated email from the ASF dual-hosted git repository. pcongiusti 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 b22500d3e chore(deps): bump github.com/container-tools/spectrum b22500d3e is described below commit b22500d3ee390572a7905e6d06b864e766da1553 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 25 00:29:43 2023 + chore(deps): bump github.com/container-tools/spectrum Bumps [github.com/container-tools/spectrum](https://github.com/container-tools/spectrum) from 0.6.29 to 0.6.30. - [Release notes](https://github.com/container-tools/spectrum/releases) - [Changelog](https://github.com/container-tools/spectrum/blob/master/.goreleaser.yml) - [Commits](https://github.com/container-tools/spectrum/compare/v0.6.29...v0.6.30) --- updated-dependencies: - dependency-name: github.com/container-tools/spectrum dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ca2aec68c..33ac229b6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0 github.com/apache/camel-k/v2/pkg/client/camel v0.0.0 github.com/apache/camel-k/v2/pkg/kamelet/repository v0.0.0 - github.com/container-tools/spectrum v0.6.29 + github.com/container-tools/spectrum v0.6.30 github.com/evanphx/json-patch v5.6.0+incompatible github.com/fsnotify/fsnotify v1.6.0 github.com/gertd/go-pluralize v0.2.1 diff --git a/go.sum b/go.sum index eb9f8b68f..e5cb91f12 100644 --- a/go.sum +++ b/go.sum @@ -144,8 +144,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/container-tools/spectrum v0.6.29 h1:Ea0/210ihlMkqOgkkTPqJQcpi8xg7RdN89xLHXPgJCM= -github.com/container-tools/spectrum v0.6.29/go.mod h1:ghuFx5ibnx9ddEfL9H4EB5NTek0ffLd5qsT6gEI9rD4= +github.com/container-tools/spectrum v0.6.30 h1:FNxJzBo6roUaPlF0wESh58k66i6DcoB9qpz14ien4mY= +github.com/container-tools/spectrum v0.6.30/go.mod h1:Ish9gPkdij2G4NH3358+eftX/fa/Ia0sFgHRZCEFTWI= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
[GitHub] [camel-k] squakez merged pull request #4594: chore(deps): bump github.com/container-tools/spectrum from 0.6.29 to 0.6.30
squakez merged PR #4594: URL: https://github.com/apache/camel-k/pull/4594 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/github.com/onsi/gomega-1.27.10 deleted (was 343bfe193)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/onsi/gomega-1.27.10 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 343bfe193 chore(deps): bump github.com/onsi/gomega from 1.27.9 to 1.27.10 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k] branch main updated (347e9d01d -> 39a3d9068)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 347e9d01d chore: nightly SBOM update add 39a3d9068 chore(deps): bump github.com/onsi/gomega from 1.27.9 to 1.27.10 No new revisions were added by this update. Summary of changes: go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[GitHub] [camel-k] squakez merged pull request #4595: chore(deps): bump github.com/onsi/gomega from 1.27.9 to 1.27.10
squakez merged PR #4595: URL: https://github.com/apache/camel-k/pull/4595 -- 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 bypass deleted (was 7c495388e0a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch bypass in repository https://gitbox.apache.org/repos/asf/camel.git was 7c495388e0a CAMEL-14467: camel-jcache - Dynamically bypass the cache for lookups. Thanks to Jens Kleine-Herzbruch for the patch. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel] davsclaus merged pull request #10799: CAMEL-19640: remove plexus-container-default
davsclaus merged PR #10799: URL: https://github.com/apache/camel/pull/10799 -- 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: Bypass (#10808)
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 e7cbc864f98 Bypass (#10808) e7cbc864f98 is described below commit e7cbc864f98c265cdd336f927f9071f33e7e928e Author: Claus Ibsen AuthorDate: Tue Jul 25 08:50:23 2023 +0200 Bypass (#10808) * CAMEL-14467: camel-jcache - Dynamically bypass the cache for lookups. Thanks to Jens Kleine-Herzbruch for the patch. --- .../src/main/docs/jcache-component.adoc| 6 +++ .../component/jcache/policy/JCachePolicy.java | 11 - .../jcache/policy/JCachePolicyProcessor.java | 40 - .../jcache/policy/JCachePolicyProcessorTest.java | 52 ++ 4 files changed, 96 insertions(+), 13 deletions(-) diff --git a/components/camel-jcache/src/main/docs/jcache-component.adoc b/components/camel-jcache/src/main/docs/jcache-component.adoc index 0a33957fca7..8f879fbbc63 100644 --- a/components/camel-jcache/src/main/docs/jcache-component.adoc +++ b/components/camel-jcache/src/main/docs/jcache-component.adoc @@ -177,6 +177,12 @@ from("direct:get-orders") .bean(OrderService.class,"findOrderById(${header.orderId})"); +== BypassExpression + +The `JCachePolicy` can be configured with an `Expression` that can per `Exchange` determine whether +to look up the value from the cache or bypass. If the expression is evaluated to `false` then the route +is executed as normal, and the returned value is inserted into the cache for future lookup. + == Camel XML DSL examples == Use JCachePolicy in an XML route diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java index 87d82d8626c..e764e13862e 100644 --- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java +++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java @@ -53,6 +53,7 @@ public class JCachePolicy implements Policy { private String cacheName; private Configuration cacheConfiguration; private Expression keyExpression; +private Expression bypassExpression; private boolean enabled = true; @Override @@ -105,7 +106,7 @@ public class JCachePolicy implements Policy { } -return new JCachePolicyProcessor(route.getCamelContext(), cache, keyExpression, processor); +return new JCachePolicyProcessor(route.getCamelContext(), cache, keyExpression, bypassExpression, processor); } public Cache getCache() { @@ -148,6 +149,14 @@ public class JCachePolicy implements Policy { this.keyExpression = keyExpression; } +public Expression getBypassExpression() { +return bypassExpression; +} + +public void setBypassExpression(Expression bypassExpression) { +this.bypassExpression = bypassExpression; +} + public boolean isEnabled() { return enabled; } diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java index d561d8518ab..08d8bc22a5b 100644 --- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java +++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessor.java @@ -33,12 +33,15 @@ public class JCachePolicyProcessor extends DelegateAsyncProcessor { private final CamelContext camelContext; private Cache cache; private Expression keyExpression; +private Expression bypassExpression; -public JCachePolicyProcessor(CamelContext camelContext, Cache cache, Expression keyExpression, Processor processor) { +public JCachePolicyProcessor(CamelContext camelContext, Cache cache, Expression keyExpression, Expression bypassExpression, + Processor processor) { super(processor); this.camelContext = camelContext; this.cache = cache; this.keyExpression = keyExpression; +this.bypassExpression = bypassExpression; } @Override @@ -59,21 +62,26 @@ public class JCachePolicyProcessor extends DelegateAsyncProcessor { return super.process(exchange, callback); } -//Check if cache contains the key -Object value = cache.get(key); -if (value != null) { -// use the cached object in the Exchange without calling the rest of the route -LOG.debug("Cached object is found, skipping the route - key:{}, exchange:{}", key, exchange
[GitHub] [camel] davsclaus merged pull request #10808: Bypass
davsclaus merged PR #10808: URL: https://github.com/apache/camel/pull/10808 -- 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-19640: remove plexus-container-default (#10799)
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 7e579e081f1 CAMEL-19640: remove plexus-container-default (#10799) 7e579e081f1 is described below commit 7e579e081f1722efc13145d18fbe08a0a5857872 Author: Jono Morris AuthorDate: Tue Jul 25 18:49:44 2023 +1200 CAMEL-19640: remove plexus-container-default (#10799) --- tooling/maven/camel-package-maven-plugin/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 15a87aefefb..54cc81539ae 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -89,10 +89,6 @@ org.apache.maven.shared maven-dependency-tree - -org.codehaus.plexus -plexus-container-default - org.codehaus.plexus plexus-utils
[camel] branch spam deleted (was 55f44daefe9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spam in repository https://gitbox.apache.org/repos/asf/camel.git was 55f44daefe9 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. (#10814)
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 b2c65d65dc8 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. (#10814) b2c65d65dc8 is described below commit b2c65d65dc8559e89f96d3e10fd30ba4cea15c18 Author: Claus Ibsen AuthorDate: Tue Jul 25 08:49:07 2023 +0200 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. (#10814) --- .../component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java| 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java index c9df3c6b575..18e91bb74a3 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java @@ -29,6 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; @@ -65,6 +66,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp @ParameterizedTest @ValueSource(ints = { 500, 100, 100 }) +@Disabled("This will spam logs with Session is closed") public void testTempQueueRefreshed(int numFiles) throws Exception { executorService = context.getExecutorServiceManager().newFixedThreadPool(this, "test", 5);
[GitHub] [camel] davsclaus merged pull request #10814: camel-jms: Disable test that spam logs with Session is closed that ma…
davsclaus merged PR #10814: URL: https://github.com/apache/camel/pull/10814 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #10814: camel-jms: Disable test that spam logs with Session is closed that ma…
davsclaus commented on PR #10814: URL: https://github.com/apache/camel/pull/10814#issuecomment-1649224890 camel-jms tests passes -- 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 #10814: camel-jms: Disable test that spam logs with Session is closed that ma…
github-actions[bot] commented on PR #10814: URL: https://github.com/apache/camel/pull/10814#issuecomment-1649163072 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 opened a new pull request, #10814: camel-jms: Disable test that spam logs with Session is closed that ma…
davsclaus opened a new pull request, #10814: URL: https://github.com/apache/camel/pull/10814 …kes it harder to troubleshoot. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch spam in repository https://gitbox.apache.org/repos/asf/camel.git commit 55f44daefe95e07413d7905615c4ae0c87017423 Author: Claus Ibsen AuthorDate: Tue Jul 25 07:29:22 2023 +0200 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. --- .../component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java| 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java index c9df3c6b575..18e91bb74a3 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java @@ -29,6 +29,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; @@ -65,6 +66,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp @ParameterizedTest @ValueSource(ints = { 500, 100, 100 }) +@Disabled("This will spam logs with Session is closed") public void testTempQueueRefreshed(int numFiles) throws Exception { executorService = context.getExecutorServiceManager().newFixedThreadPool(this, "test", 5);
[camel] branch spam created (now 55f44daefe9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spam in repository https://gitbox.apache.org/repos/asf/camel.git at 55f44daefe9 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. This branch includes the following new commits: new 55f44daefe9 camel-jms: Disable test that spam logs with Session is closed that makes it harder to troubleshoot. 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-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-1649021275 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 5651944994-1188-a2214fc6-87e9-4be8-a7b6-689258c307a8 * Camel Quarkus Commit: d9deb44422916f64bcf24645b04ac4ac36a3f376 * Quarkus Main Commit: 659314e5cef5fd1953624e45e91d737010ae437a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5651944994 -- 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] 10/21: Workaround for dataformat (because of iCal4j update - #5099
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 22cc344e0b82f501da8a12d1cea20608d4693ae2 Author: JiriOndrusek AuthorDate: Mon Jul 17 12:50:47 2023 +0200 Workaround for dataformat (because of iCal4j update - #5099 --- .../component/ical/deployment/IcalProcessor.java | 22 .../deployment/SchemaValidatorFactorySubst.java| 39 ++ 2 files changed, 61 insertions(+) diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index 23c1623539..989dd7cd8c 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -20,9 +20,13 @@ import java.util.stream.Stream; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; class IcalProcessor { @@ -57,4 +61,22 @@ class IcalProcessor { .forEach(path -> nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem(path))); } +@BuildStep +void registerWsSecurityReflectionItems(CombinedIndexBuildItem combinedIndexBuildItem, +BuildProducer reflectiveClass) { +reflectiveClass + .produce(ReflectiveClassBuildItem.builder("net.fortuna.ical4j.util.MapTimeZoneCache").methods(true).build()); +} + +@BuildStep +IndexDependencyBuildItem registerDependencyForIndex() { +return new IndexDependencyBuildItem("org.mnode.ical4j", "ical4j"); +} + +@BuildStep +void runtimeInitializedClasses(BuildProducer runtimeInitializedClass) { +runtimeInitializedClass +.produce(new RuntimeInitializedClassBuildItem("net.fortuna.ical4j.validate.schema.JsonSchemaValidator")); +} + } diff --git a/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java b/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java new file mode 100644 index 00..e3f6e3447a --- /dev/null +++ b/extensions/ical/runtime/src/main/java/org/apache/camel/quarkus/component/ical/deployment/SchemaValidatorFactorySubst.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.ical.deployment; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import net.fortuna.ical4j.model.parameter.Schema; +import net.fortuna.ical4j.model.property.StructuredData; +import net.fortuna.ical4j.validate.Validator; +import net.fortuna.ical4j.validate.schema.SchemaValidatorFactory; + +@TargetClass(value = SchemaValidatorFactory.class) +final class SchemaValidatorFactorySubstitutions { + +@Substitute +public static Validator newInstance(Schema schema) { +//see https://github.com/apache/camel-quarkus/issues/5099 for more details +//Method causes error (it is unclear to me, why it is happening): +//UnresolvedElementException: Discovered unresolved method during parsing: net.fortuna.ical4j.validate.schema.JsonSchemaValidator.(java.net.URL). +// This error is reported at image build time because class net.fortuna.ical4j.validate.schema.SchemaValidatorFactory +
[camel-quarkus] 07/21: Fixed twitter + generated stuff.
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4513acf324951ae3c28330e41a3a9354916360d9 Author: JiriOndrusek AuthorDate: Thu Jul 13 17:13:54 2023 +0200 Fixed twitter + generated stuff. --- .../src/generated/resources/org/apache/camel/component/qute/qute.json | 2 +- .../camel/quarkus/component/twitter/deployment/TwitterProcessor.java| 2 +- .../java/org/apache/camel/quarkus/component/twitter/CamelResource.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json index 21cef72912..653cb4fcb8 100644 --- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json @@ -28,7 +28,7 @@ "quteEngine": { "index": 3, "kind": "property", "displayName": "Qute Engine", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.quarkus.qute.Engine", "deprecated": false, "autowired": false, "secret": false, "description": "To use the Engine otherwise a new engine is created" } }, "properties": { -"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registr [...] +"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will look [...] "allowContextMapAll": { "index": 1, "kind": "parameter", "displayName": "Allow Context Map All", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and C [...] "allowTemplateFromHeader": { "index": 2, "kind": "parameter", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential s [...] "contentCache": { "index": 3, "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether to use resource content cache or not" }, diff --git a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java index 60a5d06614..7e1e9348ba 100644 --- a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java +++ b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java @@ -25,7 +25,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.apache.camel.component.twitter.AbstractTwitterComponent; -import twitter4j.auth.OAuthAuthorization; +import twitter4j.OAuthAuthorization; class TwitterProcessor { private static final String FEATURE = "camel-twitter"; diff --git a/integration-tests/twitter/src/main/java/org/apache/camel/quarkus/component/twitter/CamelResource.java b/integration-tests/twitter/src/main/java/org/apa
[camel-quarkus] 16/21: Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 61190c0e76d5b225e0c71426c09b515e2f10d7d2 Author: JiriOndrusek AuthorDate: Wed Jul 19 12:32:37 2023 +0200 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 --- poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 - poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 - 2 files changed, 10 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7a18d60f90..f6373ec294 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6336,11 +6336,6 @@ jakarta.jms-api 3.1.0 - -jaxen -jaxen -1.2.0 - joda-time joda-time diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d69c679e8e..4db76fb393 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6336,11 +6336,6 @@ jakarta.jms-api 3.1.0 - -jaxen -jaxen -1.2.0 - joda-time joda-time
[camel-quarkus] 11/21: POM regen
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6cef90ee4b8c145e61926a40be01d81ae8db2bc7 Author: JiriOndrusek AuthorDate: Mon Jul 17 14:07:37 2023 +0200 POM regen --- poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e4b0ff8584..9210ee5ba6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e55b1dadcf..e63e957e0b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 7947aebfd3..1e403ecbae 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6314,12 +6314,12 @@ io.swagger.core.v3 swagger-models -2.2.10 +2.2.15 io.swagger.parser.v3 swagger-parser -2.1.14 +2.1.16 com.google.code.findbugs @@ -6344,7 +6344,7 @@ joda-time joda-time -2.11.1 +2.12.5 net.i2p.crypto
[camel-quarkus] 20/21: generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8a97c22666ebc4caa1ab8af016d1c858ec519b21 Author: JiriOndrusek AuthorDate: Fri Jul 21 09:16:33 2023 +0200 generated poms --- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0a8b560c49..398c777f66 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,9 @@ 1.313 ${google-auth-library-oauth2-http-version} ${google-oauth-client-version} -0.199.0 - 1.123.17 - 1.123.17 +0.200.0 + 1.123.18 + 1.123.18 22.3.2 4.0.13 1.56.0 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1e5eabeb84..4d576219a8 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6464,7 +6464,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6479,7 +6479,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d97c9a7815..4ee5110ee7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6439,7 +6439,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6454,7 +6454,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 68c3d6ed5a..8d3824dce6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,12 +6032,12 @@ com.google.auth google-auth-library-credentials -1.7.0 +1.19.0 com.google.cloud google-cloud-pubsub -1.123.17 +1.123.18 com.google.android @@ -6439,7 +6439,7 @@ org.apache.zookeeper zookeeper -3.8.1 +3.8.2 ch.qos.logback @@ -6454,7 +6454,7 @@ org.apache.zookeeper zookeeper-jute -3.8.1 +3.8.2 org.asynchttpclient
[camel-quarkus] 21/21: Fixed aws2-kinesis
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d7456791874c3709cdd568628ab26275e1196b03 Author: JiriOndrusek AuthorDate: Fri Jul 21 13:46:36 2023 +0200 Fixed aws2-kinesis --- .../component/aws2/kinesis/it/Aws2KinesisResource.java| 6 +- .../component/aws2/kinesis/it/Aws2KinesisRoutes.java | 9 + .../aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java | 15 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java index d3a556d253..fdbeeff70a 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisResource.java @@ -45,6 +45,9 @@ public class Aws2KinesisResource extends BaseAws2Resource { @ConfigProperty(name = "aws-kinesis.stream-name") String streamName; +@ConfigProperty(name = "aws-kinesis.stream-name-for-default-credentials") +String streamNameForDefaultCredentials; + @Inject ProducerTemplate producerTemplate; @@ -81,7 +84,8 @@ public class Aws2KinesisResource extends BaseAws2Resource { } private String componentUri() { -return "aws2-kinesis://" + streamName + "?useDefaultCredentialsProvider=" + isUseDefaultCredentials(); +return "aws2-kinesis://" + (isUseDefaultCredentials() ? streamNameForDefaultCredentials : streamName) ++ "?useDefaultCredentialsProvider=" + isUseDefaultCredentials(); } } diff --git a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java index bf6433ef9f..5b6a701da5 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java @@ -32,6 +32,9 @@ public class Aws2KinesisRoutes extends RouteBuilder { @ConfigProperty(name = "aws-kinesis.stream-name") String streamName; +@ConfigProperty(name = "aws-kinesis.stream-name-for-default-credentials") +String streamNameForDefaultCredentials; + @Inject @Named("aws2KinesisMessages") Queue aws2KinesisMessages; @@ -40,10 +43,16 @@ public class Aws2KinesisRoutes extends RouteBuilder { return "aws2-kinesis://" + streamName; } +private String componentUriForDefaultCredentials() { +return "aws2-kinesis://" + streamNameForDefaultCredentials; +} + @Override public void configure() throws Exception { from(componentUri()) .process(exchange -> aws2KinesisMessages.add(exchange.getMessage().getBody(String.class))); +from(componentUriForDefaultCredentials()) +.process(exchange -> aws2KinesisMessages.add(exchange.getMessage().getBody(String.class))); } static class Producers { diff --git a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java index 4486af899c..99d7718a8c 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java @@ -79,6 +79,8 @@ public class Aws2KinesisTestEnvCustomizer implements Aws2TestEnvCustomizer { public void customize(Aws2TestEnvContext envContext) { final String streamName = "camel-quarkus-" + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); +final String streamNameForDefaultCredentials = "camel-quarkus-" ++ RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT); final String streamArn; { envContext.property("aws-kinesis.stream-name", streamName); @@ -99,6 +101,19 @@ public class Aws2KinesisTestEnvCustomizer implements Aws2TestEnvCustomizer { envContext.closeable(() -> client.deleteStream(DeleteStreamRequest.builder().streamName(streamName
[camel-quarkus] 06/21: generated POMs
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a2d60096e7881b65cd1be176229ad180f14cd88d Author: JiriOndrusek AuthorDate: Thu Jul 13 12:51:19 2023 +0200 generated POMs --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 35457be641..b8a76a5adf 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6514,7 +6514,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 2579bfed7e..ddb9bc42d7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6499,7 +6499,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 3023fad4f1..5447bf7fc3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6499,7 +6499,7 @@ org.javassist javassist -3.28.0-GA +3.29.2-GA org.jetbrains.kotlin
[camel-quarkus] 04/21: Fixed version conflict + substitution in json-validator
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 812b9e60d668002a02ab2d60aeb68d1c5f4508f7 Author: JiriOndrusek AuthorDate: Wed Jul 12 14:51:26 2023 +0200 Fixed version conflict + substitution in json-validator --- .../graal/JsonValidatorSubstitutions.java | 39 +++--- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java b/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java index 82518ba3fd..5237dc65a3 100644 --- a/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java +++ b/extensions/json-validator/runtime/src/main/java/org/apache/camel/quarkus/component/json/validator/graal/JsonValidatorSubstitutions.java @@ -19,16 +19,10 @@ package org.apache.camel.quarkus.component.json.validator.graal; import java.lang.reflect.Constructor; import java.util.function.BooleanSupplier; -import com.fasterxml.jackson.databind.JsonNode; -import com.networknt.schema.JsonSchema; -import com.networknt.schema.JsonValidator; -import com.networknt.schema.PatternValidator; import com.networknt.schema.ValidationContext; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.Delete; +import com.networknt.schema.regex.RegularExpression; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.TargetElement; /** * Removes references to PatternValidatorEcma262Deletion, which requires optional org.jruby.joni:joni @@ -36,36 +30,27 @@ import com.oracle.svm.core.annotate.TargetElement; public class JsonValidatorSubstitutions { } -@TargetClass(value = PatternValidator.class, onlyWith = IsJoniAbsent.class) -final class PatternValidatorSubstitutions { -@Alias -private JsonValidator delegate; -@Alias -private ValidationContext validationContext; +@TargetClass(value = RegularExpression.class, onlyWith = IsJoniAbsent.class) +@Substitute +interface RegularExpressionSubstitutions { +@Substitute +boolean matches(String value); @Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public PatternValidatorSubstitutions(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, -ValidationContext validationContext) { +static RegularExpression compile(String regex, ValidationContext validationContext) { +if (null == regex) +return s -> true; try { -Class clazz = Class.forName("com.networknt.schema.PatternValidator$PatternValidatorJava"); -Constructor constructor = clazz.getDeclaredConstructor(String.class, JsonNode.class, JsonSchema.class, -ValidationContext.class); +Class clazz = Class.forName("com.networknt.schema.regex.JDKRegularExpression"); +Constructor constructor = clazz.getDeclaredConstructor(String.class); -this.validationContext = validationContext; -this.delegate = (JsonValidator) constructor.newInstance(schemaPath, schemaNode, parentSchema, -validationContext); +return (RegularExpression) constructor.newInstance(regex); } catch (Exception e) { throw new RuntimeException(e); } } } -@TargetClass(className = "com.networknt.schema.PatternValidator$PatternValidatorEcma262", onlyWith = IsJoniAbsent.class) -@Delete -final class PatternValidatorEcma262Deletion { -} - final class IsJoniAbsent implements BooleanSupplier { @Override public boolean getAsBoolean() {
[camel-quarkus] 03/21: fixed optaplanner version conflict + generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0643029765a4cc2430961ac122e97fc22506823e Author: JiriOndrusek AuthorDate: Wed Jul 12 09:22:37 2023 +0200 fixed optaplanner version conflict + generated files --- poms/bom/pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 10 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +-- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3b70a8ccb2..b5f0040b28 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2000,6 +2000,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 25d4313c77..ba936a2e5c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -53,7 +53,7 @@ org.apache.camel camel-activemq -4.0.0-RC1 +4.0.0-SNAPSHOT org.apache.camel @@ -1938,6 +1938,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 4e382a7d23..8fa9b76c43 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -53,7 +53,7 @@ org.apache.camel camel-activemq -4.0.0-RC1 +4.0.0-SNAPSHOT org.apache.camel @@ -1938,6 +1938,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + @@ -6493,11 +6501,6 @@ javassist 3.28.0-GA - -org.jetbrains.kotlin -kotlin-script-util -1.8.22 - org.jetbrains.kotlin kotlin-scripting-jvm diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 91f0a1f31f..37c644a57b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -53,7 +53,7 @@ org.apache.camel camel-activemq -4.0.0-RC1 +4.0.0-SNAPSHOT org.apache.camel @@ -1938,6 +1938,14 @@ org.optaplanner optaplanner-core + +org.optaplanner +optaplanner-core-impl + + +org.optaplanner +optaplanner-persistence-common + @@ -6493,11 +6501,6 @@ javassist 3.28.0-GA - -org.jetbrains.kotlin -kotlin-script-util -1.8.22 - org.jetbrains.kotlin kotlin-scripting-jvm
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2927 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1648983007 Build fixed with: * Camel Quarkus Commit: d7456791874c3709cdd568628ab26275e1196b03 * Camel Main Commit: 659314e5cef5fd1953624e45e91d737010ae437a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5651118996 -- 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] 02/21: synced + generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 27f77e2b5307dfec47df5057e2b8988b1a95aecc Author: JiriOndrusek AuthorDate: Mon Jul 10 09:40:35 2023 +0200 synced + generated files --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 15319a3f5b..036f609899 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 1.313 ${google-auth-library-oauth2-http-version} ${google-oauth-client-version} -0.182.1 - 1.121.0 -1.121.0 +0.199.0 + 1.123.17 + 1.123.17 22.3.2 4.0.13 1.56.0 @@ -132,7 +132,7 @@ ${mapstruct-version} 8.2.2 1.13.8 -2.4.15.Final +2.5.0.Final 3.5.11 1.48.0 ${squareup-okio-version}
[camel-quarkus] 17/21: enabled ssh
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a75ae7250dd439d3e7f780ccd31ca8cbba1ad78a Author: JiriOndrusek AuthorDate: Thu Jul 20 08:46:11 2023 +0200 enabled ssh --- integration-tests/ssh/pom.xml| 5 ++--- .../test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/integration-tests/ssh/pom.xml b/integration-tests/ssh/pom.xml index 53e93384da..74bd48388f 100644 --- a/integration-tests/ssh/pom.xml +++ b/integration-tests/ssh/pom.xml @@ -71,8 +71,7 @@ - + virtualDependencies diff --git a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java index 9cf3c3f78c..4681ee0a94 100644 --- a/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java +++ b/integration-tests/ssh/src/test/java/org/apache/camel/quarkus/component/ssh/it/SshTest.java @@ -20,7 +20,6 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,7 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class SshTest { @Test -@Disabled //temporarily disabled because of https://github.com/apache/camel-quarkus/issues/5092 public void testWriteToSSHAndReadFromSSH() { final String fileContent = "Hello Camel Quarkus SSH"; // Write a file to SSH session
[camel-quarkus] 18/21: Fixed arangodb + generated pomns
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f771199a931e07f31b53fb475a7df3b89c337e0e Author: JiriOndrusek AuthorDate: Thu Jul 20 11:03:39 2023 +0200 Fixed arangodb + generated pomns --- .../component/arangodb/it/ArangodbResource.java| 58 + .../component/arangodb/it/ArangodbTest.java| 75 +- .../arangodb/it/ArangodbTestResource.java | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 10 +-- .../src/main/generated/flattened-reduced-pom.xml | 10 +-- .../generated/flattened-reduced-verbose-pom.xml| 10 +-- 6 files changed, 91 insertions(+), 74 deletions(-) diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java index e56adbcb65..8da0ca2ef0 100644 --- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java +++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java @@ -17,10 +17,13 @@ package org.apache.camel.quarkus.component.arangodb.it; import java.net.URI; -import java.util.Collection; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import com.arangodb.entity.BaseDocument; import com.arangodb.entity.DocumentCreateEntity; import com.arangodb.entity.DocumentDeleteEntity; import jakarta.enterprise.context.ApplicationScoped; @@ -36,6 +39,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.camel.ProducerTemplate; +import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; import static org.apache.camel.component.arangodb.ArangoDbConstants.AQL_QUERY; @@ -44,7 +48,7 @@ import static org.apache.camel.component.arangodb.ArangoDbConstants.AQL_QUERY_OP import static org.apache.camel.component.arangodb.ArangoDbConstants.ARANGO_KEY; import static org.apache.camel.component.arangodb.ArangoDbConstants.RESULT_CLASS_TYPE; -@Path("/arangodb/camel") +@Path("/arangodb") @ApplicationScoped public class ArangodbResource { @@ -53,14 +57,20 @@ public class ArangodbResource { @Inject ProducerTemplate producerTemplate; +@ConfigProperty(name = "camel.arangodb.host") +String host; + +@ConfigProperty(name = "camel.arangodb.port") +String port; + @PUT @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN) public Response put(String message) throws Exception { LOG.infof("Saving to arangodb: %s", message); final DocumentCreateEntity response = producerTemplate.requestBody( - "arangodb:test?host={{camel.arangodb.host}}&port={{camel.arangodb.port}}&documentCollection=camel&operation=SAVE_DOCUMENT", -message, DocumentCreateEntity.class); + String.format("arangodb:test?host=%s&port=%s&documentCollection=camel&operation=SAVE_DOCUMENT", host, port), +toDocument(message), DocumentCreateEntity.class); LOG.infof("Got response from arangodb: %s", response); return Response .created(new URI("https://camel.apache.org/";)) @@ -73,13 +83,13 @@ public class ArangodbResource { @Produces(MediaType.TEXT_PLAIN) public Response get(@PathParam("key") String key) throws Exception { LOG.infof("Retrieve document from arangodb with key: %s", key); -final String response = producerTemplate.requestBodyAndHeader( +final BaseDocument response = producerTemplate.requestBodyAndHeader( "arangodb:test?host={{camel.arangodb.host}}&port={{camel.arangodb.port}}&documentCollection=camel&operation=FIND_DOCUMENT_BY_KEY", -key, RESULT_CLASS_TYPE, String.class, String.class); +key, RESULT_CLASS_TYPE, BaseDocument.class, BaseDocument.class); LOG.infof("Got response from arangodb: %s", response); return Response .ok() -.entity(response) +.entity(toString(response)) .build(); } @@ -107,7 +117,7 @@ public class ArangodbResource { producerTemplate.requestBodyAndHeaders( "arangodb:test?host={{camel.arangodb.host}}&port={{camel.arangodb.port}}&documentCollection=camel&operation=UPDATE_DOCUMENT", -msg, headers, String.class); +toDocument(msg), headers, String.class); return Response .ok() .build(); @@ -126,15 +136,39 @@ public class ArangodbResource { headers.put(AQL_QUERY, query);
[camel-quarkus] 09/21: generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ae0308b03bfeba6c778d70e60027453d09a6c794 Author: JiriOndrusek AuthorDate: Mon Jul 17 08:48:47 2023 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 30 +++--- .../src/main/generated/flattened-reduced-pom.xml | 30 +++--- .../generated/flattened-reduced-verbose-pom.xml| 30 +++--- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b8a76a5adf..e4b0ff8584 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5917,7 +5917,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.1 +6.6.2 com.google.code.findbugs @@ -5936,32 +5936,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.6.1 +6.6.2 ca.uhn.hapi.fhir @@ -6193,7 +6193,7 @@ io.projectreactor.netty reactor-netty -1.1.6 +1.1.9 io.quarkiverse.freemarker @@ -6564,7 +6564,7 @@ org.springframework spring-aop -6.0.10 +6.0.11 org.springframework @@ -6579,7 +6579,7 @@ org.springframework spring-expression -6.0.10 +6.0.11 org.springframework @@ -6590,7 +6590,7 @@ org.springframework spring-jdbc -6.0.10 +6.0.11 org.springframework @@ -6605,7 +6605,7 @@ org.springframework spring-jms -6.0.10 +6.0.11 org.springframework @@ -6620,7 +6620,7 @@ org.springframework spring-messaging -6.0.10 +6.0.11 org.springframework @@ -6635,7 +6635,7 @@ org.springframework spring-orm -6.0.10 +6.0.11 org.springframework @@ -6650,7 +6650,7 @@ org.springframework spring-tx -6.0.10 +6.0.11 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index ddb9bc42d7..e55b1dadcf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5917,7 +5917,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.1 +6.6.2 com.google.code.findbugs @@ -5936,32 +5936,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.1 +6.6.2 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.6.1 +6.6.2 ca.uhn.hapi.fhir @@ -6193,7 +6193,7 @@ io.projectreactor.netty reactor-netty -1.1.6 +1.1.9 io.quarkiverse.freemarker @@ -6544,7 +6544,7 @@ org.springframework spring-aop -6.0.10 +6.0.11 org.springframework @@ -6559,7 +6559,7 @@ org.springframework spring-expression -6.0.10 +6.0.11 org.springframework @@ -6570,7 +6570,7 @@ org.springframework spring-jdbc -6.0.10 +6.0.11 org.springframework @@ -6585,7 +6585,7 @@ org.springframework spring-jms -
[camel-quarkus] 08/21: Fixed Slack
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 48245b1eebce15af43bdb48313df1e7ab8f2a1c3 Author: JiriOndrusek AuthorDate: Fri Jul 14 09:31:46 2023 +0200 Fixed Slack --- .../component/slack/graal/SlackSubstitutions.java | 47 ++ 1 file changed, 47 insertions(+) diff --git a/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java b/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java index ae481858db..64afbb4087 100644 --- a/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java +++ b/extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java @@ -30,6 +30,7 @@ import com.slack.api.audit.AuditConfig; import com.slack.api.methods.MethodsConfig; import com.slack.api.rate_limits.metrics.MetricsDatastore; import com.slack.api.scim.SCIMConfig; +import com.slack.api.scim2.SCIM2Config; import com.slack.api.util.http.listener.DetailedLoggingListener; import com.slack.api.util.http.listener.HttpResponseListener; import com.slack.api.util.http.listener.ResponsePrettyPrintingListener; @@ -162,6 +163,44 @@ final class SlackConfigSubstitutions { } }; +@Alias +@RecomputeFieldValue(kind = Reset) +private SCIM2Config sCIM2Config = new SCIM2Config() { +void throwException() { +throw new UnsupportedOperationException("This config is immutable"); +} + +@Override +public void setStatsEnabled(boolean statsEnabled) { +throwException(); +} + +@Override +public void setExecutorName(String executorName) { +throwException(); +} + +@Override +public void setMaxIdleMills(int maxIdleMills) { +throwException(); +} + +@Override +public void setDefaultThreadPoolSize(int defaultThreadPoolSize) { +throwException(); +} + +@Override +public void setMetricsDatastore(MetricsDatastore metricsDatastore) { +throwException(); +} + +@Override +public void setCustomThreadPoolSizes(Map customThreadPoolSizes) { +throwException(); +} +}; + @Alias private ExecutorServiceProvider executorServiceProvider; @Alias @@ -199,3 +238,11 @@ final class SCIMConfigSubstitutions { @RecomputeFieldValue(kind = Reset) public static SCIMConfig DEFAULT_SINGLETON = null; } + +@TargetClass(SCIM2Config.class) +final class SCIM2ConfigSubstitutions { + +@Alias +@RecomputeFieldValue(kind = Reset) +public static SCIM2Config DEFAULT_SINGLETON = null; +}
[camel-quarkus] 13/21: Proper fix of tika version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9a692f96728cc53141a980fa8861675639067bda Author: JiriOndrusek AuthorDate: Tue Jul 18 16:21:15 2023 +0200 Proper fix of tika version conflict + generated poms --- poms/bom/pom.xml | 15 +++ poms/bom/src/main/generated/flattened-full-pom.xml| 15 +++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++ .../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +++ 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index fdcae4dcae..a1b8d23ab1 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,10 +6386,6 @@ commons-logging commons-logging - -fontbox -org.apache.pdfbox - @@ -6515,6 +6511,17 @@ kudu-client ${kudu.version} + +org.apache.pdfbox +fontbox +${pdfbox.version} + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ecdfd44de6..0849da1c1c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6428,6 +6424,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 58aa26a8b8..52cf685193 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6418,6 +6414,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5be4fdd539..3e75c27e15 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6299,10 +6299,6 @@ commons-logging commons-logging - -org.apache.pdfbox -fontbox - @@ -6418,6 +6414,17 @@ kudu-client 1.16.0 + +org.apache.pdfbox +fontbox +2.0.29 + + +commons-logging +commons-logging + + + org.apache.xmlgraphics xmlgraphics-commons
[camel-quarkus] 12/21: Fixed tika version conflict + regen of poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 952bb10aa8e6ebc2910ecc7f45924f4302cb0222 Author: JiriOndrusek AuthorDate: Tue Jul 18 09:12:56 2023 +0200 Fixed tika version conflict + regen of poms --- poms/bom/pom.xml | 4 poms/bom/src/main/generated/flattened-full-pom.xml| 10 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 63bff236a7..fdcae4dcae 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,6 +6386,10 @@ commons-logging commons-logging + +fontbox +org.apache.pdfbox + diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9210ee5ba6..ecdfd44de6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6509,7 +6513,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6534,7 +6538,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e63e957e0b..58aa26a8b8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6494,7 +6498,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6514,7 +6518,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 1e403ecbae..5be4fdd539 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,7 +6032,7 @@ com.google.cloud google-cloud-pubsub -1.121.0 +1.123.17 com.google.android @@ -6299,6 +6299,10 @@ commons-logging commons-logging + +org.apache.pdfbox +fontbox + @@ -6494,7 +6498,7 @@ org.influxdb influxdb-java -2.22 +2.23 org.javassist @@ -6514,7 +6518,7 @@ org.mvel mvel2 -2.4.15.Final +2.5.0.Final org.mybatis
[camel-quarkus] 14/21: Fixed ArangoDB and google-secret-manager version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 30ad1e2646d28bf9b364df6e3fdaa1e228858b72 Author: JiriOndrusek AuthorDate: Wed Jul 19 09:41:42 2023 +0200 Fixed ArangoDB and google-secret-manager version conflict + generated poms --- extensions-jvm/google-secret-manager/runtime/pom.xml| 8 +++- .../quarkus/component/arangodb/it/ArangodbResource.java | 4 +--- .../quarkus/component/arangodb/it/ArangodbTest.java | 5 ++--- poms/bom/src/main/generated/flattened-full-pom.xml | 17 +++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- .../main/generated/flattened-reduced-verbose-pom.xml| 2 +- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/extensions-jvm/google-secret-manager/runtime/pom.xml b/extensions-jvm/google-secret-manager/runtime/pom.xml index 54269907aa..6f2fa282ee 100644 --- a/extensions-jvm/google-secret-manager/runtime/pom.xml +++ b/extensions-jvm/google-secret-manager/runtime/pom.xml @@ -83,8 +83,14 @@ -google-cloud-pubsub com.google.cloud +google-cloud-pubsub + + +gax-httpjson +com.google.api + + diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java index eafdbbf913..e56adbcb65 100644 --- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java +++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java @@ -23,7 +23,6 @@ import java.util.Map; import com.arangodb.entity.DocumentCreateEntity; import com.arangodb.entity.DocumentDeleteEntity; -import com.arangodb.util.MapBuilder; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -121,8 +120,7 @@ public class ArangodbResource { LOG.infof("Retrieve document from arangodb with foo: %s", fooName); String query = "FOR t IN camel FILTER t.foo == @foo RETURN t"; -Map bindVars = new MapBuilder().put("foo", fooName) -.get(); +Map bindVars = Map.of("foo", fooName); Map headers = new HashMap<>(); headers.put(AQL_QUERY, query); diff --git a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java index 82cf2bb695..642dd304c0 100644 --- a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java +++ b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java @@ -19,7 +19,6 @@ package org.apache.camel.quarkus.component.arangodb.it; import com.arangodb.ArangoCollection; import com.arangodb.ArangoDB; import com.arangodb.ArangoDatabase; -import com.arangodb.DbName; import com.arangodb.entity.BaseDocument; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; @@ -140,8 +139,8 @@ class ArangodbTest { String host = ConfigProvider.getConfig().getValue("camel.arangodb.host", String.class); Integer port = ConfigProvider.getConfig().getValue("camel.arangodb.port", Integer.class); arangoDb = new ArangoDB.Builder().host(host, port).build(); -arangoDb.createDatabase(DbName.of(DATABASE_NAME)); -ArangoDatabase arangoDatabase = arangoDb.db(DbName.of(DATABASE_NAME)); +arangoDb.createDatabase(DATABASE_NAME); +ArangoDatabase arangoDatabase = arangoDb.db(DATABASE_NAME); arangoDatabase.createCollection(COLLECTION_NAME); collection = arangoDatabase.collection(COLLECTION_NAME); } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0849da1c1c..c8a7c7c619 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6059,7 +6059,7 @@ com.google.oauth-client google-oauth-client -1.34.0 +1.34.1 commons-logging @@ -6180,6 +6180,16 @@ + +io.dropwizard.metrics +dropwizard-core +4.2.19 + + +io.dropwizard.metrics +metrics-jmx +4.2.19 + io.perfmark perfmark-api @@ -21039,11 +21049,6 @@ metrics-core 4.0.1 - -io.
[camel-quarkus] 19/21: Fixed web3j + generated poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9d91727b8f495cc51533fe4350494d33d5879078 Author: JiriOndrusek AuthorDate: Thu Jul 20 13:07:57 2023 +0200 Fixed web3j + generated poms --- pom.xml | 1 + poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 5 files changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index d8e34c8ec8..0a8b560c49 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ ${jetty-version} ${jira-rest-client-api-version} 5.6.0 +0.9.11 2.2.13 0.2.9 ${json-path-version} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a1b8d23ab1..1bed98f8d0 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6091,6 +6091,11 @@ + +com.github.jnr +jnr-constants +${jnr-constants.version} + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 76a61f8661..1e5eabeb84 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 0a147eea3b..d97c9a7815 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index a99a8ea618..68c3d6ed5a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6014,6 +6014,11 @@ + +com.github.jnr +jnr-constants +0.9.11 + com.github.jnr jnr-ffi
[camel-quarkus] 15/21: Fixed Atom
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3d39f189db5bf562314cea19b666ad656e5b2cfa Author: JiriOndrusek AuthorDate: Wed Jul 19 11:09:35 2023 +0200 Fixed Atom --- .../component/atom/deployment/AtomProcessor.java | 8 -- .../quarkus/component/atom/it/AtomResource.java| 33 +- .../src/main/resources/META-INF/resources/atom.xml | 6 ++-- .../camel/quarkus/component/atom/it/AtomTest.java | 10 ++- 4 files changed, 19 insertions(+), 38 deletions(-) diff --git a/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java b/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java index 2956932b33..681b68246a 100644 --- a/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java +++ b/extensions/atom/deployment/src/main/java/org/apache/camel/quarkus/component/atom/deployment/AtomProcessor.java @@ -18,9 +18,6 @@ package org.apache.camel.quarkus.component.atom.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import org.apache.abdera.parser.stax.FOMFactory; -import org.apache.abdera.parser.stax.FOMParser; class AtomProcessor { @@ -30,9 +27,4 @@ class AtomProcessor { FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } - -@BuildStep -ReflectiveClassBuildItem registerForReflection() { -return ReflectiveClassBuildItem.builder(FOMParser.class, FOMFactory.class).build(); -} } diff --git a/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java b/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java index 5a0e5a4995..46039e9de8 100644 --- a/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java +++ b/integration-tests/syndication/src/main/java/org/apache/camel/quarkus/component/atom/it/AtomResource.java @@ -16,6 +16,9 @@ */ package org.apache.camel.quarkus.component.atom.it; +import java.util.List; + +import com.apptasticsoftware.rssreader.Item; import jakarta.inject.Inject; import jakarta.json.Json; import jakarta.json.JsonArrayBuilder; @@ -26,8 +29,6 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import org.apache.abdera.model.Entry; -import org.apache.abdera.model.Feed; import org.apache.camel.ConsumerTemplate; import org.apache.camel.Exchange; import org.apache.camel.component.atom.AtomConstants; @@ -43,27 +44,19 @@ public class AtomResource { @Produces(MediaType.APPLICATION_JSON) public JsonObject consumeAtomFeed(@QueryParam("test-port") int port) throws Exception { Exchange exchange = consumerTemplate.receive("atom://http://localhost:"; + port + "/atom.xml?splitEntries=false"); -Feed feed = exchange.getMessage().getHeader(AtomConstants.ATOM_FEED, Feed.class); - -JsonObjectBuilder atom = Json.createObjectBuilder(); -atom.add("title", feed.getTitle()); -atom.add("subtitle", feed.getSubtitle()); -atom.add("link", feed.getLinks().get(0).getHref().toASCIIString()); +List feed = exchange.getIn().getHeader(AtomConstants.ATOM_FEED, List.class); +JsonArrayBuilder atom = Json.createArrayBuilder(); -JsonArrayBuilder entries = Json.createArrayBuilder(); - -for (Entry entry : feed.getEntries()) { +for (Item entry : feed) { JsonObjectBuilder atomEntry = Json.createObjectBuilder(); -atomEntry.add("title", entry.getTitle()); -atomEntry.add("link", entry.getLinks().get(0).getHref().toASCIIString()); -atomEntry.add("summary", entry.getSummary()); -atomEntry.add("content", entry.getContent()); -atomEntry.add("author", entry.getAuthor().getName()); -entries.add(atomEntry); +atomEntry.add("title", entry.getTitle().get()); +atomEntry.add("link", entry.getLink().get()); +atomEntry.add("comments", entry.getComments().get()); +atomEntry.add("description", entry.getDescription().get()); +atomEntry.add("author", entry.getAuthor().get()); +atom.add(atomEntry); } -atom.add("entries", entries.build()); - -return atom.build(); +return Json.createObjectBuilder().add("entries", atom.build()).build(); } } diff --git a/integration-tests/syndication/src/main/resources/META-INF/resources/atom.xml b/integration-tests/syndication/src/main/re
[camel-quarkus] 05/21: fixed debezium version problem
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1b6b731dae8e688ef5e3019745ac46ac55c6079b Author: JiriOndrusek AuthorDate: Thu Jul 13 11:04:28 2023 +0200 fixed debezium version problem --- pom.xml| 1 - poms/bom/pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 432 ++--- .../src/main/generated/flattened-reduced-pom.xml | 28 +- .../generated/flattened-reduced-verbose-pom.xml| 132 +++ 5 files changed, 297 insertions(+), 298 deletions(-) diff --git a/pom.xml b/pom.xml index 036f609899..d8e34c8ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,6 @@ camel-${camel.major.minor}.x camel-spring-boot-${camel.major.minor}.x 1.2.0 -2.2.0.Final 9.37.0.Final 2.4.1 3.0.1 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index b5f0040b28..63bff236a7 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -88,7 +88,7 @@ io.debezium debezium-bom -${debezium.version} +${debezium-version} pom import diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ba936a2e5c..35457be641 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6180,16 +6180,6 @@ - -io.dropwizard.metrics -dropwizard-core -4.2.19 - - -io.dropwizard.metrics -metrics-jmx -4.2.19 - io.perfmark perfmark-api @@ -20932,9 +20922,9 @@ 25.1-jre-graal-sub-1 -org.apache.kafka -connect-api -3.4.0 +org.apache.kafka +connect-api +3.4.0 javax.ws.rs @@ -20943,337 +20933,347 @@ -org.apache.kafka -connect-json -3.4.0 +org.apache.kafka +connect-json +3.4.0 + + +org.apache.kafka +connect-file +3.4.0 + + +org.apache.kafka +connect-transforms +3.4.0 -org.apache.kafka -connect-file -3.4.0 +org.apache.kafka +kafka_2.13 +3.4.0 +test -org.apache.kafka -connect-transforms -3.4.0 +io.confluent +kafka-connect-avro-converter +7.0.1 -org.apache.kafka -kafka_2.13 -3.4.0 -test +io.confluent +kafka-connect-protobuf-converter +7.0.1 -io.confluent -kafka-connect-avro-converter -7.0.1 +io.apicurio +apicurio-registry-utils-converter +2.4.1.Final -io.confluent -kafka-connect-protobuf-converter -7.0.1 +com.mysql +mysql-connector-j +8.0.33 -io.apicurio -apicurio-registry-utils-converter -2.4.1.Final +com.zendesk +mysql-binlog-connector-java +0.27.2 -com.mysql -mysql-connector-j -8.0.32 +mil.nga +wkb +1.0.2 -com.zendesk -mysql-binlog-connector-java -0.27.2 +com.oracle.instantclient +xstreams +21.6.0.0 -mil.nga -wkb -1.0.2 +ch.qos.logback +logback-classic +1.2.10 -com.oracle.instantclient -xstreams -21.6.0.0 +org.codehaus.groovy +groovy +3.0.7 -ch.qos.logback -logback-classic -1.2.10 +org.codehaus.groovy +groovy-json +3.0.7 -org.codehaus.groovy -groovy -3.0.7 +org.codehaus.groovy +groovy-jsr223 +3.0.7 -org.codehaus.groovy -groovy-json -3.0.7 +io.vitess +vitess-grpc-client +12.0.0 -org.codehaus.groovy -groovy-jsr223 -3.0.7 +org.apache.cassandra +cassandra-all +3.11.12 -io.vitess -vitess-grpc-client -12.0.0 +com.datastax.cassandra +cassandra-driver-core +4.14.0 -org.apache.cassandra -cassandra-all -3.11.12 +io.dropwizard.metrics +metrics-core +4.0.1 -com.datastax.cassandra -
[camel-quarkus] branch camel-main updated (9713d05fed -> d745679187)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 9713d05fed Fixed aws2-kinesis discard de4b767165 generated poms discard 86e5fdb2ea Fixed web3j + generated poms discard df6acfa426 Fixed arangodb + generated pomns discard a9bf010da7 enabled ssh discard 49cf411290 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 discard 9c7c493502 Fixed Atom discard 26a9bece9e Fixed ArangoDB and google-secret-manager version conflict + generated poms discard 40685229d5 Proper fix of tika version conflict + generated poms discard 35fdff3c52 Fixed tika version conflict + regen of poms discard 3252452292 POM regen discard 704be61471 Workaround for dataformat (because of iCal4j update - #5099 discard cf3e4ee40c generated poms discard fdaf4eb932 Fixed Slack discard 0eec88af51 Fixed twitter + generated stuff. discard b58023883b generated POMs discard a63f3af352 fixed debezium version problem discard 7f4242affc Fixed version conflict + substitution in json-validator discard 1508e05d95 fixed optaplanner version conflict + generated files discard 242d4587f0 synced + generated files discard 060c11f5bb Upgrade Camel to 4.0.0 add d74e3d8bd3 Regen SBOM from commit 1b2888195604317ef22570170a3703b4658b4d4e add 659314e5ce Updated CHANGELOG.md new 4d781ce638 Upgrade Camel to 4.0.0 new 27f77e2b53 synced + generated files new 0643029765 fixed optaplanner version conflict + generated files new 812b9e60d6 Fixed version conflict + substitution in json-validator new 1b6b731dae fixed debezium version problem new a2d60096e7 generated POMs new 4513acf324 Fixed twitter + generated stuff. new 48245b1eeb Fixed Slack new ae0308b03b generated poms new 22cc344e0b Workaround for dataformat (because of iCal4j update - #5099 new 6cef90ee4b POM regen new 952bb10aa8 Fixed tika version conflict + regen of poms new 9a692f9672 Proper fix of tika version conflict + generated poms new 30ad1e2646 Fixed ArangoDB and google-secret-manager version conflict + generated poms new 3d39f189db Fixed Atom new 61190c0e76 Fixed - the following artifacts could not be resolved: io.atlassian.fugue:fugue-parent:pom:5.0.0 new a75ae7250d enabled ssh new f771199a93 Fixed arangodb + generated pomns new 9d91727b8f Fixed web3j + generated poms new 8a97c22666 generated poms new d745679187 Fixed aws2-kinesis 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 (9713d05fed) \ N -- N -- N refs/heads/camel-main (d745679187) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 21 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: CHANGELOG.md | 1 + camel-quarkus-sbom/camel-quarkus-sbom.json | 13258 +++ camel-quarkus-sbom/camel-quarkus-sbom.xml | 12177 3 files changed, 13857 insertions(+), 11579 deletions(-)
[camel-k] tag 2.0.1-nightly created (now 347e9d01d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to tag 2.0.1-nightly in repository https://gitbox.apache.org/repos/asf/camel-k.git at 347e9d01d (commit) No new revisions were added by this update.
[GitHub] [camel-k] github-actions[bot] commented on pull request #4594: chore(deps): bump github.com/container-tools/spectrum from 0.6.29 to 0.6.30
github-actions[bot] commented on PR #4594: URL: https://github.com/apache/camel-k/pull/4594#issuecomment-1648800403 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on pull request #4595: chore(deps): bump github.com/onsi/gomega from 1.27.9 to 1.27.10
github-actions[bot] commented on PR #4595: URL: https://github.com/apache/camel-k/pull/4595#issuecomment-1648799400 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #4595: chore(deps): bump github.com/onsi/gomega from 1.27.9 to 1.27.10
dependabot[bot] opened a new pull request, #4595: URL: https://github.com/apache/camel-k/pull/4595 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.9 to 1.27.10. Release notes Sourced from https://github.com/onsi/gomega/releases";>github.com/onsi/gomega's releases. v1.27.10 1.27.10 Fixes fix: go 1.21 adding goroutine ID to creator+location (https://redirect.github.com/onsi/gomega/issues/685";>#685) [bdc7803] Changelog Sourced from https://github.com/onsi/gomega/blob/master/CHANGELOG.md";>github.com/onsi/gomega's changelog. 1.27.10 Fixes fix: go 1.21 adding goroutine ID to creator+location (https://redirect.github.com/onsi/gomega/issues/685";>#685) [bdc7803] Commits https://github.com/onsi/gomega/commit/9cbf7b0019d4d489d668583b0d7a6ac889ee2bc8";>9cbf7b0 v1.27.10 https://github.com/onsi/gomega/commit/bdc7803e66e0db777db09edea3bb6e85df8c9d6d";>bdc7803 fix: go 1.21 adding goroutine ID to creator+location (https://redirect.github.com/onsi/gomega/issues/685";>#685) See full diff in https://github.com/onsi/gomega/compare/v1.27.9...v1.27.10";>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/onsi/gomega&package-manager=go_modules&previous-version=1.27.9&new-version=1.27.10)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/github.com/onsi/gomega-1.27.10 created (now 343bfe193)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/onsi/gomega-1.27.10 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 343bfe193 chore(deps): bump github.com/onsi/gomega from 1.27.9 to 1.27.10 No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #4594: chore(deps): bump github.com/container-tools/spectrum from 0.6.29 to 0.6.30
dependabot[bot] opened a new pull request, #4594: URL: https://github.com/apache/camel-k/pull/4594 Bumps [github.com/container-tools/spectrum](https://github.com/container-tools/spectrum) from 0.6.29 to 0.6.30. Release notes Sourced from https://github.com/container-tools/spectrum/releases";>github.com/container-tools/spectrum's releases. v0.6.30 Changelog 8576943 chore(deps): bump github.com/onsi/gomega from 1.27.8 to 1.27.9 Docker images docker pull quay.io/container-tools/spectrum:v0.6.30 docker pull quay.io/container-tools/spectrum:v0.6 Commits https://github.com/container-tools/spectrum/commit/8576943609fa6d7589bfe2aa2a67d8e4017ebfa3";>8576943 chore(deps): bump github.com/onsi/gomega from 1.27.8 to 1.27.9 See full diff in https://github.com/container-tools/spectrum/compare/v0.6.29...v0.6.30";>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/container-tools/spectrum&package-manager=go_modules&previous-version=0.6.29&new-version=0.6.30)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.30 created (now 276e388c9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.30 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 276e388c9 chore(deps): bump github.com/container-tools/spectrum No new revisions were added by this update.
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #894: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4)
github-actions[bot] opened a new pull request, #894: URL: https://github.com/apache/camel-spring-boot/pull/894 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-k] branch release-1.12.x updated: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.12.x by this push: new 1d04b225b Periodic Sync of Camel K Main Branch for SBOM Generation 1d04b225b is described below commit 1d04b225bb6d1d35094bc5425be4f172145fcea8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jul 24 23:48:55 2023 + Periodic Sync of Camel K Main Branch for SBOM Generation --- camel-k-sbom/camel-k-sbom.json | 54 +- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index 519af2a5a..85be24032 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:80363c52-e645-417d-b807-2e624575fc75", + "serialNumber": "urn:uuid:dd79c430-4043-44f3-add6-98e6f8337eaa", "version": 1, "metadata": { -"timestamp": "2023-07-23T23:47:32Z", +"timestamp": "2023-07-24T23:48:55Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230722234805-8478b63eafa8?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230723234732-848062b8ce61?type=module", "type": "application", "name": "github.com/apache/camel-k", - "version": "v0.0.0-20230722234805-8478b63eafa8", - "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230722234805-8478b63eafa8?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230723234732-848062b8ce61", + "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230723234732-848062b8ce61?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k";, @@ -510,18 +510,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230722234805-8478b63eafa8?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230723234732-848062b8ce61?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/apis/camel", - "version": "v0.0.0-20230722234805-8478b63eafa8", + "version": "v0.0.0-20230723234732-848062b8ce61", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "ac72dce41ac73810d549b351dfb0cfe705a3b91ca30e1ee368899184041a2ec8" + "content": "497b802575668ce13471677cbefcd48d1662a34ca98ee5a6cb6ad19e06bb6ff6" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230722234805-8478b63eafa8?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230723234732-848062b8ce61?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/apis/camel";, @@ -530,18 +530,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230722234805-8478b63eafa8?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230723234732-848062b8ce61?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/client/camel", - "version": "v0.0.0-20230722234805-8478b63eafa8", + "version": "v0.0.0-20230723234732-848062b8ce61", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "611f330980e2924b8963cdddc68ed85daa20d8d24371c5478b943542de2cd889" + "content": "94441dc9680b9f705cf59da4a3d75aaf3ca8414047914b614a7aba1e72f288ff" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230722234805-8478b63eafa8?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230723234732-848062b8ce61?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/client/camel";, @@ -550,18 +550,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230722234805-8478b63eafa8?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230723234732-848062b8ce61?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/kamelet/repository", -
[camel-k] 02/03: chore: autogenerated project resource update
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 commit 24266b516884684a5a7752750d6189ff34a23cf8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jul 24 23:45:33 2023 + chore: autogenerated project resource update --- pkg/resources/resources.go | 2 +- script/Makefile| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 09f33b30a..2528befbd 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -179,7 +179,7 @@ var assets = func() http.FileSystem { modTime: time.Time{}, uncompressedSize: 2750, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\x18\x66\x4f\x2b\xe7\xe4\x0c\x4c\xd6\xca\xc6\x20\xcc\x66\xb4\xa7\xa8\x69\x17\x76\x8b\x76\xb7\xd3\xdd\x86\x25\xbf\x3e\x6a\x83\x19\x60\x3e\x92\x89\x46\x8a\x4f\xd8\x55\xf5\xea\xd5\x7b\xd5\x36\x21\x86\xef\x77\x05\x21\xbe\x0a\x4e\xca\x52\x01\xa7\xe1\x2a\x42\xd2\x30\x5e\x11\x72\xbd\x76\x3b\x66\x08\xf7\xba\x55\x05\x73\x42\x2b\x7c\x48\xf2\xfb\x8f\x68\x55\x41\x06\x5a\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\x98\x99\x3d\xad\x9c\x93\x33\x30\x19\x2b\x13\x83\x30\x9b\xd1\x9e\xa2\xa6\x5d\xd8\x2d\xda\xdd\x4e\x77\x1b\x96\xfc\xfa\xa8\x0d\x66\x80\xf9\x48\x26\x1a\x29\x3e\x61\x57\xd5\xab\x57\xef\x55\xdb\x84\x18\x7e\xdc\x15\x84\x78\x10\x9c\x94\xa5\x02\x4e\xc3\x55\x84\xa4\x61\xbc\x22\xe4\x7a\xe5\xb6\xcc\x10\xee\x74\xab\x0a\xe6\x84\x56\xf8\x94\xe4\x77\x9f\xd1\xaa\x82\x0c\xb4\x [...] }, "/manager/operator-service-account.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-service-account.yaml", diff --git a/script/Makefile b/script/Makefile index 43196152f..91aae3ac3 100644 --- a/script/Makefile +++ b/script/Makefile @@ -86,7 +86,7 @@ STAGING_RUNTIME_REPO := INSTALL_DEFAULT_KAMELETS ?= true KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git # Make sure to use a released tag or empty if you want to get the latest development bits -KAMELET_CATALOG_REPO_TAG := main +KAMELET_CATALOG_REPO_TAG := v3.20.1.1 # When performing integration tests, it is not necessary to always execute build, especially # in e2e tests when lots of tests are being executed sequentially & the build has already taken place.
[camel-k] branch main updated (0fef3447b -> 347e9d01d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 0fef3447b chore: bump next version to 2.0.1-SNAPSHOT new 3c141ad23 chore: changelog automatic update new 24266b516 chore: autogenerated project resource update new 347e9d01d chore: nightly SBOM update 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: CHANGELOG.md | 2 + camel-k-sbom/camel-k-sbom.json | 120 - pkg/resources/resources.go | 2 +- script/Makefile| 2 +- 4 files changed, 64 insertions(+), 62 deletions(-)
[camel-k] 01/03: chore: changelog automatic update
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 commit 3c141ad236e3dd3cd8b8ec56939cb27c9c2fbcb8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jul 24 23:41:59 2023 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eabb8a5ad..504aa595d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ **Merged pull requests:** +- feat\(ci\): Helm release 2.0.0 [\#4592](https://github.com/apache/camel-k/pull/4592) ([squakez](https://github.com/squakez)) +- chore\(deps\): bump github.com/onsi/gomega from 1.27.8 to 1.27.9 [\#4591](https://github.com/apache/camel-k/pull/4591) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump go.uber.org/automaxprocs from 1.5.2 to 1.5.3 [\#4588](https://github.com/apache/camel-k/pull/4588) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore: Refactor operator logs [\#4586](https://github.com/apache/camel-k/pull/4586) ([christophd](https://github.com/christophd)) - Fix misc tests on global operator [\#4585](https://github.com/apache/camel-k/pull/4585) ([bouskaJ](https://github.com/bouskaJ))
[camel-k] 03/03: chore: nightly SBOM update
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 commit 347e9d01dc1da7f23c23251ca78de429ffd1b5bd Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jul 24 23:45:54 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 120 - 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index 73b8e4ee5..bc6bc67a7 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:8ea7c398-11f2-4147-84d6-9d82ece8b7b2", + "serialNumber": "urn:uuid:8ce1c37a-9053-45f6-a328-5591367dd07b", "version": 1, "metadata": { -"timestamp": "2023-07-23T23:46:03Z", +"timestamp": "2023-07-24T23:45:54Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230722234507-11b21f62585e?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230724234533-24266b516884?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20230722234507-11b21f62585e", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230722234507-11b21f62585e?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230724234533-24266b516884", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230724234533-24266b516884?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k";, @@ -423,18 +423,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230722234507-11b21f62585e?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230724234533-24266b516884?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/apis/camel", - "version": "v0.0.0-20230722234507-11b21f62585e", + "version": "v0.0.0-20230724234533-24266b516884", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "24b09c5c78ad8f70c38738f9b6750a499cbb19cf09c52b190fc0aac6c1593a90" + "content": "c0de8d8e9b476572ae954b41b6756e906d885e15ee8ca50d9ee1e747c730f422" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230722234507-11b21f62585e?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230724234533-24266b516884?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/apis/camel";, @@ -443,18 +443,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230722234507-11b21f62585e?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230724234533-24266b516884?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/client/camel", - "version": "v0.0.0-20230722234507-11b21f62585e", + "version": "v0.0.0-20230724234533-24266b516884", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "de26879bf81a462c0b76115d621954afc0851217e3a3feaa96b65b581189b023" + "content": "82ca35d294b19e028a950a4a0005b84c1d9b08ffccd32a896256d8062d2f9972" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230722234507-11b21f62585e?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230724234533-24266b516884?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/client/camel";, @@ -463,18 +463,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230722234507-11b21f62585e?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230724234533-24266b516884?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/kamelet/repository", - "version": "v0.0.0-20230722234507-11b21f62585e", + "version": "v0.0.0-20230724234533-24266b516884", "scope": "required", "hashes": [ {
[camel-karavan] 02/02: Fix #829
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit f9c1ab4ee4644b97aef07dd55471961771a7f5e8 Author: Marat Gubaidullin AuthorDate: Mon Jul 24 15:57:34 2023 -0400 Fix #829 --- karavan-web/docker/Dockerfile.builder | 2 +- karavan-web/docker/Dockerfile.runner | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/karavan-web/docker/Dockerfile.builder b/karavan-web/docker/Dockerfile.builder index 75c605d7..036feee1 100644 --- a/karavan-web/docker/Dockerfile.builder +++ b/karavan-web/docker/Dockerfile.builder @@ -1,4 +1,4 @@ -FROM jbangdev/jbang-action:0.106.1 +FROM jbangdev/jbang-action:0.110.0 ENV CAMEL_VERSION=3.21.0 ENV MAVEN_SETTINGS="/karavan-config-map/maven-settings.xml" diff --git a/karavan-web/docker/Dockerfile.runner b/karavan-web/docker/Dockerfile.runner index fcea9abd..86462bea 100644 --- a/karavan-web/docker/Dockerfile.runner +++ b/karavan-web/docker/Dockerfile.runner @@ -1,4 +1,4 @@ -FROM jbangdev/jbang-action:0.106.1 +FROM jbangdev/jbang-action:0.110.0 ENV CAMEL_VERSION=3.21.0 ENV KARAVAN="/karavan"
[camel-karavan] branch main updated (067904ff -> f9c1ab4e)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from 067904ff Dashboard supports containers in Docker #817 new 0050ccf7 List of Docker containers #817 new f9c1ab4e Fix #829 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: karavan-web/docker/Dockerfile.builder | 2 +- karavan-web/docker/Dockerfile.runner | 2 +- .../camel/karavan/docker/DockerEventListener.java | 3 +- .../apache/camel/karavan/docker/DockerService.java | 8 +- .../karavan-app/src/main/webui/src/Main.tsx| 2 + .../src/main/webui/src/api/ProjectModels.ts| 1 + .../ContainerTableRow.tsx} | 54 +++ .../main/webui/src/containers/ContainersPage.tsx | 160 + .../src/main/webui/src/dashboard/DashboardPage.tsx | 15 +- .../main/webui/src/projects/ProjectsTableRow.tsx | 17 ++- .../src/main/webui/src/services/ServicesPage.tsx | 2 +- .../karavan/infinispan/model/ContainerStatus.java | 4 +- 12 files changed, 217 insertions(+), 53 deletions(-) copy karavan-web/karavan-app/src/main/webui/src/{services/ServicesTableRow.tsx => containers/ContainerTableRow.tsx} (62%) create mode 100644 karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
[camel-karavan] 01/02: List of Docker containers #817
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 0050ccf796aa087fc6912947f2b896415052d2fa Author: Marat Gubaidullin AuthorDate: Sun Jul 23 18:35:59 2023 -0400 List of Docker containers #817 --- .../camel/karavan/docker/DockerEventListener.java | 3 +- .../apache/camel/karavan/docker/DockerService.java | 8 +- .../karavan-app/src/main/webui/src/Main.tsx| 2 + .../src/main/webui/src/api/ProjectModels.ts| 1 + .../webui/src/containers/ContainerTableRow.tsx | 94 .../main/webui/src/containers/ContainersPage.tsx | 160 + .../src/main/webui/src/dashboard/DashboardPage.tsx | 15 +- .../main/webui/src/projects/ProjectsTableRow.tsx | 17 ++- .../src/main/webui/src/services/ServicesPage.tsx | 2 +- .../karavan/infinispan/model/ContainerStatus.java | 4 +- 10 files changed, 282 insertions(+), 24 deletions(-) diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java index 8d4c9cc3..b055716d 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java @@ -96,13 +96,14 @@ public class DockerEventListener implements ResultCallback { String created = Instant.ofEpochSecond(container.getCreated()).toString(); ContainerStatus ci = infinispanService.getContainerStatus(name, environment, name); if (ci == null) { -ci = ContainerStatus.createWithId(name, environment, container.getId(), ports, type, lc, created); +ci = ContainerStatus.createWithId(name, environment, container.getId(), container.getImage(), ports, type, lc, created); } else { ci.setContainerId(container.getId()); ci.setPorts(ports); ci.setType(type); ci.setLifeCycle(lc); ci.setCreated(created); +ci.setImage(container.getImage()); } infinispanService.saveContainerStatus(ci); } diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java index 9f1f4198..27d5a6b3 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java @@ -145,13 +145,7 @@ public class DockerService { public void collectContainersStatuses() { getDockerClient().listContainersCmd().exec().forEach(container -> { -String name = container.getNames()[0].replace("/", ""); -if (!Objects.equals(name, INFINISPAN_CONTAINER_NAME)) { -dockerEventListener.onCreateContainer(container, new Event(container.getStatus(), container.getId(), container.getImage(), container.getCreated())); -} -if (Objects.equals(container.getLabels().get(LABEL_TYPE), ContainerStatus.CType.devmode.name())) { -dockerEventListener.onCreateContainer(container, new Event(container.getStatus(), container.getId(), container.getImage(), container.getCreated())); -} +dockerEventListener.onCreateContainer(container, new Event(container.getStatus(), container.getId(), container.getImage(), container.getCreated())); }); } diff --git a/karavan-web/karavan-app/src/main/webui/src/Main.tsx b/karavan-web/karavan-app/src/main/webui/src/Main.tsx index 9e36ffa3..8adfe79d 100644 --- a/karavan-web/karavan-app/src/main/webui/src/Main.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/Main.tsx @@ -24,6 +24,7 @@ import ServicesIcon from "@patternfly/react-icons/dist/js/icons/services-icon"; import ComponentsIcon from "@patternfly/react-icons/dist/js/icons/module-icon"; import {MainLogin} from "./MainLogin"; import {DashboardPage} from "./dashboard/DashboardPage"; +import {ContainersPage} from "./containers/ContainersPage"; import {ProjectEventBus} from "./api/ProjectEventBus"; import {AppConfig, ContainerStatus, Project, ToastMessage} from "./api/ProjectModels"; import {ProjectPage} from "./project/ProjectPage"; @@ -216,6 +217,7 @@ export const Main = () => { {pageId === 'projects' && } {pageId === 'project' && } {pageId === 'services' && } +{pageId === 'containers' && } {pageId === 'knowledgebase' && } diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectModels.ts b/karavan-web/karavan-app/src/m
[camel] annotated tag camel-4.0.0-RC2 created (now f6151c7b7b7)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-4.0.0-RC2 in repository https://gitbox.apache.org/repos/asf/camel.git at f6151c7b7b7 (tag) tagging 9d705c7393408b658f81555c3033a7fec0835b7b (commit) replaces camel-4.0.0-RC1 by Gregor Zurowski on Mon Jul 24 19:40:34 2023 + - Log - [maven-release-plugin] copy for tag camel-4.0.0-RC2 --- No new revisions were added by this update.
[GitHub] [camel] github-actions[bot] commented on pull request #10813: CAMEL-17986: camel-pulsar - Add option to configure key shared policy…
github-actions[bot] commented on PR #10813: URL: https://github.com/apache/camel/pull/10813#issuecomment-1648470402 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 opened a new pull request, #10813: CAMEL-17986: camel-pulsar - Add option to configure key shared policy…
davsclaus opened a new pull request, #10813: URL: https://github.com/apache/camel/pull/10813 … mode to use. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch ksp in repository https://gitbox.apache.org/repos/asf/camel.git commit b6123b5161e3f3c28bd629e7263b537886c214de Author: Claus Ibsen AuthorDate: Mon Jul 24 21:12:37 2023 +0200 CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. --- .../apache/camel/catalog/components/pulsar.json| 124 +++-- .../pulsar/PulsarComponentConfigurer.java | 6 + .../component/pulsar/PulsarEndpointConfigurer.java | 6 + .../component/pulsar/PulsarEndpointUriFactory.java | 3 +- .../org/apache/camel/component/pulsar/pulsar.json | 124 +++-- .../component/pulsar/PulsarConfiguration.java | 11 ++ .../consumers/CommonCreationStrategyImpl.java | 10 ++ .../dsl/PulsarComponentBuilderFactory.java | 16 +++ .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 15 +++ 9 files changed, 192 insertions(+), 123 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json index 75375ef32d1..4386c84a648 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json @@ -35,37 +35,38 @@ "consumerNamePrefix": { "index": 10, "kind": "property", "displayName": "Consumer Name Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "cons", "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Prefix to add to consumer names when a SHARED or FAILOVER subscri [...] "consumerQueueSize": { "index": 11, "kind": "property", "displayName": "Consumer Queue Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Size of the consumer queue - defaults to 10" }, "deadLetterTopic": { "index": 12, "kind": "property", "displayName": "Dead Letter Topic", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Name of the topic where the messages which fail maxRedeliverCount times will be sent. Note: if [...] -"maxRedeliverCount": { "index": 13, "kind": "property", "displayName": "Max Redeliver Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Maximum number of times that a message will be redelivered before being sent to the dead [...] -"messageListener": { "index": 14, "kind": "property", "displayName": "Message Listener", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Whether to use the messageListener interface, or to receive messages using a separ [...] -"negativeAckRedeliveryBackoff": { "index": 15, "kind": "property", "displayName": "Negative Ack Redelivery Backoff", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.pulsar.client.api.RedeliveryBackoff", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "RedeliveryBackoff to use for negative [...] -"negativeAckRedeliveryDelayMicros": { "index": 16, "kind": "property", "displayName": "Negative Ack Redelivery Delay Micros", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 6000, "configurationClass": "org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField": "configuration", "description": "Set the negative acknowledgement delay" }, -"numberOfConsumers":
[camel] branch ksp created (now b6123b5161e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch ksp in repository https://gitbox.apache.org/repos/asf/camel.git at b6123b5161e CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. This branch includes the following new commits: new b6123b5161e CAMEL-17986: camel-pulsar - Add option to configure key shared policy mode to use. 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.
[camel] 01/02: Also need atlassian repo due camel-jira is via camel-allcomponents
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/4.0.0-RC2 in repository https://gitbox.apache.org/repos/asf/camel.git commit b81104775c6605b22c58a2dceb0658d57e7167e0 Author: Claus Ibsen AuthorDate: Mon Jul 24 14:12:17 2023 +0200 Also need atlassian repo due camel-jira is via camel-allcomponents --- apache-camel/pom.xml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index aef50b6108d..ab7334c0fd5 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -41,6 +41,20 @@ gnu + + +atlassian +https://packages.atlassian.com/maven-external/ +atlassian external repo + +false + + +true + + + +
[camel] 02/02: Assembly (#10805)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/4.0.0-RC2 in repository https://gitbox.apache.org/repos/asf/camel.git commit 2df511f58212cb53ebd953504b92b767922b9d03 Author: Claus Ibsen AuthorDate: Mon Jul 24 14:47:14 2023 +0200 Assembly (#10805) * Also need atlassian repo due camel-jira is via camel-allcomponents * CAMEL-19643: apache-camel - RC2 should include source tarball --- apache-camel/pom.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index ab7334c0fd5..e2bf8a78cd5 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -208,12 +208,7 @@ -full - - -!quickly - - +release
[camel] branch release/4.0.0-RC2 updated (2dc178385af -> 2df511f5821)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/4.0.0-RC2 in repository https://gitbox.apache.org/repos/asf/camel.git omit 2dc178385af Do not do license check and JPA instrumentation during release build new b81104775c6 Also need atlassian repo due camel-jira is via camel-allcomponents new 2df511f5821 Assembly (#10805) 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 (2dc178385af) \ N -- N -- N refs/heads/release/4.0.0-RC2 (2df511f5821) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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/pom.xml | 21 +++-- pom.xml | 3 ++- 2 files changed, 17 insertions(+), 7 deletions(-)
[GitHub] [camel] davsclaus opened a new pull request, #10812: CAMEL-17840: camel-pulsar - Add support for retry-letter-topic mode.
davsclaus opened a new pull request, #10812: URL: https://github.com/apache/camel/pull/10812 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch rlt created (now 1191b0f0032)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rlt in repository https://gitbox.apache.org/repos/asf/camel.git at 1191b0f0032 CAMEL-17840: camel-pulsar - Add support for retry-letter-topic mode. This branch includes the following new commits: new 1191b0f0032 CAMEL-17840: camel-pulsar - Add support for retry-letter-topic mode. 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] github-actions[bot] commented on pull request #10812: CAMEL-17840: camel-pulsar - Add support for retry-letter-topic mode.
github-actions[bot] commented on PR #10812: URL: https://github.com/apache/camel/pull/10812#issuecomment-1648450112 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 #10811: CAMEL-16837: aws2-ddbstream consumer should have batch metadata on ea…
github-actions[bot] commented on PR #10811: URL: https://github.com/apache/camel/pull/10811#issuecomment-1648393114 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 batch created (now 8a5db34e166)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch batch in repository https://gitbox.apache.org/repos/asf/camel.git at 8a5db34e166 CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. This branch includes the following new commits: new 8a5db34e166 CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. 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.
[camel] 01/01: CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch batch in repository https://gitbox.apache.org/repos/asf/camel.git commit 8a5db34e166c4f337f11f52b6a3420f8518bd460 Author: Claus Ibsen AuthorDate: Mon Jul 24 20:25:30 2023 +0200 CAMEL-16837: aws2-ddbstream consumer should have batch metadata on each exchange processed. --- .../aws2/ddbstream/Ddb2StreamConsumer.java | 28 -- .../aws2/ddbstream/Ddb2StreamEndpoint.java | 1 - 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java index 7cc4714b580..d6b0b1b8da1 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumer.java @@ -25,12 +25,12 @@ import java.util.Queue; import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; +import org.apache.camel.ExchangePropertyKey; import org.apache.camel.Processor; import org.apache.camel.health.HealthCheckHelper; import org.apache.camel.health.WritableHealthCheckRepository; import org.apache.camel.support.ScheduledBatchPollingConsumer; import org.apache.camel.util.CastUtils; -import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.services.dynamodb.model.ExpiredIteratorException; @@ -99,16 +99,29 @@ public class Ddb2StreamConsumer extends ScheduledBatchPollingConsumer { @Override public int processBatch(Queue exchanges) throws Exception { -int processedExchanges = 0; -while (!exchanges.isEmpty()) { -final Exchange exchange = ObjectHelper.cast(Exchange.class, exchanges.poll()); +int total = exchanges.size(); +int answer = 0; + +for (int index = 0; index < total && isBatchAllowed(); index++) { +// only loop if we are started (allowed to run) +// use poll to remove the head so it does not consume memory even +// after we have processed it +Exchange exchange = (Exchange) exchanges.poll(); +// add current index and total as properties +exchange.setProperty(ExchangePropertyKey.BATCH_INDEX, index); +exchange.setProperty(ExchangePropertyKey.BATCH_SIZE, total); +exchange.setProperty(ExchangePropertyKey.BATCH_COMPLETE, index == total - 1); + +// update pending number of exchanges +pendingExchanges = total - index - 1; // use default consumer callback AsyncCallback cb = defaultConsumerCallback(exchange, true); getAsyncProcessor().process(exchange, cb); -processedExchanges++; +answer++; } -return processedExchanges; + +return answer; } @Override @@ -122,7 +135,8 @@ public class Ddb2StreamConsumer extends ScheduledBatchPollingConsumer { if (healthCheckRepository != null) { consumerHealthCheck = new Ddb2StreamConsumerHealthCheck(this, getRouteId()); - consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled() && getEndpoint().getComponent().isHealthCheckConsumerEnabled()); + consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled() +&& getEndpoint().getComponent().isHealthCheckConsumerEnabled()); healthCheckRepository.addHealthCheck(consumerHealthCheck); } } diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java index 261ab43c344..715234651ed 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.ddbstream; import java.net.URI; import org.apache.camel.Category; -import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer;
[GitHub] [camel] davsclaus opened a new pull request, #10811: CAMEL-16837: aws2-ddbstream consumer should have batch metadata on ea…
davsclaus opened a new pull request, #10811: URL: https://github.com/apache/camel/pull/10811 …ch exchange processed. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10810: CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext
github-actions[bot] commented on PR #10810: URL: https://github.com/apache/camel/pull/10810#issuecomment-1648373835 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 opened a new pull request, #10810: CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext
davsclaus opened a new pull request, #10810: URL: https://github.com/apache/camel/pull/10810 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch hcc in repository https://gitbox.apache.org/repos/asf/camel.git commit b38050123ca89c4f04eab90d21131eea3873b1e6 Author: Claus Ibsen AuthorDate: Mon Jul 24 20:10:40 2023 +0200 CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext --- .../src/main/java/org/apache/camel/CamelContextAware.java | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java b/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java index f5865f82f8b..e94ab034425 100644 --- a/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java +++ b/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java @@ -16,10 +16,12 @@ */ package org.apache.camel; +import org.apache.camel.spi.HasCamelContext; + /** * An interface to represent an object which wishes to be injected with the {@link CamelContext} */ -public interface CamelContextAware { +public interface CamelContextAware extends HasCamelContext { /** * Set the {@link CamelContext} context if the object is an instance of {@link CamelContextAware}. @@ -32,13 +34,6 @@ public interface CamelContextAware { return object; } -/** - * Get the {@link CamelContext} - * - * @return the Camel context - */ -CamelContext getCamelContext(); - /** * Injects the {@link CamelContext} *
[camel] branch hcc created (now b38050123ca)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hcc in repository https://gitbox.apache.org/repos/asf/camel.git at b38050123ca CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext This branch includes the following new commits: new b38050123ca CAMEL-16592: camel-api - CamelContextAware should extend HasCamelContext 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] github-actions[bot] commented on pull request #10809: CAMEL-15968: camel-braintree - Add more gateway APIs from never versi…
github-actions[bot] commented on PR #10809: URL: https://github.com/apache/camel/pull/10809#issuecomment-1648360163 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 opened a new pull request, #10809: CAMEL-15968: camel-braintree - Add more gateway APIs from never versi…
davsclaus opened a new pull request, #10809: URL: https://github.com/apache/camel/pull/10809 …on of braintree # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch brain in repository https://gitbox.apache.org/repos/asf/camel.git commit 3ab478a6bcec3a920226841f7ec7c902d7d5f92c Author: Claus Ibsen AuthorDate: Mon Jul 24 19:59:51 2023 +0200 CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree --- .../apache/camel/catalog/components/braintree.json | 6 +- components/camel-braintree/pom.xml | 27 .../braintree/BraintreeEndpointUriFactory.java | 4 +- .../OAuthGatewayEndpointConfiguration.java | 55 +++ ...AuthGatewayEndpointConfigurationConfigurer.java | 159 + .../UsBankAccountGatewayEndpointConfiguration.java | 44 ++ ...ountGatewayEndpointConfigurationConfigurer.java | 159 + .../braintree/internal/BraintreeApiCollection.java | 18 +++ .../braintree/internal/BraintreeApiName.java | 4 + .../braintree/internal/OAuthGatewayApiMethod.java | 62 .../internal/UsBankAccountGatewayApiMethod.java| 53 +++ ...ent.braintree.OAuthGatewayEndpointConfiguration | 2 + ...ntree.UsBankAccountGatewayEndpointConfiguration | 2 + .../camel/component/braintree/braintree.json | 6 +- .../builder/endpoint/StaticEndpointBuilders.java | 12 +- .../dsl/BraintreeEndpointBuilderFactory.java | 12 +- 16 files changed, 610 insertions(+), 15 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json index 14bb99f01bf..5b533d22798 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json @@ -28,7 +28,7 @@ "configuration": { "index": 2, "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.braintree.BraintreeConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration" } }, "properties": { -"apiName": { "index": 0, "kind": "path", "displayName": "Api Name", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.braintree.internal.BraintreeApiName", "enum": [ "ADD_ON", "ADDRESS", "CLIENT_TOKEN", "CREDIT_CARD_VERIFICATION", "CUSTOMER", "DISCOUNT", "DISPUTE", "DOCUMENT_UPLOAD", "MERCHANT_ACCOUNT", "PAYMENT_METHOD", "PAYMENT_METHOD_NONCE", "PLAN", "REPORT", "SETTLEMENT_BATCH_SUMMARY", "SUBSCRIPTION", "TRANSACTION", "WEB [...] +"apiName": { "index": 0, "kind": "path", "displayName": "Api Name", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.braintree.internal.BraintreeApiName", "enum": [ "ADD_ON", "ADDRESS", "CLIENT_TOKEN", "CREDIT_CARD_VERIFICATION", "CUSTOMER", "DISCOUNT", "DISPUTE", "DOCUMENT_UPLOAD", "MERCHANT_ACCOUNT", "PAYMENT_METHOD", "PAYMENT_METHOD_NONCE", "OAUTH", "PLAN", "REPORT", "SETTLEMENT_BATCH_SUMMARY", "SUBSCRIPTION", "TRANSACTI [...] "methodName": { "index": 1, "kind": "path", "displayName": "Method Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "accept", "addFileEvidence", "addTextEvidence", "cancel", "cancelRelease", "cloneTransaction", "create", "createForCurrency", "credit", "delete", "fetchMerchantAccounts", "finalize", "find", "generate", "grant", "holdInEscrow", "parse", "refund", "releaseFromEscrow", "removeEvidence", "retryCharge", " [...] "environment": { "index": 2, "kind": "parameter", "displayName": "Environment", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The environment Either SANDBOX or PRODUCTION" }, "inBody": { "index": 3, "kind": "parameter", "displayName": "In Body", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the name of a parameter to be passed in the exchange In Body" }, @@ -52,6 +52,7 @@ "dispute": { "consumerOnly": false, "producerOnly": true, "description": "Provides methods to interact with Dispute objects", "methods": { "accept": { "description": "Accept a Dispute, given a dispute ID", "signatures": [ "com.braintreegateway.Result accept(String id)" ] }, "addFileEvidence": { "description": "Add File Evidence to a Dispute, given an ID and a FileEv
[camel] branch brain created (now 3ab478a6bce)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch brain in repository https://gitbox.apache.org/repos/asf/camel.git at 3ab478a6bce CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree This branch includes the following new commits: new 3ab478a6bce CAMEL-15968: camel-braintree - Add more gateway APIs from never version of braintree 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.
[camel] branch regen_bot updated (3476d2cd28c -> e81ba41bb4a)
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 3476d2cd28c CAMEL-13070: camel-ftp - Add option to configure fileName encoding for sftp. (#10807) add e81ba41bb4a Polished No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java | 2 -- 1 file changed, 2 deletions(-)
[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 e81ba41bb4a Polished e81ba41bb4a is described below commit e81ba41bb4a24f9f6bcdfa744b00b033191bd8dd Author: Claus Ibsen AuthorDate: Mon Jul 24 19:44:34 2023 +0200 Polished --- .../src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java index e830d9d05b2..acc564175a8 100644 --- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java +++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/Standard14Fonts.java @@ -24,8 +24,6 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font; /** * The 14 standard fonts by name. Created here because there is no way to get a standard font by name in {@code pdfbox} * 2.0 - * - * @author https://github.com/ppalaga";>Peter Palaga */ public final class Standard14Fonts { private static final Map FONTS_BY_NAME = new HashMap<>();
[camel] branch release/4.0.0-RC2 updated (d9277c11a70 -> 2dc178385af)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/4.0.0-RC2 in repository https://gitbox.apache.org/repos/asf/camel.git discard d9277c11a70 [maven-release-plugin] prepare for next development iteration discard 084237074ef [maven-release-plugin] prepare release camel-4.0.0-RC2 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/release/4.0.0-RC2 (2dc178385af) \ O -- O -- O (d9277c11a70) 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 | 3 ++- .../camel-debezium-common/camel-debezium-maven-plugin/pom.xml | 2 +- components/camel-robotframework/pom.xml | 4 +++- parent/pom.xml | 6 +++--- pom.xml | 2 +- tooling/maven/camel-component-maven-plugin/pom.xml | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-)
[camel] annotated tag camel-4.0.0-RC2 deleted (was 844d4517c8b)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-4.0.0-RC2 in repository https://gitbox.apache.org/repos/asf/camel.git *** WARNING: tag camel-4.0.0-RC2 was deleted! *** tag was 844d4517c8b The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.