[ https://issues.apache.org/jira/browse/CAMEL-12383?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16462798#comment-16462798 ]
ASF GitHub Bot commented on CAMEL-12383: ---------------------------------------- onderson closed pull request #2315: CAMEL-12383 - changes regarding SB 2.0 upgrade URL: https://github.com/apache/camel/pull/2315 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties index 24b20c142d7..2c1eb8d01ba 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -34,8 +34,6 @@ timer.period = 2000 # expose actuator endpoint via HTTP management.endpoints.web.exposure.include=info,health,camelroutes -# all access to actuator endpoints without security -management.security.enabled = false # turn on actuator health check management.endpoint.health.enabled = true diff --git a/components/camel-spring-boot/src/test/resources/application.properties b/components/camel-spring-boot/src/test/resources/application.properties index 518bcd18cd3..4271cf9693d 100644 --- a/components/camel-spring-boot/src/test/resources/application.properties +++ b/components/camel-spring-boot/src/test/resources/application.properties @@ -15,7 +15,7 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -spring.main.banner_mode=off +spring.main.banner-mode=off from=direct:test to=mock:test diff --git a/examples/camel-example-rabbitmq/src/main/resources/application.properties b/examples/camel-example-rabbitmq/src/main/resources/application.properties index cd4dc76e496..613e5f80f35 100644 --- a/examples/camel-example-rabbitmq/src/main/resources/application.properties +++ b/examples/camel-example-rabbitmq/src/main/resources/application.properties @@ -28,8 +28,6 @@ camel.springboot.name = SampleCamel # properties used in the Camel route and beans # -------------------------------------------- -# all access to actuator endpoints without security -management.security.enabled = false # turn on actuator health check management.endpoint.health.enabled = true diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties index 52314b288e9..fbaf9c14c33 100644 --- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties @@ -28,7 +28,7 @@ management.endpoints.enabled-by-default = false management.endpoints.jmx.enabled = false management.endpoint.health.enabled = true -management.port = -1 +management.server.port = -1 node.id = ${random.uuid} diff --git a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties index ae3be62954f..e22e0d2be0d 100644 --- a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties @@ -28,8 +28,6 @@ management.endpoint.mappings.enabled = true management.endpoint.health.enabled = true management.endpoint.camelhealthchecks.enabled = true -management.security.enabled = false - camel.springboot.name = SampleHealthChecks ################################################################################ diff --git a/examples/camel-example-spring-boot-master/src/main/resources/application.properties b/examples/camel-example-spring-boot-master/src/main/resources/application.properties index 9f09fb45c42..26ee85da5ae 100644 --- a/examples/camel-example-spring-boot-master/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-master/src/main/resources/application.properties @@ -29,7 +29,7 @@ management.endpoints.enabled-by-default = false management.endpoints.jmx.enabled = false management.endpoint.health.enabled = true -management.port = -1 +management.server.port = -1 node.id = ${random.uuid} node.namespace = camel-master diff --git a/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties b/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties index 63741bdf4a7..4a8a2e98d2b 100644 --- a/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties @@ -38,8 +38,6 @@ management.endpoint.health.enabled = true # turn off read-only so we can stop/start the Camel routes management.endpoint.camelroutes.read-only = false -management.security.enabled = false - camel.springboot.name = SampleSupervisingRouteController camel.supervising.controller.enabled = true diff --git a/examples/camel-example-spring-boot-xml/src/main/resources/application.properties b/examples/camel-example-spring-boot-xml/src/main/resources/application.properties index 49a5e9fabb3..b4088ad9b23 100644 --- a/examples/camel-example-spring-boot-xml/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-xml/src/main/resources/application.properties @@ -34,8 +34,6 @@ greeting = Hello World # how often to trigger the timer timer.period = 2000 -# all access to actuator endpoints without security -management.security.enabled = false # turn on actuator health check management.endpoint.health.enabled = true ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Spring Boot 2 - Migrate application.properties to new names > ----------------------------------------------------------- > > Key: CAMEL-12383 > URL: https://issues.apache.org/jira/browse/CAMEL-12383 > Project: Camel > Issue Type: Sub-task > Reporter: Claus Ibsen > Assignee: Önder Sezgin > Priority: Major > Fix For: 2.22.0 > > > Some of the properties in the application.properties | yaml file has new > names. We should migrate to use the newer names. > https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.0-Migration-Guide -- This message was sent by Atlassian JIRA (v7.6.3#76005)