This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch fix/CAMEL-25817
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 126477047cea CAMEL-25817: camel-jbang - camel dirty removes only the
files of processes that are gone
add 12dcf49b2738 CAMEL-25757: camel-azure-files - accept 206 Partial
Content for a resumed download (#28072)
add 04333431a654 CAMEL-24704: camel-yaml-dsl - beans keyed by the bean
name fail with the list form to write (#26921)
add 2cddebab6c2f CAMEL-23317: Fix flaky MailProducerUnsupportedCharsetTest
add ea8134e42e85 CAMEL-22996: raise jdk.version from 17 to 21
add 38702c31e897 CAMEL-22996: update archetype templates to Java 21
add 271d4726f5b7 CAMEL-22996: remove JDK 17 from GitHub Actions matrix
add 846235d6ecc8 CAMEL-22996: remove JDK 17 from Jenkinsfile
add 1b24f7cb5392 CAMEL-22996: resolve Java-21 baseline TODOs (threadId,
Locale.of)
add 19c48b622eb0 CAMEL-22996: update documentation to reflect Java 21
minimum
add 2bfddab5c222 CAMEL-22996: drop JDK 17 from camel-jbang-container
Makefile
add 445aea8fcab2 CAMEL-22996: update Doctor.checkJava() to require Java 21
add 8dc19aa02146 CAMEL-22996: update MigrationTools Java version in
examples commands
add 381cb2be40b2 CAMEL-22996: update camel-launcher to require Java 21
add a7f1e112af30 CAMEL-22996: update AGENTS.md Java minimum to 21+
add ec707008d0f8 CAMEL-22996: simplify JDK enforcer message in root pom.xml
add 615b9698a0ad CAMEL-22996: remove reflection workaround from
SSLContextParametersNamedGroupsListTest
add 7ec5d6a0e2b5 CAMEL-22996: remove min=JAVA_21 from @EnabledForJreRange
in SSL and virtual thread tests
add 72da53efe4b2 CAMEL-22996: replace deprecated new Locale() with
Locale.forLanguageTag() or Locale.of()
add 9ccfb67d56b3 CAMEL-22996: promote java21/CamelThreadFactory to main,
remove multi-release java-21-sources profile
add 7bcdc00716de CAMEL-25644: camel-ssh - match known_hosts entries by
exact host pattern (#27821)
add 53140a139f5c CAMEL-25819: camel-core - Aggregate EIP recovers
exchanges when the KeyValueRepository is auto-discovered
add 4809d8f99d61 chore(deps): Bump aws-java-sdk2-version from 2.55.15 to
2.56.0
add 3a41818fb18b Regen
add 6a253ffb947c CAMEL-25794: camel-pqc - HSS, XMSSMT and SNTRUPrime get
their default key material (#28098)
add 3d6b26642f12 CAMEL-25812: camel-milo - end idle client threads and run
reconnects on a thread of their own (#28111)
add a2a592c0772b CAMEL-25760: camel-alibaba-oss - skip a listed object
that cannot be got instead of failing the poll (#28075)
add e9d519bbd6c5 CAMEL-25760: camel-huaweicloud-obs - skip a listed object
that cannot be got instead of failing the poll (#28076)
add 66a07e331869 CAMEL-25743: camel-aws2-s3 - upload a body of known
length with its own length, not a stale CamelAwsS3ContentLength (#28070)
add a439c1ab3912 CAMEL-25787: camel-smooks - handle Smooks Source bodies
like other XML message bodies (#28095)
add efb795c1fadc chore: docs - revisit the security model after the 38
advisories of 2026-10-15 (#28088)
add 55339dd9c435 CAMEL-25756: camel-kafka - a failed poll must not drop
the records of an incomplete batch (#28071)
add 51c2ab6a8bfd CAMEL-25782: camel-zookeeper - Do not fail a watch
operation whose awaited event was already received
add cc5df805db08 CAMEL-25640: Fix flaky MasterQuartzEndpointIT
add 32662b651464 CAMEL-25799: camel-pqc - hybrid auto-configuration keeps
a user-supplied PQC signer and key pair (#28091)
add da4fb69a6689 CAMEL-25800: camel-pqc - the hybrid KEM ephemeral key is
generated on the curve of the recipient key (#28090)
add c78add1c7e53 CAMEL-25804: camel-pqc - keep the stateful key gauge
supplier reachable (#28102)
add 96f34b545613 CAMEL-25774: EIP docs - route examples in tabs with Java,
XML and YAML, an idempotent consumer example, and the common usage first
(#28079)
add 96921011d3db CAMEL-25820: camel-yaml-dsl-validator - the Kamelet
schema keeps the schema of the template under definitions, so validating a
Kamelet logs no warning (#28115)
add 8f30fa7f5267 CAMEL-25818: camel-jbang - the console output of
camel_run and camel_control restart goes to <pid>-run.log and is removed when
the integration ends (#28116)
add eabddd91357e CAMEL-25817: camel-jbang - camel dirty removes only the
files of processes that are gone
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 (126477047cea)
\
N -- N -- N refs/heads/fix/CAMEL-25817 (eabddd91357e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/CI-ARCHITECTURE.md | 6 +-
.github/workflows/pr-build-main.yml | 9 +-
AGENTS.md | 48 +-
Jenkinsfile | 27 +-
.../__artifactId__-component/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../apache/camel/catalog/components/aws2-ec2.json | 2 +-
.../org/apache/camel/catalog/components/ssh.json | 8 +-
.../apache/camel/catalog/docs/aggregate-eip.adoc | 255 ++++++--
.../org/apache/camel/catalog/docs/cache-eip.adoc | 266 +++++++-
.../org/apache/camel/catalog/docs/choice-eip.adoc | 2 +-
.../camel/catalog/docs/circuitBreaker-eip.adoc | 116 +++-
.../apache/camel/catalog/docs/claimCheck-eip.adoc | 196 +++---
.../camel/catalog/docs/content-enricher.adoc | 24 +-
.../camel/catalog/docs/content-filter-eip.adoc | 107 ++--
.../camel/catalog/docs/crypto-dataformat.adoc | 2 +-
.../camel/catalog/docs/dead-letter-channel.adoc | 48 +-
.../org/apache/camel/catalog/docs/delay-eip.adoc | 4 +-
.../camel/catalog/docs/idempotentConsumer-eip.adoc | 138 ++++-
.../org/apache/camel/catalog/docs/kamelet-eip.adoc | 1 +
.../apache/camel/catalog/docs/ldap-component.adoc | 2 +-
.../org/apache/camel/catalog/docs/log-eip.adoc | 21 +-
.../org/apache/camel/catalog/docs/main.adoc | 8 +-
.../org/apache/camel/catalog/docs/marshal-eip.adoc | 43 +-
.../apache/camel/catalog/docs/pausable-eip.adoc | 72 +++
.../apache/camel/catalog/docs/pollEnrich-eip.adoc | 143 +++--
.../camel/catalog/docs/polling-consumer.adoc | 2 +
.../apache/camel/catalog/docs/pqc-component.adoc | 4 +-
.../org/apache/camel/catalog/docs/process-eip.adoc | 33 +-
.../camel/catalog/docs/recipientList-eip.adoc | 145 ++++-
.../apache/camel/catalog/docs/resumable-eip.adoc | 63 ++
.../camel/catalog/docs/resume-strategies.adoc | 308 +++++++++-
.../apache/camel/catalog/docs/setHeaders-eip.adoc | 16 +-
.../camel/catalog/docs/setVariables-eip.adoc | 16 +-
.../org/apache/camel/catalog/docs/split-eip.adoc | 203 +++---
.../apache/camel/catalog/docs/ssh-component.adoc | 66 ++
.../org/apache/camel/catalog/docs/switch-eip.adoc | 53 ++
.../org/apache/camel/catalog/docs/toD-eip.adoc | 26 +-
.../apache/camel/catalog/docs/tokenizer-eip.adoc | 77 +++
.../camel/catalog/docs/transactional-client.adoc | 197 +++---
.../apache/camel/catalog/docs/unmarshal-eip.adoc | 48 +-
.../main/camel-main-configuration-metadata.json | 8 +-
.../catalog/models-app/sslContextParameters.json | 8 +-
.../models/langChain4jCharacterTokenizer.json | 2 +-
.../catalog/models/langChain4jLineTokenizer.json | 2 +-
.../models/langChain4jParagraphTokenizer.json | 2 +-
.../models/langChain4jSentenceTokenizer.json | 2 +-
.../catalog/models/langChain4jWordTokenizer.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 8 +-
.../apache/camel/catalog/schemas/camel-xml-io.xsd | 2 +-
.../camel/catalog/schemas/camelYamlDsl-model.json | 15 +-
.../camel/catalog/DocExamplesXmlSchemaTest.java | 3 +-
.../camel/component/alibaba/oss/OSSConsumer.java | 70 ++-
.../oss/OSSConsumerObjectThatCannotBeGotTest.java | 207 +++++++
.../as2/api/AS2AsyncMDNServerConnection.java | 4 +-
.../component/as2/api/AS2ServerConnection.java | 4 +-
.../apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
.../camel/component/aws2/s3/AWS2S3Producer.java | 24 +-
.../aws2/s3/AWS2S3ProducerPayloadLengthTest.java | 66 ++
.../component/file/azure/FilesOperations.java | 5 +-
.../azure/FilesOperationsResumeDownloadTest.java | 228 +++++++
.../camel/dataformat/bindy/FormattingOptions.java | 4 +-
.../src/main/docs/crypto-dataformat.adoc | 2 +-
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 2 +-
.../google/bigquery/GoogleBigQueryProducer.java | 4 +-
.../google/pubsub/GooglePubsubProducer.java | 5 +-
.../component/huaweicloud/obs/OBSConsumer.java | 63 +-
.../obs/OBSConsumerObjectThatCannotBeGotTest.java | 220 +++++++
.../camel/component/kafka/KafkaFetchRecords.java | 9 +-
.../batching/KafkaRecordBatchingProcessor.java | 19 +-
.../kafka/KafkaBatchingConsumerPollErrorTest.java | 188 ++++++
.../KafkaBatchingConsumerProcessErrorTest.java | 146 +++++
.../camel-ldap/src/main/docs/ldap-component.adoc | 2 +-
.../mail/MailProducerUnsupportedCharsetTest.java | 34 +-
.../milo/client/MiloClientConnection.java | 44 +-
.../milo/client/internal/SubscriptionManager.java | 18 +-
.../component/milo/MiloClientExecutorTest.java | 34 +-
.../camel-pqc/src/main/docs/pqc-component.adoc | 4 +-
.../apache/camel/component/pqc/PQCComponent.java | 56 +-
.../component/pqc/crypto/hybrid/HybridKEM.java | 54 +-
.../pqc/metrics/PQCMicrometerMetrics.java | 29 +-
.../pqc/PQCDefaultMaterialAutowiringTest.java | 83 +++
.../pqc/PQCHybridKeyPairPreservedTest.java | 149 +++++
.../pqc/crypto/hybrid/HybridKEMCurveTest.java | 180 ++++++
.../pqc/metrics/PQCMicrometerMetricsTest.java | 126 ++++
.../camel/component/smooks/SmooksProcessor.java | 11 +-
.../component/smooks/SmooksSecuritySupport.java | 80 ++-
.../component/smooks/SmooksReaderConfigTest.java | 91 +++
.../component/smooks/SmooksSourceBodyTest.java | 165 +++++
....xml => reader-without-class-smooks-config.xml} | 22 +-
.../apache/camel/component/smpp/SmppConsumer.java | 5 +-
.../apache/camel/component/smpp/SmppProducer.java | 15 +-
.../camel/spring/xml/keyStoreParameters.json | 2 +-
.../camel/spring/xml/secureRandomParameters.json | 2 +-
.../camel/spring/xml/sslContextParameters.json | 2 +-
.../org/apache/camel/component/ssh/ssh.json | 8 +-
.../camel-ssh/src/main/docs/ssh-component.adoc | 66 ++
.../component/ssh/ResourceBasedSSHKeyVerifier.java | 342 +++++++----
.../camel/component/ssh/SshConfiguration.java | 15 +-
.../org/apache/camel/component/ssh/SshHelper.java | 29 +-
.../ssh/ResourceBasedSSHKeyVerifierTest.java | 370 ++++++++++-
.../ssh/SshComponentKnownHostEdDSATest.java | 13 +-
.../ssh/SshComponentKnownHostIPv6Test.java | 183 ++++++
.../component/ssh/SshComponentKnownHostTest.java | 146 ++++-
.../component/ssh/SshComponentTestSupport.java | 40 +-
.../camel-ssh/src/test/resources/known_hosts_eddsa | 1 -
.../camel-ssh/src/test/resources/known_hosts_valid | 1 -
.../zookeepermaster/MasterEndpointIT-context.xml | 26 +-
.../MasterQuartzEndpointIT-context.xml | 26 +-
.../operations/FutureEventDrivenOperation.java | 6 +-
.../operations/FutureEventDrivenOperationTest.java | 37 ++
.../camel/support/jsse/KeyManagersParameters.java | 2 +-
.../camel/support/jsse/KeyStoreParameters.java | 2 +-
.../camel/support/jsse/SSLContextParameters.java | 4 +-
.../camel/support/jsse/SecureRandomParameters.java | 2 +-
.../support/jsse/TrustManagersParameters.java | 2 +-
.../engine/DefaultAsyncProcessorAwaitManager.java | 4 +-
.../docs/modules/eips/pages/aggregate-eip.adoc | 255 ++++++--
.../main/docs/modules/eips/pages/cache-eip.adoc | 266 +++++++-
.../main/docs/modules/eips/pages/choice-eip.adoc | 2 +-
.../modules/eips/pages/circuitBreaker-eip.adoc | 116 +++-
.../docs/modules/eips/pages/claimCheck-eip.adoc | 196 +++---
.../docs/modules/eips/pages/content-enricher.adoc | 24 +-
.../modules/eips/pages/content-filter-eip.adoc | 107 ++--
.../modules/eips/pages/dead-letter-channel.adoc | 48 +-
.../main/docs/modules/eips/pages/delay-eip.adoc | 4 +-
.../modules/eips/pages/idempotentConsumer-eip.adoc | 138 ++++-
.../main/docs/modules/eips/pages/kamelet-eip.adoc | 1 +
.../src/main/docs/modules/eips/pages/log-eip.adoc | 21 +-
.../main/docs/modules/eips/pages/marshal-eip.adoc | 43 +-
.../main/docs/modules/eips/pages/pausable-eip.adoc | 72 +++
.../docs/modules/eips/pages/pollEnrich-eip.adoc | 143 +++--
.../docs/modules/eips/pages/polling-consumer.adoc | 2 +
.../main/docs/modules/eips/pages/process-eip.adoc | 33 +-
.../docs/modules/eips/pages/recipientList-eip.adoc | 145 ++++-
.../docs/modules/eips/pages/resumable-eip.adoc | 63 ++
.../docs/modules/eips/pages/resume-strategies.adoc | 308 +++++++++-
.../docs/modules/eips/pages/setHeaders-eip.adoc | 16 +-
.../docs/modules/eips/pages/setVariables-eip.adoc | 16 +-
.../main/docs/modules/eips/pages/split-eip.adoc | 203 +++---
.../main/docs/modules/eips/pages/switch-eip.adoc | 53 ++
.../src/main/docs/modules/eips/pages/toD-eip.adoc | 26 +-
.../docs/modules/eips/pages/tokenizer-eip.adoc | 77 +++
.../modules/eips/pages/transactional-client.adoc | 197 +++---
.../docs/modules/eips/pages/unmarshal-eip.adoc | 48 +-
.../camel/model/app/sslContextParameters.json | 8 +-
.../tokenizer/langChain4jCharacterTokenizer.json | 2 +-
.../model/tokenizer/langChain4jLineTokenizer.json | 2 +-
.../tokenizer/langChain4jParagraphTokenizer.json | 2 +-
.../tokenizer/langChain4jSentenceTokenizer.json | 2 +-
.../model/tokenizer/langChain4jWordTokenizer.json | 2 +-
.../model/app/SSLContextParametersDefinition.java | 8 +-
.../tokenizer/LangChain4jTokenizerDefinition.java | 2 +-
.../processor/aggregate/AggregateProcessor.java | 2 +-
.../AbstractKeyManagersParametersFactoryBean.java | 2 +-
.../AbstractKeyStoreParametersFactoryBean.java | 2 +-
.../AbstractSSLContextParametersFactoryBean.java | 2 +-
.../AbstractSecureRandomParametersFactoryBean.java | 2 +-
...AbstractTrustManagersParametersFactoryBean.java | 2 +-
.../impl/engine/IntrospectionSupportTest.java | 2 +-
...toDiscoveredKeyValueRepositoryRecoverTest.java} | 39 +-
.../SSLContextParametersNamedGroupsListTest.java | 20 +-
.../support/jsse/SSLContextParametersTest.java | 213 +++----
.../camel-main-configuration-metadata.json | 8 +-
core/camel-main/src/main/docs/main.adoc | 8 +-
.../camel/main/SSLConfigurationProperties.java | 16 +-
.../mbean/ManagedAsyncProcessorAwaitManager.java | 4 +-
.../ManagedVirtualThreadExecutorTest.java | 3 -
core/camel-util/pom.xml | 58 +-
.../camel/util/concurrent/CamelThreadFactory.java | 35 +-
.../camel/util/concurrent/CamelThreadFactory.java | 87 ---
.../modules/ROOT/attachments/security-model.yaml | 146 +++--
.../ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 29 +
.../ROOT/pages/camel-4x-upgrade-guide-4_22.adoc | 29 +
.../ROOT/pages/camel-4x-upgrade-guide-4_24.adoc | 118 +++-
.../ROOT/pages/camel-jbang-getting-started.adoc | 2 +-
.../ROOT/pages/camel-jbang-launcher-install.adoc | 4 +-
.../modules/ROOT/pages/security-model.adoc | 679 ++++++++++++++++-----
.../modules/ROOT/pages/virtual-threads.adoc | 2 +-
.../ROOT/pages/what-are-the-dependencies.adoc | 1 +
.../component/dsl/SshComponentBuilderFactory.java | 16 +-
.../endpoint/dsl/SshEndpointBuilderFactory.java | 75 ++-
dsl/camel-jbang/camel-jbang-container/Makefile | 4 +-
.../dsl/jbang/core/commands/ai/eip-samples.json | 176 +++++-
.../camel/dsl/jbang/core/commands/Doctor.java | 8 +-
.../dsl/jbang/core/commands/ai/CatalogSamples.java | 53 ++
.../core/commands/ai/IntegrationLauncher.java | 70 ++-
.../jbang/core/commands/ai/CatalogDocsTest.java | 5 +-
.../jbang/core/commands/ai/CatalogSamplesTest.java | 44 +-
.../ai/IntegrationLauncherConsoleTest.java | 146 +++++
.../jbang/core/commands/mcp/MigrationTools.java | 4 +-
.../camel-launcher/src/install/install.ps1 | 6 +-
.../camel-launcher/src/install/install.sh | 4 +-
.../camel-cli/sdkman/release-notes.md | 4 +-
.../src/main/resources/bin/camel.bat | 4 +-
.../camel-launcher/src/main/resources/bin/camel.sh | 4 +-
.../dsl/jbang/launcher/CamelBatDiscoveryTest.java | 58 +-
.../dsl/jbang/launcher/CamelShDiscoveryTest.java | 47 +-
.../camel/dsl/jbang/launcher/FakeJavaTest.java | 2 +-
.../dsl/yaml/deserializers/BeansDeserializer.java | 41 ++
.../RouteTemplateDefinitionDeserializer.java | 1 +
.../TemplatedRouteDefinitionDeserializer.java | 1 +
.../camel/dsl/yaml/validator/SchemaHints.java | 4 +-
.../camel/dsl/yaml/validator/YamlValidator.java | 10 +-
.../dsl/yaml/validator/KameletValidationTest.java | 45 ++
.../validator/YamlValidatorPropertyHintTest.java | 39 ++
.../resources/schema/camelYamlDsl-model.json | 15 +-
.../java/org/apache/camel/dsl/yaml/BeansTest.java | 83 +++
parent/pom.xml | 2 +-
pom.xml | 4 +-
214 files changed, 9565 insertions(+), 2252 deletions(-)
create mode 100644
components/camel-alibaba/camel-alibaba-oss/src/test/java/org/apache/camel/component/alibaba/oss/OSSConsumerObjectThatCannotBeGotTest.java
create mode 100644
components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesOperationsResumeDownloadTest.java
create mode 100644
components/camel-huawei/camel-huaweicloud-obs/src/test/java/org/apache/camel/component/huaweicloud/obs/OBSConsumerObjectThatCannotBeGotTest.java
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaBatchingConsumerPollErrorTest.java
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaBatchingConsumerProcessErrorTest.java
create mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCDefaultMaterialAutowiringTest.java
create mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCHybridKeyPairPreservedTest.java
create mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/crypto/hybrid/HybridKEMCurveTest.java
create mode 100644
components/camel-pqc/src/test/java/org/apache/camel/component/pqc/metrics/PQCMicrometerMetricsTest.java
create mode 100644
components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksReaderConfigTest.java
create mode 100644
components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksSourceBodyTest.java
copy components/camel-smooks/src/test/resources/{smooks-config.xml =>
reader-without-class-smooks-config.xml} (78%)
create mode 100644
components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentKnownHostIPv6Test.java
delete mode 100644 components/camel-ssh/src/test/resources/known_hosts_eddsa
delete mode 100644 components/camel-ssh/src/test/resources/known_hosts_valid
copy
core/camel-core/src/test/java/org/apache/camel/processor/aggregator/{AggregateKeyValueRepositoryRecoverTest.java
=> AggregateAutoDiscoveredKeyValueRepositoryRecoverTest.java} (61%)
delete mode 100644
core/camel-util/src/main/java21/org/apache/camel/util/concurrent/CamelThreadFactory.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/IntegrationLauncherConsoleTest.java