This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch backport/28512-to-camel-4.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 9eece2a9eb08 ci: trigger CI after compilation fix
add 669fe51c400a [camel-4.22.x] CAMEL-26344: camel-jbang - plugin add
selects the plugin release built for the Camel CLI (#28584)
add 1518cb1d921b CAMEL-26370: camel-jbang - fix multi-dir
--local-kamelet-dir in export copySourceFiles (#28626)
add 1ed32b1c1989 [backport camel-4.22.x] CAMEL-26318: camel-stripe:
StripeProducer should use request options instead of mutating JVM-global Stripe
settings (#28617)
add 072844868ecf [backport camel-4.22.x] CAMEL-26336: camel-minio:
MinioProducer should apply configured server-side encryption options (#28615)
add 4d4e9f5210db [backport camel-4.22.x] CAMEL-26319: camel-oauth:
InMemorySessionStore should not log session identifiers and
OAuthCodeFlowCallback should rotate session identifiers on login (#28621)
add 9ef8aeeb6686 [backport camel-4.22.x] CAMEL-26335: camel-cometd -
configure allowedTransports and disable callback-polling by default (#28561)
add 6b1775efc391 [backport camel-4.22.x] CAMEL-26323: camel-shiro -
ShiroSecurityProcessor should authenticate against policy security manager
(#28570)
add fbcb430d716c [camel-4.22.x] CAMEL-25163: camel-google-storage - apply
the download directory containment check on the expression branch (#28684)
add 900f0a23c015 CAMEL-26402: camel-jbang-plugin-test - use
citrus-junit-jupiter for Citrus 5.x
add 464346d002db [backport camel-4.22.x] CAMEL-26367: camel-aws - give
each client its own DefaultCredentialsProvider instead of the JVM-wide
singleton (#28668)
add 6c8fe7302dc8 [backport camel-4.22.x] CAMEL-26343: camel-aws - set the
AWS SDK HTTP client explicitly instead of the classpath lookup (#28564)
add 7fcd9396e1cd [backport camel-4.22.x] CAMEL-26404: camel-oauth:
validate audience for access tokens on ServletOAuth backend (#28700)
add eeda27d40fa4 [backport camel-4.22.x] CAMEL-26287: camel-jcache -
stopping an endpoint no longer closes the caches, cache manager and caching
provider that other endpoints use (#28692)
add 90e6dda3c71d [backport camel-4.22.x] chore(deps): Bump
mcp-java-sdk-version from 2.0.0 to 2.1.0 (#28680)
add c11ffd4ce897 [backport camel-4.22.x] CAMEL-25886: camel-ftp/mina-sftp
- resolve listed symbolic links for jailStartingDirectory (#28694)
add fb87a97b4a6d [backport camel-4.22.x] CAMEL-26162: camel-workday - the
token request sends the Base64 Basic header, and the access token is read as
JSON (#28697)
add 30c7e22628e5 [backport camel-4.22.x] CAMEL-26327: camel-core - Routing
Slip / Dynamic Router: a redelivered step no longer hangs after a nested
routing slip (#28770)
add 342f73999fed [backport camel-4.22.x] CAMEL-26306: camel-as2 - keep the
CR of a CRLF that is split between two reads of the line reader (#28772)
add cdfae94ee1b7 Generated sources regen for SBOM (camel-4.22.x) (#28795)
add 20ddf75af40f Merge remote-tracking branch 'upstream/camel-4.22.x' into
backport/28512-to-camel-4.22.x
No new revisions were added by this update.
Summary of changes:
camel-sbom/camel-sbom.json | 140 +++++--
camel-sbom/camel-sbom.xml | 103 +++--
.../apache/camel/catalog/components/cometd.json | 33 +-
.../apache/camel/catalog/components/cometds.json | 33 +-
.../camel/catalog/docs/cometd-component.adoc | 40 ++
.../camel/catalog/docs/mina-sftp-component.adoc | 12 +-
.../apache/camel/catalog/docs/sftp-component.adoc | 15 +
.../as2/api/io/AS2SessionInputBuffer.java | 6 +-
.../entity/EntityParserContentLineEndingTest.java | 91 +++++
.../as2/api/io/AS2SessionInputBufferTest.java | 120 ++++++
components/camel-aws/camel-aws-common/pom.xml | 6 +
.../component/aws/common/AwsClientBuilderUtil.java | 28 +-
.../aws/common/AwsClientBuilderUtilTest.java | 162 ++++++++
.../software.amazon.awssdk.http.SdkHttpService} | 3 +-
...e.amazon.awssdk.http.async.SdkAsyncHttpService} | 3 +-
.../camel/component/aws2/s3/AWS2S3Producer.java | 35 +-
.../s3/AWS2S3ProducerPresignerCredentialsTest.java | 140 +++++++
.../component/aws2/sqs/SqsClientFactoryTest.java | 21 +
.../component/cometd/CometdEndpointConfigurer.java | 6 +
.../component/cometd/CometdEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/cometd/cometd.json | 33 +-
.../org/apache/camel/component/cometd/cometds.json | 33 +-
.../src/main/docs/cometd-component.adoc | 40 ++
.../camel/component/cometd/CometdComponent.java | 9 +
.../camel/component/cometd/CometdEndpoint.java | 15 +
.../cometd/CometdAllowedTransportsTest.java | 102 +++++
.../camel/component/file/GenericFileConsumer.java | 34 +-
.../file/remote/AbstractSftpConsumer.java | 138 +++++++
.../component/file/remote/SftpRemoteFile.java | 7 +
.../file/remote/SftpSymbolicLinkOperations.java | 53 +++
.../camel-ftp/src/main/docs/sftp-component.adoc | 15 +
.../component/file/remote/SftpOperations.java | 82 +++-
.../file/remote/SftpRemoteFileJCraft.java | 5 +
...emoteFileConsumerStartingDirectoryJailTest.java | 255 +++++++++++-
...SftpConsumerJailStartingDirectorySymlinkIT.java | 291 +++++++++++++
.../google/storage/GoogleCloudStorageConsumer.java | 57 ++-
.../storage/GoogleCloudStorageFileNameHelper.java | 81 ++++
...GoogleCloudStorageConsumerDownloadPathTest.java | 195 ++++++++-
.../GoogleCloudStorageFileNameHelperTest.java | 94 +++++
.../camel/component/jcache/JCacheConsumer.java | 28 +-
.../camel/component/jcache/JCacheManager.java | 82 +++-
.../camel/component/jcache/JCacheManagerTest.java | 88 ++++
.../component/jcache/JCacheRemoveRouteTest.java | 175 ++++++++
.../src/main/docs/mina-sftp-component.adoc | 12 +-
.../file/remote/mina/MinaSftpOperations.java | 55 ++-
.../file/remote/mina/MinaSftpRemoteFile.java | 5 +
.../mina/MinaSftpOperationsDisconnectTest.java | 38 ++
...SftpConsumerJailStartingDirectorySymlinkIT.java | 291 +++++++++++++
.../camel/component/minio/MinioProducer.java | 48 ++-
.../minio/MinioProducerEncryptionTest.java | 240 +++++++++++
components/camel-oauth/pom.xml | 5 +
.../java/org/apache/camel/oauth/UserProfile.java | 47 ++-
.../oauth/OAuthCodeFlowSessionRotationTest.java | 66 ++-
.../org/apache/camel/oauth/UserProfileTest.java | 142 ++++++-
.../jakarta/ServletOAuthTokenCredentialsTest.java | 140 +++++++
.../shiro/security/ShiroSecurityPolicy.java | 3 -
.../shiro/security/ShiroSecurityProcessor.java | 71 +++-
.../security/ShiroMultiplePolicyIsolationTest.java | 303 ++++++++++++++
.../camel/component/stripe/StripeProducer.java | 145 ++++---
.../camel/component/stripe/StripeProducerTest.java | 198 +++++++++
components/camel-workday/pom.xml | 4 +
.../workday/auth/AuthClientForIntegration.java | 25 +-
.../workday/auth/AuthClientForIntegrationTest.java | 124 ++++++
.../org/apache/camel/processor/RoutingSlip.java | 21 +-
.../RoutingSlipNestedSlipRedeliveryTest.java | 450 +++++++++++++++++++++
.../ROOT/pages/camel-4x-upgrade-guide-4_22.adoc | 57 +++
.../modules/ROOT/pages/camel-jbang-projects.adoc | 86 +++-
.../endpoint/dsl/CometdEndpointBuilderFactory.java | 57 +++
dsl/camel-jbang/camel-jbang-core/pom.xml | 11 +
.../dsl/jbang/core/commands/ExportBaseCommand.java | 33 +-
.../dsl/jbang/core/commands/plugin/PluginAdd.java | 189 ++++++++-
.../dsl/jbang/core/common/PluginCompatibility.java | 222 ++++++++++
.../camel/dsl/jbang/core/common/PluginHelper.java | 33 ++
.../jbang/core/common/PluginVersionResolver.java | 241 +++++++++++
.../ExportBaseCommandCopySourceFilesTest.java | 146 +++++++
.../jbang/core/commands/plugin/PluginAddTest.java | 271 ++++++++++++-
.../jbang/core/common/FakePluginDownloader.java | 65 +++
.../jbang/core/common/PluginCompatibilityTest.java | 152 +++++++
.../dsl/jbang/core/common/PluginHelperTest.java | 72 ++++
.../core/common/PluginVersionResolverTest.java | 299 ++++++++++++++
.../core/commands/test/TestPluginExporter.java | 2 +-
.../jbang/core/commands/test/TestPluginTest.java | 4 +
.../camel/main/download/DependencyDownloader.java | 32 ++
.../main/download/MavenDependencyDownloader.java | 35 ++
parent/pom.xml | 2 +-
tooling/camel-tooling-maven/pom.xml | 6 +
.../tooling/maven/MavenArtifactDescriptor.java | 44 ++
.../camel/tooling/maven/MavenDownloader.java | 33 ++
.../camel/tooling/maven/MavenDownloaderImpl.java | 223 ++++++++--
.../tooling/maven/MavenDownloaderImplTest.java | 272 +++++++++++++
90 files changed, 7553 insertions(+), 379 deletions(-)
create mode 100644
components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/io/AS2SessionInputBufferTest.java
create mode 100644
components/camel-aws/camel-aws-common/src/test/java/org/apache/camel/component/aws/common/AwsClientBuilderUtilTest.java
copy
components/{camel-kamelet/src/main/resources/META-INF/services/org/apache/camel/model/KameletDefinition
=>
camel-aws/camel-aws-common/src/test/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService}
(81%)
copy
components/{camel-kamelet/src/main/resources/META-INF/services/org/apache/camel/model/KameletDefinition
=>
camel-aws/camel-aws-common/src/test/resources/META-INF/services/software.amazon.awssdk.http.async.SdkAsyncHttpService}
(81%)
create mode 100644
components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ProducerPresignerCredentialsTest.java
create mode 100644
components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdAllowedTransportsTest.java
create mode 100644
components/camel-ftp-common/src/main/java/org/apache/camel/component/file/remote/SftpSymbolicLinkOperations.java
create mode 100644
components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerJailStartingDirectorySymlinkIT.java
create mode 100644
components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheRemoveRouteTest.java
create mode 100644
components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpConsumerJailStartingDirectorySymlinkIT.java
create mode 100644
components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioProducerEncryptionTest.java
create mode 100644
components/camel-oauth/src/test/java/org/apache/camel/oauth/jakarta/ServletOAuthTokenCredentialsTest.java
create mode 100644
components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroMultiplePolicyIsolationTest.java
create mode 100644
components/camel-stripe/src/test/java/org/apache/camel/component/stripe/StripeProducerTest.java
create mode 100644
components/camel-workday/src/test/java/org/apache/camel/component/workday/auth/AuthClientForIntegrationTest.java
create mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNestedSlipRedeliveryTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginCompatibility.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginVersionResolver.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommandCopySourceFilesTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/FakePluginDownloader.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/PluginCompatibilityTest.java
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/PluginVersionResolverTest.java
create mode 100644
tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenArtifactDescriptor.java