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.git
commit 4900e20e690078813a57f12427bce6556ab0795c Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Sep 6 14:52:42 2018 +0200 CAMEL-12784 - Regen --- components/readme.adoc | 5 ++- docs/user-manual/en/SUMMARY.md | 1 + .../apache/camel/catalog/AbstractCamelCatalog.java | 36 +++++++++++----------- .../camel/catalog/EndpointValidationResult.java | 4 +-- .../camel-spring-boot-dependencies/pom.xml | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/components/readme.adoc b/components/readme.adoc index 096187e..a8cb295 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^^^^^^^^^ // components: START -Number of Components: 301 in 204 JAR artifacts (22 deprecated) +Number of Components: 302 in 204 JAR artifacts (22 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -299,6 +299,9 @@ Number of Components: 301 in 204 JAR artifacts (22 deprecated) | link:camel-google-calendar/src/main/docs/google-calendar-component.adoc[Google Calendar] (camel-google-calendar) + `google-calendar:apiName/methodName` | 2.15 | The google-calendar component provides access to Google Calendar. +| link:camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc[Google Calendar Stream] (camel-google-calendar) + +`google-calendar-stream:index` | 2.23 | The google-calendar component provides access to Google Calendar in a streaming mod. + | link:camel-google-drive/src/main/docs/google-drive-component.adoc[Google Drive] (camel-google-drive) + `google-drive:apiName/methodName` | 2.14 | The google-drive component provides access to Google Drive file storage service. diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index aa072f9..e72393e 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -210,6 +210,7 @@ * [GitHub](github-component.adoc) * [Google BigQuery](google-bigquery-component.adoc) * [Google Calendar](google-calendar-component.adoc) + * [Google Calendar Stream](google-calendar-stream-component.adoc) * [Google Drive](google-drive-component.adoc) * [Google Mail](google-mail-component.adoc) * [Google Mail Stream](google-mail-stream-component.adoc) 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 99f5fbd..2dc570f 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,24 +16,6 @@ */ 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; @@ -60,6 +42,24 @@ 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 718b9a3..0065e48 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,6 +16,8 @@ */ 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; @@ -25,8 +27,6 @@ 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 c805730..88f65a4 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 @@ -73,7 +73,7 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.47</version> + <version>1.2.49</version> </dependency> <dependency> <groupId>com.atlassian.jira</groupId>