This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 0260618 Regen 0260618 is described below commit 02606188cdeb5a9a69872b814fd1a93af711b229 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Sep 17 10:14:15 2018 +0200 Regen --- .../docs/google-calendar-stream-component.adoc | 2 +- .../apache/camel/catalog/AbstractCamelCatalog.java | 36 +++++++++++----------- .../camel/catalog/EndpointValidationResult.java | 4 +-- .../camel-spring-boot-dependencies/pom.xml | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc index e74f4f5..c3069b7 100644 --- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc +++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc @@ -130,7 +130,7 @@ The component supports 15 options, which are listed below. | *camel.component.google-calendar-stream.client-factory* | The client Factory. The option is a org.apache.camel.component.google.calendar.GoogleCalendarClientFactory type. | | String | *camel.component.google-calendar-stream.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *camel.component.google-calendar-stream.configuration.application-name* | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String -| *camel.component.google-calendar-stream.configuration.calendar-summary-name* | Calendar Summary Name to use | primary | String +| *camel.component.google-calendar-stream.configuration.calendar-id* | The calendarId to be used | primary | String | *camel.component.google-calendar-stream.configuration.client-id* | Client ID of the mail application | | String | *camel.component.google-calendar-stream.configuration.client-secret* | Client secret of the mail application | | String | *camel.component.google-calendar-stream.configuration.consider-last-update* | Take into account the lastUpdate of the last event polled as start date for the next poll | false | Boolean diff --git a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java index 2dc570f..99f5fbd 100644 --- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java +++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java @@ -16,6 +16,24 @@ */ package org.apache.camel.catalog; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import static org.apache.camel.catalog.CatalogHelper.after; import static org.apache.camel.catalog.JSonSchemaHelper.getNames; import static org.apache.camel.catalog.JSonSchemaHelper.getPropertyDefaultValue; @@ -42,24 +60,6 @@ import static org.apache.camel.catalog.URISupport.isEmpty; import static org.apache.camel.catalog.URISupport.normalizeUri; import static org.apache.camel.catalog.URISupport.stripQuery; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * Base class for both the runtime RuntimeCamelCatalog from camel-core and the complete CamelCatalog from camel-catalog. */ diff --git a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java index 0065e48..718b9a3 100644 --- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java +++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java @@ -16,8 +16,6 @@ */ package org.apache.camel.catalog; -import static org.apache.camel.catalog.URISupport.isEmpty; - import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -27,6 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static org.apache.camel.catalog.URISupport.isEmpty; + /** * Details result of validating endpoint uri. */ diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 88f65a4..88a1a7c 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -88,7 +88,7 @@ <dependency> <groupId>com.dropbox.core</groupId> <artifactId>dropbox-core-sdk</artifactId> - <version>3.0.8</version> + <version>3.0.9</version> </dependency> <dependency> <groupId>com.github.dozermapper</groupId>