This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch 23188
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 451dd6116043 CAMEL-23188 - camel-core: Auto-configure PQC TLS named
groups when JVM supports them
add 013f0d8a53ad Expose MCP Everything with SSE
add 2e2a90713d8a Camel Spring AI Image component - integration with
SpringAI ImageModel API
add ec4b2f6acbb9 CAMEL-23175: MCP support, Tool bean discovery, Tool
context, StructuredOutputValidation, Tool selection by Name
add e28fcfdaa777 spring-boot partial does not exist yet
add 8901ade8b31f Add camel-spring-ai-image to MojoHelper and improve
logging
add f19cc54388a9 Add spring AI generated files
add f8d84aa08a30 CAMEL-23121 - Configure Kafka strimzi for transaction
support in inetgration tests for Kafka 4.x
add 1067b19b90f3 Null check to allow http 200 responses with no content
(#21955)
add 20b61c68a9ba chore(ci): post tested modules comment on PRs (#21957)
add 696976d87f88 CAMEL-23096: camel-ssh - expose more CoreModuleProperties
(#21947)
add b33e0bfa1ec7 feat(components/telemetry): add seda size span decoration
add 3b10622c8b09 CAMEL-23164: Create camel-ftp-common module for shared
SFTP code (#21950)
add b8f577ad70b5 CAMEL-23151: Deprecate csimple language (#21948)
add 96ab0f2cb69d chore : clean up deprecation warnings in camel-cxf tests,
mostly doPostSetup/doPostTearDown and URL changes (#21959)
add ecc191d6e100 chore(deps): Bump
com.google.cloud:google-cloud-secretmanager (#21961)
add 925b44cff55a chore(deps): Bump huaweicloud-sdk-version from 3.1.187 to
3.1.188 (#21960)
add 648bc4c42f05 chore(deps): Bump aws-java-sdk2-version from 2.42.11 to
2.42.12 (#21962)
add c970c2980d5d chore(camel-test-infra-milvus): upgrade milvus.container
to v2.6.11 (#21893)
add 8ccd5dcd92bd chore(deps): Bump com.google.genai:google-genai from
1.42.0 to 1.43.0 (#21968)
add 4b0f16c71b19 chore(deps): Bump com.google.cloud:google-cloud-aiplatform
add 593991520ce0 chore(deps): Bump
com.googlecode.libphonenumber:libphonenumber
add 46faa6387d72 chore(deps): Bump mima-version from 2.4.41 to 2.4.42
add 28deff010515 chore(deps): Bump org.atmosphere:atmosphere-runtime
new 4e48e5e3323e CAMEL-23188 - camel-core: Auto-configure PQC TLS named
groups when JVM supports them
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 (451dd6116043)
\
N -- N -- N refs/heads/23188 (4e48e5e3323e)
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 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.
Summary of changes:
.../actions/incremental-build/incremental-build.sh | 16 +-
.github/workflows/pr-build-main.yml | 45 ++
bom/camel-bom/pom.xml | 10 +
catalog/camel-allcomponents/pom.xml | 5 +
.../org/apache/camel/catalog/components.properties | 1 +
.../apache/camel/catalog/components/mina-sftp.json | 14 +-
.../org/apache/camel/catalog/components/sftp.json | 6 +-
.../camel/catalog/components/spring-ai-chat.json | 57 +--
.../camel/catalog/components/spring-ai-image.json | 60 +++
.../org/apache/camel/catalog/components/ssh.json | 110 ++---
.../apache/camel/catalog/languages/csimple.json | 2 +-
.../org/apache/camel/catalog/models/csimple.json | 2 +-
.../apache/camel/catalog/others/csimple-joor.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../apache/camel/catalog/schemas/camel-xml-io.xsd | 2 +-
catalog/camel-csimple-maven-plugin/pom.xml | 2 +-
.../model/CamelCSimpleExpressionDetails.java | 1 +
components/camel-csimple-joor/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/csimple-joor.json | 2 +-
.../src/main/docs/csimple-joor.adoc | 11 +-
.../language/csimple/joor/JoorCSimpleCompiler.java | 1 +
.../cxf/jaxws/CxfConsumerNamespacePayLoadTest.java | 13 +-
.../cxf/jaxws/CxfCustomizedExceptionTest.java | 5 +-
.../cxf/jaxws/CxfMultipleConsumersSupportTest.java | 8 +-
.../CxfPayLoadSoapHeaderViaCamelHeaderTest.java | 2 +-
.../message/DefaultCxfMessageMapperTest.java | 1 -
.../cxf/transport/CamelDestinationTest.java | 3 +-
.../cxf/transport/CamelTransportTestSupport.java | 4 +-
.../message/DefaultCxfMessageMapperTest.java | 1 -
.../cxf/transport/CamelTransportTestSupport.java | 4 +-
.../pom.xml | 67 ++-
.../file/remote/AbstractSftpConsumer.java} | 67 +--
.../file/remote/BaseSftpConfiguration.java} | 289 +++++--------
.../camel/component/file/remote/FtpConstants.java | 0
.../camel/component/file/remote/FtpUtils.java | 17 -
.../camel/component/file/remote/RemoteFile.java | 0
.../component/file/remote/RemoteFileComponent.java | 0
.../file/remote/RemoteFileConfiguration.java | 0
.../component/file/remote/RemoteFileConsumer.java | 0
.../component/file/remote/RemoteFileEndpoint.java | 0
.../file/remote/RemoteFileOperations.java | 0
.../RemoteFilePollingConsumerPollStrategy.java | 0
.../component/file/remote/RemoteFileProducer.java | 0
.../file/remote/RemoteFileProducerHealthCheck.java | 0
.../SftpDefaultMoveExistingFileStrategy.java | 2 +-
.../component/file/remote/SftpRemoteFile.java | 0
.../file/remote/SftpRemoteFileSingle.java | 0
components/camel-ftp/pom.xml | 11 +-
.../apache/camel/component/file/remote/sftp.json | 6 +-
.../camel/component/file/remote/FtpConsumer.java | 21 +-
.../component/file/remote/SftpConfiguration.java | 305 +-------------
.../camel/component/file/remote/SftpConsumer.java | 272 +-----------
.../integration/KafkaWithDBTransactionIT.java | 7 -
.../component/file/remote/mina/mina-sftp.json | 14 +-
.../file/remote/mina/MinaSftpConfiguration.java | 323 +--------------
.../file/remote/mina/MinaSftpConsumer.java | 273 +------------
.../MinaSftpDefaultMoveExistingFileStrategy.java | 101 -----
.../file/remote/mina/MinaSftpEndpoint.java | 3 +-
.../file/remote/mina/MinaSftpRemoteFileSingle.java | 61 ---
.../camel-spring-ai/camel-spring-ai-chat/pom.xml | 14 +
.../chat/SpringAiChatEndpointConfigurer.java | 50 ++-
.../chat/SpringAiChatEndpointUriFactory.java | 13 +-
.../component/springai/chat/spring-ai-chat.json | 57 +--
.../src/main/docs/spring-ai-chat-component.adoc | 228 +++++++++++
.../springai/chat/SpringAiChatConfiguration.java | 128 ++++++
.../springai/chat/SpringAiChatConstants.java | 8 +
.../springai/chat/SpringAiChatProducer.java | 89 ++++
.../springai/chat/mcp/SpringAiChatMcpManager.java | 186 +++++++++
.../component/springai/chat/SpringAiChatMcpIT.java | 88 ++++
.../springai/chat/SpringAiChatMcpSseIT.java | 74 ++++
.../SpringAiChatStructuredOutputValidationIT.java | 129 ++++++
.../chat/SpringAiChatToolBeanDiscoveryIT.java | 119 ++++++
.../springai/chat/SpringAiChatToolContextIT.java | 105 +++++
.../camel-spring-ai/camel-spring-ai-image}/pom.xml | 46 +--
.../image/SpringAiImageComponentConfigurer.java | 99 +++++
.../SpringAiImageConfigurationConfigurer.java | 72 ++++
.../image/SpringAiImageConverterLoader.java | 76 ++++
.../image/SpringAiImageEndpointConfigurer.java | 83 ++++
.../image/SpringAiImageEndpointUriFactory.java} | 48 +--
.../component/springai/image/spring-ai-image.json | 60 +++
.../services/org/apache/camel/TypeConverterLoader | 2 +
.../services/org/apache/camel/component.properties | 7 +
.../org/apache/camel/component/spring-ai-image | 2 +
...onent.springai.image.SpringAiImageConfiguration | 2 +
.../camel/configurer/spring-ai-image-component | 2 +
.../camel/configurer/spring-ai-image-endpoint | 2 +
.../camel/urifactory/spring-ai-image-endpoint | 2 +
.../src/main/docs/spring-ai-image-component.adoc | 195 +++++++++
.../component/springai/image/SpringAiImage.java} | 15 +-
.../springai/image/SpringAiImageComponent.java | 62 +++
.../springai/image/SpringAiImageConfiguration.java | 136 ++++++
.../springai/image/SpringAiImageConverter.java | 70 ++++
.../springai/image/SpringAiImageEndpoint.java | 74 ++++
.../springai/image/SpringAiImageHeaders.java | 55 +++
.../springai/image/SpringAiImageProducer.java | 126 ++++++
.../springai/image/SpringAiImageOllamaIT.java | 247 +++++++++++
.../src/test/resources/log4j2.properties | 50 +++
.../camel-spring-parent/camel-spring-ai/pom.xml | 1 +
.../component/ssh/SshComponentConfigurer.java | 30 ++
.../camel/component/ssh/SshEndpointConfigurer.java | 30 ++
.../camel/component/ssh/SshEndpointUriFactory.java | 7 +-
.../org/apache/camel/component/ssh/ssh.json | 110 ++---
.../camel/component/ssh/SshConfiguration.java | 82 ++++
.../org/apache/camel/component/ssh/SshUtils.java | 15 +
.../component/ssh/SshConnectionPropertiesTest.java | 114 ++++++
.../telemetry/decorators/SedaSpanDecorator.java | 23 ++
components/pom.xml | 1 +
.../org/apache/camel/language/csimple/csimple.json | 2 +-
.../modules/languages/pages/csimple-language.adoc | 11 +-
.../language/csimple/CSimpleCodeGenerator.java | 1 +
.../camel/language/csimple/CSimpleCompiler.java | 1 +
.../camel/language/csimple/CSimpleException.java | 1 +
.../camel/language/csimple/CSimpleExpression.java | 1 +
.../language/csimple/CSimpleExpressionParser.java | 1 +
.../language/csimple/CSimpleGeneratedCode.java | 1 +
.../camel/language/csimple/CSimpleHelper.java | 1 +
.../camel/language/csimple/CSimpleLanguage.java | 1 +
.../camel/language/csimple/CSimpleMethod.java | 1 +
.../language/csimple/CSimplePredicateParser.java | 1 +
.../camel/language/csimple/CSimpleSupport.java | 1 +
.../org/apache/camel/model/language/csimple.json | 2 +-
.../java/org/apache/camel/builder/Builder.java | 6 +
.../org/apache/camel/builder/BuilderSupport.java | 6 +
.../org/apache/camel/builder/ExpressionClause.java | 6 +
.../camel/builder/ExpressionClauseSupport.java | 14 +-
.../camel/builder/LanguageBuilderFactory.java | 6 +
.../camel/model/language/CSimpleExpression.java | 5 +-
.../reifier/language/CSimpleExpressionReifier.java | 1 +
.../org/apache/camel/main/components.properties | 1 +
.../ROOT/examples/json/spring-ai-image.json | 1 +
docs/components/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/spring-ai-image-component.adoc | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_19.adoc | 35 ++
.../component/ComponentsBuilderFactory.java | 13 +
.../dsl/SpringAiImageComponentBuilderFactory.java | 257 ++++++++++++
.../component/dsl/SshComponentBuilderFactory.java | 83 ++++
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 40 ++
.../dsl/MinaSftpEndpointBuilderFactory.java | 81 ++--
.../endpoint/dsl/SftpEndpointBuilderFactory.java | 51 +--
.../dsl/SpringAiChatEndpointBuilderFactory.java | 253 ++++++++++++
.../dsl/SpringAiImageEndpointBuilderFactory.java | 454 +++++++++++++++++++++
.../endpoint/dsl/SshEndpointBuilderFactory.java | 438 ++++++++++++++++++++
.../camel-component-known-dependencies.properties | 1 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../generated/resources/schema/camelYamlDsl.json | 1 +
parent/pom.xml | 26 +-
.../infra/kafka/services/StrimziContainer.java | 10 +-
.../services/McpEverythingSseInfraService.java | 29 +-
...McpEverythingSseLocalContainerInfraService.java | 118 ++++++
.../services/McpEverythingSseService.java | 19 +-
.../services/McpEverythingSseServiceFactory.java | 41 +-
.../services/MilvusLocalContainerInfraService.java | 1 +
.../infra/milvus/services/container.properties | 2 +-
.../apache/camel/maven/packaging/MojoHelper.java | 1 +
.../camel/generator/openapi/OperationVisitor.java | 3 +
158 files changed, 5439 insertions(+), 2065 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ai-image.json
copy components/{camel-csimple-joor => camel-ftp-common}/pom.xml (54%)
copy
components/{camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
=>
camel-ftp-common/src/main/java/org/apache/camel/component/file/remote/AbstractSftpConsumer.java}
(82%)
copy
components/{camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
=>
camel-ftp-common/src/main/java/org/apache/camel/component/file/remote/BaseSftpConfiguration.java}
(61%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/FtpConstants.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
(88%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileOperations.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducerHealthCheck.java
(100%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/SftpDefaultMoveExistingFileStrategy.java
(98%)
rename components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/SftpRemoteFile.java
(100%)
copy components/{camel-ftp =>
camel-ftp-common}/src/main/java/org/apache/camel/component/file/remote/SftpRemoteFileSingle.java
(100%)
delete mode 100644
components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpDefaultMoveExistingFileStrategy.java
delete mode 100644
components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpRemoteFileSingle.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/main/java/org/apache/camel/component/springai/chat/mcp/SpringAiChatMcpManager.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatMcpIT.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatMcpSseIT.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatStructuredOutputValidationIT.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolBeanDiscoveryIT.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolContextIT.java
copy components/{camel-csimple-joor =>
camel-spring-parent/camel-spring-ai/camel-spring-ai-image}/pom.xml (62%)
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/java/org/apache/camel/component/springai/image/SpringAiImageComponentConfigurer.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/java/org/apache/camel/component/springai/image/SpringAiImageConfigurationConfigurer.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/java/org/apache/camel/component/springai/image/SpringAiImageConverterLoader.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/java/org/apache/camel/component/springai/image/SpringAiImageEndpointConfigurer.java
copy
components/camel-spring-parent/camel-spring-ai/{camel-spring-ai-chat/src/generated/java/org/apache/camel/component/springai/chat/SpringAiChatEndpointUriFactory.java
=>
camel-spring-ai-image/src/generated/java/org/apache/camel/component/springai/image/SpringAiImageEndpointUriFactory.java}
(54%)
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/org/apache/camel/component/springai/image/spring-ai-image.json
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/component.properties
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/component/spring-ai-image
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.springai.image.SpringAiImageConfiguration
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/configurer/spring-ai-image-component
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/configurer/spring-ai-image-endpoint
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/generated/resources/META-INF/services/org/apache/camel/urifactory/spring-ai-image-endpoint
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/docs/spring-ai-image-component.adoc
copy
components/{camel-telemetry/src/main/java/org/apache/camel/telemetry/decorators/SedaSpanDecorator.java
=>
camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImage.java}
(71%)
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImageComponent.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImageConfiguration.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImageConverter.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImageEndpoint.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImageHeaders.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/main/java/org/apache/camel/component/springai/image/SpringAiImageProducer.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/test/java/org/apache/camel/component/springai/image/SpringAiImageOllamaIT.java
create mode 100644
components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/test/resources/log4j2.properties
create mode 100644
components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshConnectionPropertiesTest.java
create mode 120000
docs/components/modules/ROOT/examples/json/spring-ai-image.json
create mode 120000
docs/components/modules/ROOT/pages/spring-ai-image-component.adoc
create mode 100644
dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringAiImageComponentBuilderFactory.java
create mode 100644
dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringAiImageEndpointBuilderFactory.java
copy
core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleGeneratedCode.java
=>
test-infra/camel-test-infra-mcp-everything/src/main/java/org/apache/camel/test/infra/mcp/everything/services/McpEverythingSseInfraService.java
(63%)
create mode 100644
test-infra/camel-test-infra-mcp-everything/src/main/java/org/apache/camel/test/infra/mcp/everything/services/McpEverythingSseLocalContainerInfraService.java
copy
components/camel-telemetry/src/main/java/org/apache/camel/telemetry/decorators/SedaSpanDecorator.java
=>
test-infra/camel-test-infra-mcp-everything/src/main/java/org/apache/camel/test/infra/mcp/everything/services/McpEverythingSseService.java
(66%)
rename
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpRemoteFileSingle.java
=>
test-infra/camel-test-infra-mcp-everything/src/main/java/org/apache/camel/test/infra/mcp/everything/services/McpEverythingSseServiceFactory.java
(53%)
