This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch backport/28160-to-camel-4.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 614917cf68d9 CAMEL-25827: camel-xslt-saxon - adapt the backport to
camel-4.18.x
add f0961b65b63c [backport camel-4.18.x] CAMEL-26335: camel-cometd -
configure allowedTransports and disable callback-polling by default (#28562)
add c4a4eb616161 [camel-4.18.x] CAMEL-25163: camel-google-storage - apply
the download directory containment check on the expression branch (#28685)
add 964cee79f030 [backport camel-4.18.x] CAMEL-26404: camel-oauth:
validate audience for access tokens on ServletOAuth backend (#28701)
add 3d721e435ddf [backport camel-4.18.x] CAMEL-26287: camel-jcache -
stopping an endpoint no longer closes the caches, cache manager and caching
provider that other endpoints use (#28693)
add bbd83746dcdd [backport camel-4.18.x] CAMEL-25886: camel-ftp/mina-sftp
- resolve listed symbolic links for jailStartingDirectory (#28695)
add b752a2c1b90d [backport camel-4.18.x] CAMEL-26162: camel-workday - the
token request sends the Base64 Basic header, and the access token is read as
JSON (#28698)
add 0107a65c2951 [backport camel-4.18.x] CAMEL-26306: camel-as2 - keep the
CR of a CRLF that is split between two reads of the line reader (#28773)
add 647434e4cd5e [backport camel-4.18.x] CAMEL-26327: camel-core - Routing
Slip / Dynamic Router: a redelivered step no longer hangs after a nested
routing slip (#28771)
add ddad1e4db44b Generated sources regen for SBOM (camel-4.18.x) (#28796)
add 3e1c8b539626 Merge remote-tracking branch 'upstream/camel-4.18.x' into
HEAD
No new revisions were added by this update.
Summary of changes:
camel-sbom/camel-sbom.json | 4 +-
camel-sbom/camel-sbom.xml | 2 +-
.../apache/camel/catalog/components/cometd.json | 33 +-
.../apache/camel/catalog/components/cometds.json | 33 +-
.../camel/catalog}/docs/cometd-component.adoc | 40 ++
.../as2/api/io/AS2SessionInputBuffer.java | 6 +-
.../entity/EntityParserContentLineEndingTest.java | 91 +++++
.../as2/api/io/AS2SessionInputBufferTest.java | 120 ++++++
.../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 +-
.../camel-ftp/src/main/docs/sftp-component.adoc | 15 +
.../camel/component/file/remote/SftpConsumer.java | 138 +++++++
.../component/file/remote/SftpOperations.java | 82 +++-
.../component/file/remote/SftpRemoteFile.java | 7 +
.../file/remote/SftpRemoteFileJCraft.java | 5 +
.../file/remote/SftpSymbolicLinkOperations.java | 53 +++
...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/MinaSftpConsumer.java | 127 ++++++
.../file/remote/mina/MinaSftpOperations.java | 55 ++-
.../file/remote/mina/MinaSftpRemoteFile.java | 5 +
.../mina/MinaSftpOperationsDisconnectTest.java | 67 +++
...SftpConsumerJailStartingDirectorySymlinkIT.java | 291 +++++++++++++
.../java/org/apache/camel/oauth/UserProfile.java | 47 ++-
.../org/apache/camel/oauth/UserProfileTest.java | 142 ++++++-
.../jakarta/ServletOAuthTokenCredentialsTest.java | 140 +++++++
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_18.adoc | 16 +
.../endpoint/dsl/CometdEndpointBuilderFactory.java | 57 +++
49 files changed, 3700 insertions(+), 133 deletions(-)
copy {components/camel-cometd/src/main =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog}/docs/cometd-component.adoc
(79%)
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-cometd/src/test/java/org/apache/camel/component/cometd/CometdAllowedTransportsTest.java
create mode 100644
components/camel-ftp/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/MinaSftpOperationsDisconnectTest.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-oauth/src/test/java/org/apache/camel/oauth/jakarta/ServletOAuthTokenCredentialsTest.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