This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4f87cce Upgrade Spring Data Commons to version 1.13.11.RELEASE new 91b8f39 CAMEL-11956: Upgrade to Spring 5.x new 03779d8 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new 07f3162 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new af052b6 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new 3a248b3 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new 3310703 CAMEL-12363: Upgrade to spring-batch 4.0.1 new 4ad3bc9 Regen new e56c5b1 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new 9b520d7 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new 208a134 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new c9c39ae Upgrade consul to 1.0.6 new c34268b CAMEL-11430: Migrate to Spring Boot 2 - work in progress new c222528 CAMEL-11650 - Use Hibernate Validator 6.x where possible new e3640f4 CAMEL-11430: Migrate to Spring Boot 2 - work in progress new 69276b3 Fix camel-itest-spring-boot 2 new 5afce0b Ignore non-ga modules and re-add reactor new e5373c0 CAMEL-11430: Spring Boot 2 - Add Camel info contributor to /actuator/info to show Camel information. new 31f7c59 CAMEL-12380: remove spring-boot 1.5.x property resolvers new f2f6343 CAMEL-12377: fix example SQL init script new eeb8357 CAMEL-12373: Spring Boot 2 - Ported route-dump, read-only mode and some unit tests for camel actuator endpoints new 0dab0cd Restored some UTs running fine new ac2cb19 CAMEL-12373: Allow route dump only when !read-only new ae71adf CAMEL-12373: Adjusted to SB2 actuator endpoint property names (endpoints.* => management.endpoint*) new e528386 Fix CI build style error new 7aa10ad Align spring-cloud-commons, spring-cloud-netflix and spring-cloud-consul version with Finchley.M9 release train new fd7226f upgrade hibernate-validator new cb72f5a CAMEL-12378: Spring Boot 2 - Fix the camel-example-spring-cloud-servicecall new cf47355 CAMEL-12378: Use undertow for serviceCall as well new be8bcfc CAMEL-12378: Exclude spring-boot-starter-tomcat to get it work with undertow new 3ace0e0 CAMEL-12396: Use $simple{} instead to avoid spring to evaluate Camel simple expression in the property new dc68a82 CAMEL-12387: update main spring-boot documentation new ef50900 CAMEL-12387: small updates to spring-boot examples documentation new 6936f4e CAMEL-12423: Upgrade to spring-boot 2.0.1 new 7d334a3 CAMEL-12423: Upgrade spring 4.x and 5.x too new 21a4dff CAMEL-12362: Upgrade to Apache Karaf 4.2.0 new 5e0be36 CAMEL-12430: Fixed Karaf tests due wrong spring range in camel-spring new 25c8c8f CAMEL-12430: Fixed Karaf tests to use javax validation v1 api new 7a19d76 CAMEL-12430: Fixed Karaf test of spring-ldap new 486e4c5 CAMEL-12430: Added missing JAR in karaf new 8d8baf5 CAMEL-12423: Upgrade to spring-boot 2.0.1 new b42e542 Spring Boot examples that uses undertow should exclude tomcat The 41 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: apache-camel/pom.xml | 4 - apache-camel/src/main/descriptors/common-bin.xml | 1 - .../src/main/resources/archetype-resources/pom.xml | 6 + bom/camel-bom/pom.xml | 5 - components/camel-bean-validator/pom.xml | 166 +++---- .../bean/validator/BeanValidatorRouteTest.java | 6 +- components/camel-cm-sms/pom.xml | 8 +- .../src/main/docs/cm-sms-component.adoc | 20 +- components/camel-quartz/pom.xml | 2 +- components/camel-spring-boot/pom.xml | 2 +- .../src/main/docs/spring-boot.adoc | 33 +- .../actuate/endpoint/AbstractCamelMvcEndpoint.java | 111 ----- .../actuate/endpoint/CamelHealthCheckEndpoint.java | 180 -------- .../CamelHealthCheckEndpointAutoConfiguration.java | 67 --- .../endpoint/CamelHealthCheckMvcEndpoint.java | 103 ----- .../endpoint/CamelRouteControllerEndpoint.java | 20 +- ...elRouteControllerEndpointAutoConfiguration.java | 27 +- .../endpoint/CamelRouteControllerMvcEndpoint.java | 31 -- .../boot/actuate/endpoint/CamelRoutesEndpoint.java | 483 +++++++++++++++++++-- .../CamelRoutesEndpointAutoConfiguration.java | 27 +- .../actuate/endpoint/CamelRoutesMvcEndpoint.java | 243 ----------- .../health/CamelHealthAutoConfiguration.java | 32 +- .../actuate/health/CamelHealthCheckIndicator.java | 68 --- ...CamelHealthCheckIndicatorAutoConfiguration.java | 92 ---- .../CamelHealthCheckIndicatorConfiguration.java | 72 --- .../actuate/health/CamelHealthConfiguration.java | 36 -- .../boot/actuate/health/CamelHealthIndicator.java | 8 +- .../info/CamelInfoAutoConfiguration.java} | 26 +- .../CamelInfoContributor.java} | 30 +- .../boot/security/CamelSSLAutoConfiguration.java | 8 +- .../boot/util/HierarchicalPropertiesEvaluator.java | 13 +- .../additional-spring-configuration-metadata.json | 18 +- .../src/main/resources/META-INF/spring.factories | 6 +- .../boot/actuate/endpoint/ActuatorTestRoute.java | 4 - .../CamelEndpointsGloballyDisabledTest.java | 22 +- .../CamelHealthCheckEndpointDisabledTest.java | 48 -- ...ckEndpointGloballyDisabledAndReenabledTest.java | 49 --- .../endpoint/CamelHealthCheckEndpointTest.java | 121 ------ .../CamelRouteControllerEndpointDisabledTest.java | 14 +- ...erEndpointGloballyDisabledAndReenabledTest.java | 17 +- .../endpoint/CamelRouteControllerEndpointTest.java | 10 +- .../CamelRouteControllerMvcEndpointTest.java | 65 --- .../endpoint/CamelRoutesEndpointDisabledTest.java | 12 +- ...esEndpointGloballyDisabledAndReenabledTest.java | 17 +- .../actuate/endpoint/CamelRoutesEndpointTest.java | 32 +- .../CamelRoutesEndpointWriteOperationTest.java | 85 ++++ .../endpoint/CamelRoutesMvcEndpointTest.java | 89 ---- .../CamelInfoTest.java} | 24 +- .../CamelCloudServiceCallSimpleExpressionTest.java | 3 +- components/camel-spring-cloud-netflix/pom.xml | 22 +- components/camel-spring-cloud/pom.xml | 17 +- .../cloud/CamelSpringCloudDiscoveryClient.java | 2 +- .../camel/component/redis/RedisConsumerTest.java | 17 - ...ProducerWss4JSecurityHeaderTestInterceptor.java | 2 +- components/camel-spring/pom.xml | 2 +- components/camel-test-spring/pom.xml | 2 +- examples/camel-example-rabbitmq/pom.xml | 6 + .../src/main/resources/application.properties | 2 +- examples/camel-example-rest-producer/pom.xml | 6 + .../cluster-node/pom.xml | 10 +- .../examples/cluster/ClusterNodeConfiguration.java | 21 - .../src/main/resources/application.properties | 8 +- .../camel-example-spring-boot-geocoder/README.adoc | 8 +- .../application/pom.xml | 6 + .../src/main/resources/application.properties | 8 +- .../service/pom.xml | 6 + .../service/src/main/bash/consul-run-linux.sh | 2 +- .../service/src/main/bash/consul-run-osx.sh | 2 +- .../src/main/resources/application.properties | 4 +- examples/camel-example-spring-boot-master/pom.xml | 10 +- .../examples/master/MasterNodeConfiguration.java | 21 - .../src/main/resources/application.properties | 8 +- .../camel-example-spring-boot-rest-jpa/pom.xml | 6 + .../example/spring/boot/rest/jpa/Application.java | 5 +- .../example/spring/boot/rest/jpa/Database.java | 2 +- .../example/spring/boot/rest/jpa/OrderService.java | 2 +- .../src/main/resources/data.sql | 6 +- .../README.adoc | 13 +- .../camel-example-spring-boot-rest-swagger/pom.xml | 6 + .../consumer/pom.xml | 10 +- .../src/main/resources/application.properties | 4 +- .../services/src/main/bash/consul-run-osx.sh | 2 +- .../src/main/resources/application.properties | 4 +- .../pom.xml | 6 + .../src/main/resources/application.properties | 12 +- examples/camel-example-spring-boot-xml/pom.xml | 6 + .../src/main/resources/application.properties | 2 +- examples/camel-example-spring-boot/pom.xml | 8 +- .../src/main/resources/application.properties | 17 +- .../consumer/pom.xml | 22 +- .../src/main/resources/application.properties | 6 +- .../camel-example-spring-cloud-servicecall/pom.xml | 14 +- .../service/pom.xml | 4 + .../service/src/main/bash/consul-run-linux.sh | 2 +- .../service/src/main/bash/consul-run-osx.sh | 2 +- .../src/main/resources/application.properties | 4 +- examples/camel-example-twitter-salesforce/pom.xml | 6 + .../camel-example-validator-spring-boot/pom.xml | 6 + parent/pom.xml | 69 +-- platforms/commands/commands-spring-boot/README.md | 34 -- platforms/commands/commands-spring-boot/pom.xml | 56 --- .../commands/crsh/ArgumentCamelContext.java | 31 -- .../springboot/commands/crsh/ArgumentRouteID.java | 31 -- .../commands/crsh/CamelCommandsFacade.java | 132 ------ .../commands/crsh/CamelCommandsPlugin.java | 56 --- .../springboot/commands/crsh/CamelCompleter.java | 71 --- .../commands/crsh/CamelControllerImpl.java | 83 ---- .../springboot/commands/crsh/NoopStringEscape.java | 34 -- .../springboot/commands/crsh/OutputBuffer.java | 51 --- .../META-INF/services/org.crsh.plugin.CRaSHPlugin | 17 - .../resources/crash/commands/camel/camel.groovy | 251 ----------- platforms/commands/pom.xml | 1 - .../karaf/features/src/main/resources/features.xml | 34 +- .../components-starter/camel-amqp-starter/pom.xml | 8 - .../components-starter/camel-bam-starter/pom.xml | 8 - .../components-starter/camel-cxf-starter/pom.xml | 8 - .../camel-cxf-transport-starter/pom.xml | 8 - .../components-starter/camel-drill-starter/pom.xml | 8 - .../components-starter/camel-elsql-starter/pom.xml | 8 - .../HazelcastComponentAutoConfiguration.java | 8 +- .../components-starter/camel-jms-starter/pom.xml | 8 - .../components-starter/camel-jpa-starter/pom.xml | 8 - .../camel-kubernetes-starter/pom.xml | 8 +- .../camel-spring-batch-starter/pom.xml | 8 - .../camel-spring-cloud-netflix-starter/pom.xml | 12 + .../camel-spring-cloud-starter/pom.xml | 20 +- .../camel-spring-integration-starter/pom.xml | 8 - .../camel-spring-javaconfig-starter/pom.xml | 8 - .../camel-spring-redis-starter/pom.xml | 8 - .../camel-spring-starter/pom.xml | 8 - .../components-starter/camel-sql-starter/pom.xml | 8 - .../camel-swagger-java-starter/pom.xml | 8 +- .../camel-undertow-starter/pom.xml | 4 + .../pom.xml | 13 +- .../camel-spring-boot-dependencies/pom.xml | 10 - platforms/spring-boot/spring-boot-dm/pom.xml | 2 +- .../apache/camel/itest/springboot/ITestConfig.java | 2 +- .../itest/springboot/CamelCassandraqlTest.java | 2 + .../camel/itest/springboot/CamelHbaseTest.java | 1 + .../camel/itest/springboot/CamelJetty9Test.java | 2 +- .../itest/springboot/CamelKubernetesTest.java | 2 +- .../camel/itest/springboot/CamelMongodb3Test.java | 2 + .../itest/springboot/CamelMongodbGridfsTest.java | 2 + .../camel/itest/springboot/CamelMongodbTest.java | 2 + .../itest/springboot/CamelNetty4HttpTest.java | 4 +- .../camel/itest/springboot/CamelNettyTest.java | 2 +- .../camel/itest/springboot/CamelReactorTest.java | 2 - .../itest/springboot/CamelRestSwaggerTest.java | 2 + .../camel/itest/springboot/CamelRestletTest.java | 2 +- .../springboot/CamelSpringCloudNetflixTest.java | 2 + .../itest/springboot/CamelSpringCloudTest.java | 2 + .../itest/springboot/CamelSwaggerJavaTest.java | 2 +- .../camel/itest/springboot/CamelUndertowTest.java | 4 +- .../itest/springboot/util/ArquillianPackager.java | 14 +- ...ication-pom-sb1.xml => application-pom-sb2.xml} | 0 .../packaging/SpringBootAutoConfigurationMojo.java | 8 +- .../spring-boot-fix-dependencies.properties | 6 +- 157 files changed, 1167 insertions(+), 2981 deletions(-) delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/AbstractCamelMvcEndpoint.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelHealthCheckEndpoint.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelHealthCheckEndpointAutoConfiguration.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelHealthCheckMvcEndpoint.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerMvcEndpoint.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesMvcEndpoint.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicatorAutoConfiguration.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicatorConfiguration.java delete mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthConfiguration.java copy components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/{cloud/CamelCloudAutoConfiguration.java => actuate/info/CamelInfoAutoConfiguration.java} (58%) rename components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/{endpoint/AbstractCamelEndpoint.java => info/CamelInfoContributor.java} (52%) delete mode 100644 components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelHealthCheckEndpointDisabledTest.java delete mode 100644 components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelHealthCheckEndpointGloballyDisabledAndReenabledTest.java delete mode 100644 components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelHealthCheckEndpointTest.java delete mode 100644 components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerMvcEndpointTest.java create mode 100644 components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java delete mode 100644 components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesMvcEndpointTest.java rename components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/{health/CamelHealthDisabledTest.java => info/CamelInfoTest.java} (69%) delete mode 100644 platforms/commands/commands-spring-boot/README.md delete mode 100644 platforms/commands/commands-spring-boot/pom.xml delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentCamelContext.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentRouteID.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsPlugin.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCompleter.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelControllerImpl.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/NoopStringEscape.java delete mode 100644 platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java delete mode 100755 platforms/commands/commands-spring-boot/src/main/resources/META-INF/services/org.crsh.plugin.CRaSHPlugin delete mode 100644 platforms/commands/commands-spring-boot/src/main/resources/crash/commands/camel/camel.groovy copy tests/camel-itest-spring-boot/src/test/resources/{application-pom-sb1.xml => application-pom-sb2.xml} (100%) -- To stop receiving notification emails like this one, please contact davscl...@apache.org.