This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new c883e82 [create-pull-request] automated change
c883e82 is described below
commit c883e821b95101bf32cbbc977cdcba9ee09e00ba
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jul 17 01:18:51 2020 +0000
[create-pull-request] automated change
---
.../apache/camel/springboot/catalog/components/weather.json | 7 ++++---
components-starter/camel-corda-starter/pom.xml | 12 ------------
components-starter/camel-iota-starter/pom.xml | 12 ------------
.../src/main/docs/weather-starter.adoc | 3 +--
.../weather/springboot/WeatherComponentConfiguration.java | 13 -------------
docs/modules/ROOT/pages/weather-starter.adoc | 3 +--
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
7 files changed, 11 insertions(+), 44 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weather.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weather.json
index 708254f..e99a6c8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weather.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/weather.json
@@ -23,8 +23,7 @@
"componentProperties": {
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
- "basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
- "httpClient": { "kind": "property", "displayName": "Http Client", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.apache.http.impl.client.CloseableHttpClient", "deprecated":
false, "secret": false, "description": "To use an existing configured http
client (for example with http proxy)" }
+ "basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" }
},
"properties": {
"name": { "kind": "path", "displayName": "Name", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The name value is not
used." },
@@ -34,7 +33,7 @@
"mode": { "kind": "parameter", "displayName": "Mode", "group": "common",
"label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.weather.WeatherMode", "enum": [ "HTML", "JSON",
"XML" ], "deprecated": false, "secret": false, "defaultValue": "JSON",
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The output format of the
weather data." },
"period": { "kind": "parameter", "displayName": "Period", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "If null, the current
weather will be returned, else use values of 5, 7, 14 days. Only the numeric
value for the forecast period is actually parsed, so spel [...]
"units": { "kind": "parameter", "displayName": "Units", "group": "common",
"label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.component.weather.WeatherUnits", "enum": [ "IMPERIAL",
"METRIC" ], "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The units for
temperature measurement." },
- "weatherApi": { "kind": "parameter", "displayName": "Weather Api",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.weather.WeatherApi", "enum": [
"Current", "Station", "Hourly", "Daily" ], "deprecated": false, "secret":
false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The API to be use
(current, forecast\/3 hour, forecast daily, st [...]
+ "weatherApi": { "kind": "parameter", "displayName": "Weather Api",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.weather.WeatherApi", "enum": [
"Current", "Station", "Hourly", "Daily" ], "deprecated": false, "secret":
false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The API to use (current,
forecast\/3 hour, forecast daily, station)" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled b [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send
Empty Message When Idle", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret":
false, "defaultValue": false, "description": "If the polling consumer did not
poll any files, you can enable this option to send an empty message (no body)
instead." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
@@ -42,6 +41,8 @@
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false,
"secret": false, "description": "A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the
poll operation before an Exchange h [...]
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": 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 starting and cause the [...]
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
+ "geoLocationProvider": { "kind": "parameter", "displayName": "Geo Location
Provider", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.weather.geolocation.GeoLocationProvider",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "A custum geolocation
provider to determine the longitude and latitu [...]
+ "httpClient": { "kind": "parameter", "displayName": "Http Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.apache.http.impl.client.CloseableHttpClient", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "To use an existing
configured http client (for example with http proxy)" },
"synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "description": "Sets whether synchronous processing should be strictly
used, or Camel is allowed to use asynchronous processing (if supported)." },
"cnt": { "kind": "parameter", "displayName": "Cnt", "group": "filter",
"label": "filter", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "Number of results to be
found" },
"ids": { "kind": "parameter", "displayName": "Ids", "group": "filter",
"label": "filter", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "List of id's of
city\/stations. You can separate multiple ids by comma." },
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 7f14a21..254cb1b 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 1cb0cae..9427c49 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-weather-starter/src/main/docs/weather-starter.adoc
b/components-starter/camel-weather-starter/src/main/docs/weather-starter.adoc
index eb8dd11..eaa3b6a 100644
---
a/components-starter/camel-weather-starter/src/main/docs/weather-starter.adoc
+++
b/components-starter/camel-weather-starter/src/main/docs/weather-starter.adoc
@@ -17,7 +17,7 @@ When using weather with Spring Boot make sure to use the
following Maven depende
----
-The component supports 5 options, which are listed below.
+The component supports 4 options, which are listed below.
@@ -27,7 +27,6 @@ The component supports 5 options, which are listed below.
| *camel.component.weather.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.weather.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.weather.enabled* | Whether to enable auto configuration of
the weather component. This is enabled by default. | | Boolean
-| *camel.component.weather.http-client* | To use an existing configured http
client (for example with http proxy). The option is a
org.apache.http.impl.client.CloseableHttpClient type. | | String
| *camel.component.weather.lazy-start-producer* | 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 starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed th [...]
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentConfiguration.java
b/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentConfiguration.java
index 4baf242..88f1fc3 100644
---
a/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentConfiguration.java
+++
b/components-starter/camel-weather-starter/src/main/java/org/apache/camel/component/weather/springboot/WeatherComponentConfiguration.java
@@ -61,11 +61,6 @@ public class WeatherComponentConfiguration
* the newer property binding with additional capabilities
*/
private Boolean basicPropertyBinding = false;
- /**
- * To use an existing configured http client (for example with http proxy).
- * The option is a org.apache.http.impl.client.CloseableHttpClient type.
- */
- private String httpClient;
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
@@ -90,12 +85,4 @@ public class WeatherComponentConfiguration
public void setBasicPropertyBinding(Boolean basicPropertyBinding) {
this.basicPropertyBinding = basicPropertyBinding;
}
-
- public String getHttpClient() {
- return httpClient;
- }
-
- public void setHttpClient(String httpClient) {
- this.httpClient = httpClient;
- }
}
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/weather-starter.adoc
b/docs/modules/ROOT/pages/weather-starter.adoc
index eb8dd11..eaa3b6a 100644
--- a/docs/modules/ROOT/pages/weather-starter.adoc
+++ b/docs/modules/ROOT/pages/weather-starter.adoc
@@ -17,7 +17,7 @@ When using weather with Spring Boot make sure to use the
following Maven depende
----
-The component supports 5 options, which are listed below.
+The component supports 4 options, which are listed below.
@@ -27,7 +27,6 @@ The component supports 5 options, which are listed below.
| *camel.component.weather.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.weather.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.weather.enabled* | Whether to enable auto configuration of
the weather component. This is enabled by default. | | Boolean
-| *camel.component.weather.http-client* | To use an existing configured http
client (for example with http proxy). The option is a
org.apache.http.impl.client.CloseableHttpClient type. | | String
| *camel.component.weather.lazy-start-producer* | 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 starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed th [...]
|===
// spring-boot-auto-configure options: END
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index e8197f2..cb68a9d 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1939,6 +1939,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-arangodb</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-as2</artifactId>
<version>3.5.0-SNAPSHOT</version>
</dependency>
