You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/20 14:31:11 UTC
[camel-spring-boot] branch master updated (65e266c -> c061539)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from 65e266c [create-pull-request] automated change
new fd60c3c Fix site for google functions
new c061539 Regen
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:
.../org/apache/camel/springboot/catalog/others.properties | 1 -
.../camel/springboot/catalog/others/google-functions.json | 14 --------------
components-starter/README.adoc | 4 +---
components-starter/camel-corda-starter/pom.xml | 8 ++++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++
docs/modules/ROOT/pages/list.adoc | 4 +---
6 files changed, 22 insertions(+), 21 deletions(-)
delete mode 100644 catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/google-functions.json
[camel-spring-boot] 01/02: Fix site for google functions
Posted by ac...@apache.org.
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
commit fd60c3c29c639fb51adcc26ef68e78057f452f8d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Mar 20 15:10:49 2021 +0100
Fix site for google functions
---
.../catalog/components/google-functions.json | 38 ----------------------
.../camel/springboot/catalog/others.properties | 3 +-
.../catalog/others/google-functions.json | 14 --------
3 files changed, 1 insertion(+), 54 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json
deleted file mode 100644
index cbf6471..0000000
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "component": {
- "kind": "component",
- "name": "google-functions",
- "title": "GoogleCloudFunctions",
- "description": "Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library.",
- "deprecated": false,
- "firstVersion": "3.9.0",
- "label": "cloud",
- "javaType": "org.apache.camel.component.google.functions.GoogleCloudFunctionsComponent",
- "supportLevel": "Preview",
- "groupId": "org.apache.camel.springboot",
- "artifactId": "camel-google-functions-starter",
- "version": "3.9.0-SNAPSHOT",
- "scheme": "google-functions",
- "extendsScheme": "",
- "syntax": "google-functions:functionName",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": true,
- "lenientProperties": false
- },
- "componentProperties": {
- "lazyStartProducer": { "kind": "property", "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 star [...]
- "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
- },
- "properties": {
- "functionName": { "kind": "path", "displayName": "Function Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The user-defined name of the function" },
- "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "Service account key to authenticate an application as a service account" },
- "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 [...]
- "location": { "kind": "parameter", "displayName": "Location", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The Google Cloud Location (Region) where the Function is located" },
- "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.functions.GoogleCloudFunctionsOperations", "enum": [ "listFunctions", "getFunction", "callFunction", "generateDownloadUrl", "generateUploadUrl", "createFunction", "updateFunction", "deleteFunction" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel [...]
- "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "Specifies if the request is a pojo request" },
- "project": { "kind": "parameter", "displayName": "Project", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The Google Cloud Project name where the Function is located" },
- "client": { "kind": "parameter", "displayName": "Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.google.cloud.functions.v1.CloudFunctionsServiceClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The client to use during service invocation." }
- }
-}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
index eb5c12b..cf48915 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
@@ -3,7 +3,6 @@ caffeine-lrucache
csimple-joor
cxf-transport
etcd3
-google-functions
google-storage
hystrix
jasypt
@@ -23,4 +22,4 @@ spring-javaconfig
spring-security
swagger-java
undertow-spring-security
-zipkin
\ No newline at end of file
+zipkin
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/google-functions.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/google-functions.json
deleted file mode 100644
index 01ab86b..0000000
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/google-functions.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "other": {
- "kind": "other",
- "name": "google-functions",
- "title": "Google Functions",
- "description": "Camel Component for Google Cloud Platform Functions",
- "deprecated": false,
- "firstVersion": "3.9.0",
- "supportLevel": "Preview",
- "groupId": "org.apache.camel.springboot",
- "artifactId": "camel-google-functions-starter",
- "version": "3.9.0-SNAPSHOT"
- }
-}
[camel-spring-boot] 02/02: Regen
Posted by ac...@apache.org.
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
commit c06153959b7232555cef1fe0dabe207c99ec254e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Mar 20 15:21:01 2021 +0100
Regen
---
.../catalog/components/google-functions.json | 38 ++++++++++++++++++++++
.../camel/springboot/catalog/others.properties | 2 +-
components-starter/README.adoc | 4 +--
components-starter/camel-corda-starter/pom.xml | 8 +++++
components-starter/camel-iota-starter/pom.xml | 12 +++++++
docs/modules/ROOT/pages/list.adoc | 4 +--
6 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json
new file mode 100644
index 0000000..cbf6471
--- /dev/null
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json
@@ -0,0 +1,38 @@
+{
+ "component": {
+ "kind": "component",
+ "name": "google-functions",
+ "title": "GoogleCloudFunctions",
+ "description": "Store and retrieve objects from Google Cloud Functions Service using the google-cloud-storage library.",
+ "deprecated": false,
+ "firstVersion": "3.9.0",
+ "label": "cloud",
+ "javaType": "org.apache.camel.component.google.functions.GoogleCloudFunctionsComponent",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-google-functions-starter",
+ "version": "3.9.0-SNAPSHOT",
+ "scheme": "google-functions",
+ "extendsScheme": "",
+ "syntax": "google-functions:functionName",
+ "async": false,
+ "api": false,
+ "consumerOnly": false,
+ "producerOnly": true,
+ "lenientProperties": false
+ },
+ "componentProperties": {
+ "lazyStartProducer": { "kind": "property", "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 star [...]
+ "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
+ },
+ "properties": {
+ "functionName": { "kind": "path", "displayName": "Function Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The user-defined name of the function" },
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "Service account key to authenticate an application as a service account" },
+ "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 [...]
+ "location": { "kind": "parameter", "displayName": "Location", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The Google Cloud Location (Region) where the Function is located" },
+ "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.functions.GoogleCloudFunctionsOperations", "enum": [ "listFunctions", "getFunction", "callFunction", "generateDownloadUrl", "generateUploadUrl", "createFunction", "updateFunction", "deleteFunction" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel [...]
+ "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "Specifies if the request is a pojo request" },
+ "project": { "kind": "parameter", "displayName": "Project", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The Google Cloud Project name where the Function is located" },
+ "client": { "kind": "parameter", "displayName": "Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.google.cloud.functions.v1.CloudFunctionsServiceClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.google.functions.GoogleCloudFunctionsConfiguration", "configurationField": "configuration", "description": "The client to use during service invocation." }
+ }
+}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
index cf48915..bbaf4ca 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
@@ -22,4 +22,4 @@ spring-javaconfig
spring-security
swagger-java
undertow-spring-security
-zipkin
+zipkin
\ No newline at end of file
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index d794e0b..402c720 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -827,7 +827,7 @@ Number of Camel languages: 19 in 13 JAR artifacts (0 deprecated)
== Miscellaneous Extensions
// others: START
-Number of miscellaneous extensions: 29 in 29 JAR artifacts (3 deprecated)
+Number of miscellaneous extensions: 28 in 28 JAR artifacts (3 deprecated)
[width="100%",cols="4,3,3,3,6",options="header"]
|===
@@ -843,8 +843,6 @@ Number of miscellaneous extensions: 29 in 29 JAR artifacts (3 deprecated)
| xref:latest@components:others:etcd3.adoc[Etcd3] | camel-etcd3-starter | Preview | 3.5 | Aggregation repository using EtcD as datastore
-| xref:latest@components:others:google-functions.adoc[Google Functions] | camel-google-functions-starter | Preview | 3.9 | Camel Component for Google Cloud Platform Functions
-
| xref:latest@components:others:hystrix.adoc[Hystrix] | camel-hystrix-starter | Stable | 2.18 | *deprecated* Circuit Breaker EIP using Netflix Hystrix
| xref:latest@components:others:jasypt.adoc[Jasypt] | camel-jasypt-starter | Stable | 2.5 | Security using Jasypt
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index b215b27..4aa7023 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
<!--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>
+ <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml
index 1cdd52f..3656ac0 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<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/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index d794e0b..402c720 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -827,7 +827,7 @@ Number of Camel languages: 19 in 13 JAR artifacts (0 deprecated)
== Miscellaneous Extensions
// others: START
-Number of miscellaneous extensions: 29 in 29 JAR artifacts (3 deprecated)
+Number of miscellaneous extensions: 28 in 28 JAR artifacts (3 deprecated)
[width="100%",cols="4,3,3,3,6",options="header"]
|===
@@ -843,8 +843,6 @@ Number of miscellaneous extensions: 29 in 29 JAR artifacts (3 deprecated)
| xref:latest@components:others:etcd3.adoc[Etcd3] | camel-etcd3-starter | Preview | 3.5 | Aggregation repository using EtcD as datastore
-| xref:latest@components:others:google-functions.adoc[Google Functions] | camel-google-functions-starter | Preview | 3.9 | Camel Component for Google Cloud Platform Functions
-
| xref:latest@components:others:hystrix.adoc[Hystrix] | camel-hystrix-starter | Stable | 2.18 | *deprecated* Circuit Breaker EIP using Netflix Hystrix
| xref:latest@components:others:jasypt.adoc[Jasypt] | camel-jasypt-starter | Stable | 2.5 | Security using Jasypt