This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2799c318c61fac88c7643c71946466c891e74f60
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Dec 17 11:25:13 2023 +0100
Make spring core work
---
core/camel-spring-boot-xml/pom.xml | 2 -
core/camel-spring-boot/pom.xml | 18 ++---
.../src/main/docs/spring-boot.json | 82 ----------------------
3 files changed, 7 insertions(+), 95 deletions(-)
diff --git a/core/camel-spring-boot-xml/pom.xml
b/core/camel-spring-boot-xml/pom.xml
index 2d3789d295f..68901a2d046 100644
--- a/core/camel-spring-boot-xml/pom.xml
+++ b/core/camel-spring-boot-xml/pom.xml
@@ -35,8 +35,6 @@
<properties>
<firstVersion>3.9.0</firstVersion>
<label>spring,microservice</label>
-
- <camel.osgi.export.pkg />
</properties>
<dependencies>
diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml
index 139831b828e..c547518b152 100644
--- a/core/camel-spring-boot/pom.xml
+++ b/core/camel-spring-boot/pom.xml
@@ -35,15 +35,12 @@
<properties>
<firstVersion>2.15.0</firstVersion>
<label>spring,microservice</label>
-
- <camel.osgi.export.pkg />
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <optional>true</optional>
<version>${spring-boot-version}</version>
</dependency>
<dependency>
@@ -70,6 +67,13 @@
<optional>true</optional>
<version>${spring-boot-version}</version>
</dependency>
+ <!-- Optional Spring web support -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot-version}</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -96,14 +100,6 @@
<artifactId>camel-health</artifactId>
</dependency>
- <!-- Optional Spring web support -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>${spring-boot-version}</version>
- <optional>true</optional>
- </dependency>
-
<!-- Testing dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index b9e376152cf..bf93927937f 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -957,88 +957,6 @@
"sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
"defaultValue": 1000
},
- {
- "name": "camel.springboot.route-controller-back-off-delay",
- "type": "java.lang.Long",
- "description": "Backoff delay in millis when restarting a route that
failed to startup.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 2000
- },
- {
- "name": "camel.springboot.route-controller-back-off-max-attempts",
- "type": "java.lang.Long",
- "description": "Backoff maximum number of attempts to restart a route
that failed to startup. When this threshold has been exceeded then the
controller will give up attempting to restart the route, and the route will
remain as stopped.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 0
- },
- {
- "name": "camel.springboot.route-controller-back-off-max-delay",
- "type": "java.lang.Long",
- "description": "Backoff maximum delay in millis when restarting a route
that failed to startup.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 0
- },
- {
- "name": "camel.springboot.route-controller-back-off-max-elapsed-time",
- "type": "java.lang.Long",
- "description": "Backoff maximum elapsed time in millis, after which the
backoff should be considered exhausted and no more attempts should be made.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 0
- },
- {
- "name": "camel.springboot.route-controller-back-off-multiplier",
- "type": "java.lang.Double",
- "description": "Backoff multiplier to use for exponential backoff. This
is used to extend the delay between restart attempts.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 1
- },
- {
- "name": "camel.springboot.route-controller-exclude-routes",
- "type": "java.lang.String",
- "description": "Pattern for filtering routes to be included as
supervised. The pattern is matching on route id, and endpoint uri for the
route. Multiple patterns can be separated by comma. For example to include all
kafka routes, you can say <tt>kafka:*<\/tt>. And to include routes with
specific route ids <tt>myRoute,myOtherRoute<\/tt>. The pattern supports
wildcards and uses the matcher from
org.apache.camel.support.PatternHelper#matchPattern.",
- "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
- },
- {
- "name": "camel.springboot.route-controller-include-routes",
- "type": "java.lang.String",
- "description": "Pattern for filtering routes to be excluded as
supervised. The pattern is matching on route id, and endpoint uri for the
route. Multiple patterns can be separated by comma. For example to exclude all
JMS routes, you can say <tt>jms:*<\/tt>. And to exclude routes with specific
route ids <tt>mySpecialRoute,myOtherSpecialRoute<\/tt>. The pattern supports
wildcards and uses the matcher from
org.apache.camel.support.PatternHelper#matchPattern.",
- "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
- },
- {
- "name": "camel.springboot.route-controller-initial-delay",
- "type": "java.lang.Long",
- "description": "Initial delay in milli seconds before the route
controller starts, after CamelContext has been started.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 0
- },
- {
- "name": "camel.springboot.route-controller-supervise-enabled",
- "type": "java.lang.Boolean",
- "description": "To enable using supervising route controller which
allows Camel to startup and then the controller takes care of starting the
routes in a safe manner. This can be used when you want to startup Camel
despite a route may otherwise fail fast during startup and cause Camel to fail
to startup as well. By delegating the route startup to the supervising route
controller then it manages the startup using a background thread. The
controller allows to be configured with vario [...]
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": false
- },
- {
- "name": "camel.springboot.route-controller-thread-pool-size",
- "type": "java.lang.Integer",
- "description": "The number of threads used by the route controller
scheduled thread pool that are used for restarting routes. The pool uses 1
thread by default, but you can increase this to allow the controller to
concurrently attempt to restart multiple routes in case more than one route has
problems starting.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": 1
- },
- {
- "name": "camel.springboot.route-controller-unhealthy-on-exhausted",
- "type": "java.lang.Boolean",
- "description": "Whether to mark the route as unhealthy (down) when all
restarting attempts (backoff) have failed and the route is not successfully
started and the route manager is giving up. Setting this to true allows health
checks to know about this and can report the Camel application as DOWN. The
default is false.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": false
- },
- {
- "name": "camel.springboot.route-controller-unhealthy-on-restarting",
- "type": "java.lang.Boolean",
- "description": "Whether to mark the route as unhealthy (down) when the
route failed to initially start, and is being controlled for restarting
(backoff). Setting this to true allows health checks to know about this and can
report the Camel application as DOWN. The default is false.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "defaultValue": false
- },
{
"name": "camel.springboot.route-filter-exclude-pattern",
"type": "java.lang.String",
