This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch fix/CAMEL-25550
in repository https://gitbox.apache.org/repos/asf/camel.git
omit f0535750b32f CAMEL-25550: Address review feedback
omit 8e50028cf0ca CAMEL-25550: camel-jpa, camel-hazelcast - a transacted
consumer must not commit an exchange marked rollback only
add ab5932958d36 CAMEL-25551: camel-azure-storage-blob,
camel-huaweicloud-obs, camel-alibaba-oss, camel-aws2-s3-vectors - do not
consume an object again while its exchange is in flight (#27682)
add dfcc00d01fff CAMEL-25553: vault properties functions - make the shared
state thread safe (#27680)
add 06f69193642a CAMEL-25527: camel-mybatis, camel-sql - do not run
onConsume for a failed or rollback only exchange (#27677)
add 4e022b88e4c8 CAMEL-25525: camel-keycloak - Do not route the latest
events of a poll a second time (#27676)
add c78c70da9652 CAMEL-25523: camel-slack - Read the following pages of
the history so the consumer does not skip messages (#27674)
add 940e7ecf558f CAMEL-25519: camel-google-storage - Do not consume an
object again while its exchange is in flight (#27670)
add fa153a8c9511 CAMEL-25518: camel-hashicorp-vault - Secret refresh
detects updates in any engine and before the first check (#27669)
add 5904e8ca2b96 CAMEL-25524: camel-mina-sftp - Write a file in the
charset of the endpoint and apply allowNullBody (#27675)
add 91e523dafe45 CAMEL-25521: camel-aws2-s3 - Keep the in-progress
repository of the consumer accurate with fileName and on stop (#27672)
add daf9c53c9130 CAMEL-25522: camel-ibm-cos - Keep the in-progress
repository of the consumer accurate with fileName and on stop (#27673)
add 2540e4f928cc CAMEL-25520: camel-google-mail - Do not consume a message
again while its exchange is in flight (#27671)
add 0df36802514c CAMEL-25494: camel-yaml-io - write the onException,
onCompletion and interceptors of a route configuration as the YAML DSL loads
them (#27629)
add 38474ed95545 CAMEL-25533: camel-jbang - apply camel.server.* settings
to the HTTP server started for platform-http (#27667)
add 197e70656a41 CAMEL-25490: camel-yaml-io - dump a top-level onException
as top-level, not as a step of every route (#27609)
add 047f560d04cf CAMEL-25556: camel-jbang-mcp - a write the same as the
last refused one says so, and the hint for an option at the column of its EIP
shows the lines to write (#27684)
add 3a6cdba883a5 CAMEL-25557: camel-jbang - sql: an insert-or-update in
the dialect of another database than the datasource, and :#excluded.column as a
named parameter (#27685)
add 3edd6fd63e64 Update known releases
add 5875453cd4ac Generated sources regen for SBOM (main) (#27687)
add 55b7ba5cae82 CAMEL-25450 - improve stability of flaky IgniteComputeTest
add 506c6a6ac90b CAMEL-25561: camel-jbang-mcp - after a failed restart,
camel_run starts the integration again under the name it had (#27700)
add 5987a263107b CAMEL-25560: camel-yaml-dsl-validator - a key given twice
in one mapping is reported, as YAML keeps only the last one (#27699)
add 591547c391c2 chore(camel-test-infra-openfga): upgrade
openfga.container to v1.22.0
add feadc46e9285 chore(camel-test-infra-kafka): upgrade
redpanda.container.image to v26.2.4
add df85d15a3dcb CAMEL-25375: Upgrade guide - move the 4.18 notes of the
fixes that ship in 4.18.6 (#27713)
add 2a0a2b54f4ba chore(camel-test-infra-aws-v2): upgrade aws.container to
2.2.0
add 55abd88d38f3 chore(camel-test-infra-qdrant): upgrade qdrant.container
to v1.19.2-unprivileged
add 4650a955239c chore(camel-test-infra-nats): upgrade nats.container to
2.15.0
add 9f5c15393de2 chore(camel-test-infra-jaeger): upgrade jaeger.container
to 2.22.0
add a0386d3f3d34 chore(camel-test-infra-hashicorp-vault): upgrade
hashicorp.vault.container to 2.1.2
add eb9b6fb6f12f chore(camel-test-infra-rabbitmq): upgrade
rabbitmq.container to 4.3.6-management
add c3829069cb72 chore(camel-test-infra-pulsar): upgrade pulsar.container
to 5.0.0
add 641dae5e058d CAMEL-25552: camel-hashicorp-vault - the properties
function no longer shares the secret engine between lookups (#27679)
add a600169eff2b CAMEL-25348: improve failure message on ACK timeout using
AssertJ untilAsserted
add 44955b4920f1 CAMEL-25348: fix race condition in ACK sending by
counting all completed messages
add e349d66d086a CAMEL-25348: add test ensuring ACK is sent only after all
window messages complete
add cb1b8e4ea254 chore: camel-jbang - the Catalog view reads the Kamelets
of the route files as routes, so Java routes are read with the Java DSL parser
add 35f2aa3bf7f8 CAMEL-25180: camel-jbang - camel overview and camel
validate share one set of route/endpoint rules (#27717)
add 1e6c5073c546 CAMEL-25550: camel-jpa, camel-hazelcast - a transacted
consumer must not commit an exchange marked rollback only
add c931c5d92be5 CAMEL-25550: Address review feedback
add 53b4dd164fee CAMEL-25550: the docs say an entity is consumed again
only while it matches the query, and what a message always rolled back does now
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 (f0535750b32f)
\
N -- N -- N refs/heads/fix/CAMEL-25550 (53b4dd164fee)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
camel-sbom/camel-sbom.json | 14923 ++++++++++---------
camel-sbom/camel-sbom.xml | 12641 ++++++++--------
.../org/apache/camel/catalog/components/slack.json | 2 +-
.../catalog/docs/azure-storage-blob-consumer.adoc | 2 +
.../catalog/docs/hashicorp-vault-component.adoc | 13 +-
.../docs/ibm-secrets-manager-component.adoc | 1 +
.../apache/camel/catalog/docs/jpa-component.adoc | 6 +-
.../camel/catalog/docs/keycloak-consumer.adoc | 3 +-
.../camel/catalog/docs/mybatis-component.adoc | 5 +
.../apache/camel/catalog/docs/slack-component.adoc | 6 +
.../camel/catalog/releases/camel-releases.json | 7 +
.../apache/camel/catalog/test-infra/metadata.json | 48 +-
.../camel/component/alibaba/oss/OSSConsumer.java | 73 +-
.../alibaba/oss/OSSConsumerInProgressTest.java | 280 +
.../ParameterStorePropertiesFunction.java | 8 +-
.../SecretsManagerPropertiesFunction.java | 8 +-
.../aws2/s3vectors/AWS2S3VectorsConsumer.java | 43 +-
.../AWS2S3VectorsConsumerInProgressTest.java | 163 +
.../camel/component/aws2/s3/AWS2S3Consumer.java | 71 +-
.../aws2/s3/AWS2S3ConsumerInProgressTest.java | 313 +
.../camel/component/aws2/s3/FakeS3Server.java | 194 +
.../key/vault/KeyVaultPropertiesFunction.java | 8 +-
.../src/main/docs/azure-storage-blob-consumer.adoc | 2 +
.../component/azure/storage/blob/BlobConsumer.java | 82 +-
.../storage/blob/BlobConsumerInProgressTest.java | 277 +
.../vault/CyberArkVaultPropertiesFunction.java | 8 +-
.../mail/stream/GoogleMailStreamConsumer.java | 61 +-
.../google/mail/stream/FakeGmailClientFactory.java | 187 +
.../GoogleMailStreamConsumerInProgressTest.java | 226 +
.../GoogleSecretManagerPropertiesFunction.java | 8 +-
.../google/storage/GoogleCloudStorageConsumer.java | 92 +-
...oogleCloudStorageConsumerDeletedObjectTest.java | 117 +
...eCloudStorageConsumerInProgressFailureTest.java | 79 +
.../GoogleCloudStorageConsumerInProgressTest.java | 153 +
...oogleCloudStorageConsumerListingWindowTest.java | 214 +
.../src/main/docs/hashicorp-vault-component.adoc | 13 +-
.../vault/HashicorpVaultPropertiesFunction.java | 99 +-
.../vault/HashicorpVaultReloadTriggerTask.java | 8 +
.../HashicorpVaultPropertiesFunctionTest.java | 184 +
.../vault/HashicorpVaultReloadTriggerTaskTest.java | 232 +
.../component/huaweicloud/obs/OBSConsumer.java | 92 +-
.../huaweicloud/obs/OBSConsumerInProgressTest.java | 300 +
.../camel/component/ibm/cos/IBMCOSConsumer.java | 37 +-
.../camel/component/ibm/cos/FakeS3Server.java | 206 +
.../ibm/cos/IBMCOSConsumerInProgressTest.java | 244 +
.../main/docs/ibm-secrets-manager-component.adoc | 1 +
.../IBMSecretsManagerPropertiesFunction.java | 21 +-
.../IBMSecretsManagerPropertiesFunctionTest.java | 137 +
components/camel-ignite/pom.xml | 7 +
.../camel/component/ignite/IgniteComputeTest.java | 13 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 6 +-
.../src/main/docs/keycloak-consumer.adoc | 3 +-
.../camel/component/keycloak/KeycloakConsumer.java | 16 +-
.../keycloak/KeycloakConsumerLatestEventsTest.java | 159 +
components/camel-lumberjack/pom.xml | 5 +
.../lumberjack/io/LumberjackMessageHandler.java | 42 +-
.../lumberjack/LumberjackOutOfOrderAckTest.java | 146 +
.../camel/component/lumberjack/LumberjackUtil.java | 15 +-
.../file/remote/mina/MinaSftpOperations.java | 23 +-
.../mina/sftp/SftpProducerAllowNullBodyIT.java | 63 +
.../mina/sftp/SftpProducerWithCharsetIT.java | 42 +
.../src/main/docs/mybatis-component.adoc | 5 +
.../camel/component/mybatis/MyBatisConsumer.java | 10 +-
.../MyBatisOnConsumeFailedPooledExchangeTest.java} | 28 +-
.../mybatis/MyBatisOnConsumeFailedTest.java | 129 +
.../org/apache/camel/component/slack/slack.json | 2 +-
.../camel-slack/src/main/docs/slack-component.adoc | 6 +
.../camel/component/slack/SlackConsumer.java | 59 +-
.../camel/component/slack/SlackEndpoint.java | 3 +-
.../component/slack/SlackConsumerHasMoreTest.java | 292 +
.../config/SpringCloudConfigReloadTriggerTask.java | 6 +-
.../cloud/config/SpringConfigRemaindersCache.java | 13 +-
.../apache/camel/component/sql/SqlConsumer.java | 20 +-
...SqlConsumerRollbackOnlyPooledExchangeTest.java} | 28 +-
.../component/sql/SqlConsumerRollbackOnlyTest.java | 124 +
.../camel/impl/DefaultDumpRoutesStrategy.java | 60 +-
.../org/apache/camel/yaml/out/YamlModelWriter.java | 10 +-
.../org/apache/camel/yaml/LwModelToYAMLDumper.java | 85 +
.../camel/yaml/out/YamlModelWriterSupport.java | 19 +
.../src/test/resources/yaml-routeconfig.yaml | 24 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 62 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_22.adoc | 12 +
.../ROOT/pages/camel-4x-upgrade-guide-4_23.adoc | 100 +
.../ROOT/pages/camel-4x-upgrade-guide-4_24.adoc | 44 +-
.../modules/ROOT/pages/camel-jbang-ai.adoc | 3 +-
.../modules/ROOT/pages/camel-jbang-validation.adoc | 16 +-
.../endpoint/dsl/SlackEndpointBuilderFactory.java | 4 +-
.../dsl/jbang/core/commands/ai/AuthoringTools.java | 29 +
.../dsl/jbang/core/commands/ai/EndpointChecks.java | 25 +
.../core/commands/ai/EndpointConsumerChecks.java | 85 +-
.../dsl/jbang/core/commands/ai/IndentLines.java | 126 +
.../core/commands/ai/IntegrationLauncher.java | 46 +-
.../dsl/jbang/core/commands/ai/ModelChecks.java | 73 +-
.../jbang/core/commands/ai/ProjectOverview.java | 30 +-
.../dsl/jbang/core/commands/ai/ProjectRoutes.java | 54 +-
.../jbang/core/commands/ai/SourceValidator.java | 5 +
.../jbang/core/commands/ai/SqlDialectChecks.java | 177 +
.../core/commands/ai/AuthoringToolsLoopTest.java | 117 +
.../core/commands/ai/IntegrationLauncherTest.java | 23 +
.../commands/ai/OverviewValidateParityTest.java | 163 +
.../ai/SourceValidatorEndpointConsumersTest.java | 2 +-
.../core/commands/ai/SqlDialectChecksTest.java | 168 +
.../dsl/jbang/core/commands/tui/CatalogTab.java | 57 +-
.../core/commands/tui/CatalogTabKameletsTest.java | 22 +
.../camel/main/download/MainHttpServerFactory.java | 49 +
.../main/download/MainHttpServerFactoryTest.java | 121 +
.../camel/dsl/yaml/validator/DuplicateKeys.java | 85 +
.../dsl/yaml/validator/EndpointConsumers.java | 211 +-
.../camel/dsl/yaml/validator/EndpointRules.java | 110 +
.../camel/dsl/yaml/validator/RouteGraph.java | 3 -
.../camel/dsl/yaml/validator/YamlValidator.java | 11 +-
.../camel/dsl/yaml/validator/DuplicateKeyTest.java | 152 +
.../dsl/yaml/validator/EndpointConsumersTest.java | 113 +-
.../camel/dsl/yaml/OnExceptionYamlDumpTest.java | 252 +
.../dsl/yaml/RouteConfigurationYamlDumpTest.java | 83 +
.../src/generated/resources/META-INF/metadata.json | 48 +-
.../test/infra/aws2/services/container.properties | 2 +-
.../hashicorp/vault/services/container.properties | 2 +-
.../infra/jaeger/services/container.properties | 2 +-
.../test/infra/kafka/services/container.properties | 2 +-
.../test/infra/nats/services/container.properties | 2 +-
.../infra/openfga/services/container.properties | 2 +-
.../infra/pulsar/services/container.properties | 2 +-
.../infra/qdrant/services/container.properties | 2 +-
.../infra/rabbitmq/services/container.properties | 2 +-
.../main/resources/velocity/model-yaml-writer.vm | 5 +
126 files changed, 22603 insertions(+), 13462 deletions(-)
create mode 100644
components/camel-alibaba/camel-alibaba-oss/src/test/java/org/apache/camel/component/alibaba/oss/OSSConsumerInProgressTest.java
create mode 100644
components/camel-aws/camel-aws2-s3-vectors/src/test/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsConsumerInProgressTest.java
create mode 100644
components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerInProgressTest.java
create mode 100644
components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/FakeS3Server.java
create mode 100644
components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConsumerInProgressTest.java
create mode 100644
components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/FakeGmailClientFactory.java
create mode 100644
components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumerInProgressTest.java
create mode 100644
components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerDeletedObjectTest.java
create mode 100644
components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerInProgressFailureTest.java
create mode 100644
components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerInProgressTest.java
create mode 100644
components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerListingWindowTest.java
create mode 100644
components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultPropertiesFunctionTest.java
create mode 100644
components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultReloadTriggerTaskTest.java
create mode 100644
components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/OBSConsumerInProgressTest.java
create mode 100644
components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/FakeS3Server.java
create mode 100644
components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSConsumerInProgressTest.java
create mode 100644
components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunctionTest.java
create mode 100644
components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerLatestEventsTest.java
create mode 100644
components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackOutOfOrderAckTest.java
create mode 100644
components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpProducerAllowNullBodyIT.java
copy
components/{camel-spring-parent/camel-spring-cloud-config/src/main/java/org/apache/camel/component/spring/cloud/config/SpringConfigRemaindersCache.java
=>
camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisOnConsumeFailedPooledExchangeTest.java}
(54%)
create mode 100644
components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisOnConsumeFailedTest.java
create mode 100644
components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerHasMoreTest.java
copy
components/{camel-spring-parent/camel-spring-cloud-config/src/main/java/org/apache/camel/component/spring/cloud/config/SpringConfigRemaindersCache.java
=>
camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerRollbackOnlyPooledExchangeTest.java}
(54%)
create mode 100644
components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerRollbackOnlyTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/IndentLines.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/SqlDialectChecks.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/AuthoringToolsLoopTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/OverviewValidateParityTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/SqlDialectChecksTest.java
create mode 100644
dsl/camel-kamelet-main/src/test/java/org/apache/camel/main/download/MainHttpServerFactoryTest.java
create mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/DuplicateKeys.java
create mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/EndpointRules.java
create mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/test/java/org/apache/camel/dsl/yaml/validator/DuplicateKeyTest.java
create mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/dsl/yaml/OnExceptionYamlDumpTest.java
create mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/java/org/apache/camel/dsl/yaml/RouteConfigurationYamlDumpTest.java
