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 37f6450 Regen
37f6450 is described below
commit 37f6450bc8bcc12f73840931266a5b7925da351e
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Mar 26 16:05:34 2020 +0100
Regen
---
.../springboot/catalog/components/weather.json | 13 ++------
components-starter/camel-corda-starter/pom.xml | 12 +++++++
.../src/main/docs/weather-starter.adoc | 6 ++--
.../springboot/WeatherComponentConfiguration.java | 38 ++++++++--------------
docs/modules/ROOT/pages/weather-starter.adoc | 6 ++--
tooling/camel-spring-boot-dependencies/pom.xml | 12 +------
6 files changed, 32 insertions(+), 55 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 c1f8f53..1cea2f1 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
@@ -19,11 +19,10 @@
"version": "3.2.0-SNAPSHOT"
},
"componentProperties": {
- "geolocationAccessKey": { "kind": "property", "displayName": "Geolocation
Access Key", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The geolocation service now needs an accessKey to be used" },
- "geolocationRequestHostIP": { "kind": "property", "displayName":
"Geolocation Request Host IP", "group": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The geolocation service now needs to specify the IP associated
to the accessKey you're using" },
"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" }
+ "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)" }
},
"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." },
@@ -41,7 +40,6 @@
"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" },
- "httpConnectionManager": { "kind": "parameter", "displayName": "Http
Connection Manager", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"org.apache.commons.httpclient.HttpConnectionManager", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "To use a custom
HttpConnectionManager to manage connections" },
"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." },
@@ -52,13 +50,6 @@
"topLat": { "kind": "parameter", "displayName": "Top Lat", "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": "For boxed queries this
is the top latitude. Needs to be used in combination with rightLon and zoom." },
"zip": { "kind": "parameter", "displayName": "Zip", "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": "Zip-code, e.g. 94040,us"
},
"zoom": { "kind": "parameter", "displayName": "Zoom", "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": "For boxed queries this
is the zoom. Needs to be used in combination with rightLon and topLat." },
- "proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth
Domain", "group": "proxy", "label": "proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "Domain for proxy NTLM
authentication" },
- "proxyAuthHost": { "kind": "parameter", "displayName": "Proxy Auth Host",
"group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "Optional host for proxy
NTLM authentication" },
- "proxyAuthMethod": { "kind": "parameter", "displayName": "Proxy Auth
Method", "group": "proxy", "label": "proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "Authentication method
for proxy, either as Basic, Digest or NTLM." },
- "proxyAuthPassword": { "kind": "parameter", "displayName": "Proxy Auth
Password", "group": "proxy", "label": "proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "Password for proxy
authentication" },
- "proxyAuthUsername": { "kind": "parameter", "displayName": "Proxy Auth
Username", "group": "proxy", "label": "proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "Username for proxy
authentication" },
- "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"proxy", "label": "proxy", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The proxy host name" },
- "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"proxy", "label": "proxy", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.weather.WeatherConfiguration",
"configurationField": "configuration", "description": "The proxy port number" },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff
Error Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"secret": false, "description": "The number of subsequent error polls (failed
due some error) that should happen before the backoffMultipler should kick-in."
},
"backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff
Idle Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"secret": false, "description": "The number of subsequent idle polls that
should happen before the backoffMultipler should kick-in." },
"backoffMultiplier": { "kind": "parameter", "displayName": "Backoff
Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "secret":
false, "description": "To let the scheduled polling consumer backoff if there
has been a number of subsequent idles\/errors in a row. The multiplier is then
the number of polls that will be skipped before the next actual attempt is
happening again. When this option [...]
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 61d6d32..cba8670 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<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-weather-starter/src/main/docs/weather-starter.adoc
b/components-starter/camel-weather-starter/src/main/docs/weather-starter.adoc
index 3a9166b..eb8dd11 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 6 options, which are listed below.
+The component supports 5 options, which are listed below.
@@ -27,9 +27,7 @@ The component supports 6 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.geolocation-access-key* | The geolocation service
now needs an accessKey to be used | | String
-| *camel.component.weather.geolocation-request-host-i-p* | The geolocation
service now needs to specify the IP associated to the accessKey you're using |
| String
+| *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 75e77a0..9bfde8e 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
@@ -37,15 +37,6 @@ public class WeatherComponentConfiguration
*/
private Boolean enabled;
/**
- * The geolocation service now needs an accessKey to be used
- */
- private String geolocationAccessKey;
- /**
- * The geolocation service now needs to specify the IP associated to the
- * accessKey you're using
- */
- private String geolocationRequestHostIP;
- /**
* 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
@@ -70,22 +61,11 @@ public class WeatherComponentConfiguration
* the newer property binding with additional capabilities
*/
private Boolean basicPropertyBinding = false;
-
- public String getGeolocationAccessKey() {
- return geolocationAccessKey;
- }
-
- public void setGeolocationAccessKey(String geolocationAccessKey) {
- this.geolocationAccessKey = geolocationAccessKey;
- }
-
- public String getGeolocationRequestHostIP() {
- return geolocationRequestHostIP;
- }
-
- public void setGeolocationRequestHostIP(String geolocationRequestHostIP) {
- this.geolocationRequestHostIP = geolocationRequestHostIP;
- }
+ /**
+ * 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;
@@ -110,4 +90,12 @@ 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 3a9166b..eb8dd11 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 6 options, which are listed below.
+The component supports 5 options, which are listed below.
@@ -27,9 +27,7 @@ The component supports 6 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.geolocation-access-key* | The geolocation service
now needs an accessKey to be used | | String
-| *camel.component.weather.geolocation-request-host-i-p* | The geolocation
service now needs to specify the IP associated to the accessKey you're using |
| String
+| *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 4e43e7e..0f6e880 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -137,11 +137,6 @@
<version>1.4.11.1</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
@@ -3201,11 +3196,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-paxlogging</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-pdf</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
@@ -4149,7 +4139,7 @@
<dependency>
<groupId>org.dizitart</groupId>
<artifactId>nitrite</artifactId>
- <version>3.3.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
