You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/11/30 20:30:07 UTC
[camel-spring-boot] branch main updated (112bf1f -> 37f28b6)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from 112bf1f [create-pull-request] automated change
new b173739 Regen
new 37f28b6 CAMEL-15133: camel-health - Resolve health-checks from classpath and make it friendlier to provide custom health checks.
The 2 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:
.../camel/springboot/catalog/components/atlasmap.json | 1 +
core/camel-spring-boot/src/main/docs/spring-boot.json | 7 +++++++
.../spring/boot/CamelConfigurationProperties.java | 5 +++++
tooling/camel-spring-boot-dependencies/pom.xml | 19 -------------------
4 files changed, 13 insertions(+), 19 deletions(-)
[camel-spring-boot] 02/02: CAMEL-15133: camel-health - Resolve health-checks from classpath and make it friendlier to provide custom health checks.
Posted by da...@apache.org.
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 37f28b6b596708fd425340e93f4801771e7920d1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Nov 30 21:11:59 2021 +0100
CAMEL-15133: camel-health - Resolve health-checks from classpath and make it friendlier to provide custom health checks.
---
core/camel-spring-boot/src/main/docs/spring-boot.json | 4 +++-
.../org/apache/camel/spring/boot/CamelConfigurationProperties.java | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
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 8a2890b..a602406 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -688,7 +688,9 @@
{
"name": "camel.springboot.load-health-checks",
"type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
+ "description": "Whether to load custom health checks by scanning classpath.",
+ "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties",
+ "defaultValue": false
},
{
"name": "camel.springboot.load-type-converters",
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index e8e4d74..2898af9 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -137,6 +137,11 @@ public class CamelConfigurationProperties extends DefaultConfigurationProperties
private boolean loadTypeConverters = true;
/**
+ * Whether to load custom health checks by scanning classpath.
+ */
+ private boolean loadHealthChecks;
+
+ /**
* Directory to load additional configuration files that contains
* configuration values that takes precedence over any other configuration.
* This can be used to refer to files that may have secret configuration that
[camel-spring-boot] 01/02: Regen
Posted by da...@apache.org.
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 b173739c01adceaee2ab4a45bc62c768b9646093
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Nov 30 20:21:31 2021 +0100
Regen
---
.../camel/springboot/catalog/components/atlasmap.json | 1 +
core/camel-spring-boot/src/main/docs/spring-boot.json | 5 +++++
tooling/camel-spring-boot-dependencies/pom.xml | 19 -------------------
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
index f6e50a4..d0c4571 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
@@ -31,6 +31,7 @@
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will [...]
"allowContextMapAll": { "kind": "parameter", "displayName": "Allow Context Map All", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. [...]
"contentCache": { "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether to use resource content cache or not" },
+ "forceReload": { "kind": "parameter", "displayName": "Force Reload", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable or disable force reload mode. This is set to false by default and ADM file is loaded from a file only on a first Exchange, and AtlasContext will be reused after that until endpoint is recreated. If this is set [...]
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
"sourceMapName": { "kind": "parameter", "displayName": "Source Map Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The Exchange property name for a source message map which hold java.util.Map<String, Message> where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source propert [...]
"targetMapMode": { "kind": "parameter", "displayName": "Target Map Mode", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode", "enum": [ "MAP", "MESSAGE_HEADER", "EXCHANGE_PROPERTY" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "MAP", "description": "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores th [...]
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 6aaf0d2..8a2890b 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -686,6 +686,11 @@
"defaultValue": false
},
{
+ "name": "camel.springboot.load-health-checks",
+ "type": "java.lang.Boolean",
+ "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
+ },
+ {
"name": "camel.springboot.load-type-converters",
"type": "java.lang.Boolean",
"description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting <tt>@Converter(generateLoader = true)<\/tt> on your custom type converter classes.",
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index d188bbb..47d2775 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -177,25 +177,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>net.corda</groupId>
- <artifactId>corda-rpc</artifactId>
- <version>4.8</version>
- <exclusions>
- <exclusion>
- <groupId>co.paralleluniverse</groupId>
- <artifactId>quasar-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.1-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.9.1-8</version>