This is an automated email from the ASF dual-hosted git repository. tcunning pushed a commit to branch spring-boot-4.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 5c28156659ecdac06d13640a66050ae501a60dc0 Merge: 97db0a63ba8 a409d340edd Author: Tom Cunningham <[email protected]> AuthorDate: Tue Feb 10 05:17:06 2026 -0500 Merge remote-tracking branch 'upstream/main' into spring-boot-4.0 camel-spring-boot-sbom/camel-spring-boot-sbom.json | 20938 ++++++++++--------- camel-spring-boot-sbom/camel-spring-boot-sbom.xml | 16005 +++++++------- .../beans/LevelDBAggregationRepository.json | 4 +- .../camel/springboot/catalog/components.properties | 2 + .../catalog/components/azure-storage-blob.json | 140 +- .../springboot/catalog/components/coap+tcp.json | 24 +- .../camel/springboot/catalog/components/coap.json | 24 +- .../springboot/catalog/components/coaps+tcp.json | 24 +- .../camel/springboot/catalog/components/coaps.json | 24 +- .../springboot/catalog/components/github.json | 2 +- .../components/{github.json => github2.json} | 80 +- .../catalog/components/langchain4j-tools.json | 17 +- .../springboot/catalog/components/mina-sftp.json | 194 + .../springboot/catalog/components/vertx-http.json | 60 +- .../springboot/catalog/dev-consoles.properties | 1 + .../{simple-language.json => eval-language.json} | 8 +- .../catalog/dev-consoles/simple-language.json | 2 +- .../camel/springboot/catalog/languages/file.json | 35 +- .../camel/springboot/catalog/languages/simple.json | 231 +- .../camel/springboot/catalog/others.properties | 1 + .../camel/springboot/catalog/others/github2.json | 14 + .../camel/springboot/catalog/others/leveldb.json | 2 +- .../camel/springboot/catalog/others/yaml-dsl.json | 2 +- .../src/main/docs/azure-storage-blob.json | 39 + .../springboot/BlobComponentConfiguration.java | 89 + .../camel-coap-starter/src/main/docs/coap.json | 6 + .../springboot/CoAPComponentAutoConfiguration.java | 2 +- .../springboot/CoAPComponentConfiguration.java | 14 + .../coap/springboot/CoAPComponentConverter.java | 63 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 3 +- .../camel-core-starter/src/main/docs/core.json | 14 + .../springboot/FileLanguageConfiguration.java | 13 + .../springboot/SimpleLanguageConfiguration.java | 13 + .../pom.xml | 14 +- .../src/main/docs/github2.json} | 60 +- .../GitHub2ComponentAutoConfiguration.java} | 20 +- .../springboot/GitHub2ComponentConfiguration.java} | 76 +- .../src/main/resources/META-INF/LICENSE.txt | 203 + .../src/main/resources/META-INF/NOTICE.txt | 11 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 3 +- .../camel-google-vertexai-starter/pom.xml | 8 - .../pom.xml | 22 +- .../src/main/docs/mina-sftp.json} | 48 +- .../MinaSftpComponentAutoConfiguration.java} | 20 +- .../MinaSftpComponentConfiguration.java} | 52 +- .../src/main/resources/META-INF/LICENSE.txt | 203 + .../src/main/resources/META-INF/NOTICE.txt | 11 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 3 +- .../file/remote/mina/springboot/BaseMinaSftp.java | 129 + .../MinaSftpComponentAutoConfigurationTest.java | 59 + .../MinaSftpConfigurationPropertiesTest.java | 67 + .../mina/springboot/MinaSftpEmbeddedService.java | 202 + .../springboot/MinaSftpEndpointOptionsTest.java | 112 + .../springboot/MinaSftpSimpleProducerTest.java | 83 + .../src/test/resources/hostkey.pem | 15 + .../src/test/resources/log4j2.properties | 21 + .../src/main/docs/platform-http.adoc | 63 + .../src/main/docs/platform-http.json | 12 + .../customizer/UndertowAccessLogConfiguration.java | 61 + .../customizer/UndertowAccessLogProperties.java | 39 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 3 +- .../src/main/docs/vertx-http.json | 6 + .../VertxHttpComponentConfiguration.java | 15 + components-starter/pom.xml | 2 + pom.xml | 2 +- tooling/camel-spring-boot-bom/pom.xml | 10 + tooling/camel-spring-boot-dependencies/pom.xml | 88 +- 67 files changed, 21237 insertions(+), 18596 deletions(-) diff --cc components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 0fff74df9c7,c2b81150523..593bfea24c8 --- a/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@@ -19,8 -19,5 +19,9 @@@ org.apache.camel.component.platform.htt org.apache.camel.component.platform.http.springboot.PlatformHttpComponentAutoConfiguration org.apache.camel.component.platform.http.springboot.SpringBootPlatformHttpAutoConfiguration org.apache.camel.component.platform.http.springboot.SpringBootPlatformWebMvcConfiguration -org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow.UndertowMetricsAutoConfiguration -org.apache.camel.component.platform.http.springboot.customizer.UndertowAccessLogConfiguration +## TODO reintroduce once spring-boot-starter-undertow will be available +## AND CHERRY PICK +## https://github.com/apache/camel-spring-boot/commit/1bb2b737a4cc1301945a1084e5a5cbb2e4744690 +## https://github.com/apache/camel-spring-boot/commit/16e8983051d473638701edcbb8b333022ac2eb90 - ##org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow.UndertowMetricsAutoConfiguration ++##org.apache.camel.component.platform.http.springboot.actuate.metrics.undertow.UndertowMetricsAutoConfiguration ++##org.apache.camel.component.platform.http.springboot.customizer.UndertowAccessLogConfiguration
