You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/06 04:33:55 UTC
[camel] branch master updated: Fixed build and regen
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 439ee88 Fixed build and regen
439ee88 is described below
commit 439ee885b0311bb74ee9df0ad1a1ffc462d395c7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 6 05:33:31 2019 +0100
Fixed build and regen
---
apache-camel/pom.xml | 10 ++++++++++
apache-camel/src/main/descriptors/common-bin.xml | 2 ++
.../src/main/docs/rest-openapi-component.adoc | 8 +++++---
docs/components/modules/ROOT/nav.adoc | 1 +
docs/components/modules/ROOT/pages/index.adoc | 8 +++++---
.../modules/ROOT/pages}/rest-openapi-component.adoc | 9 ++++++---
parent/pom.xml | 13 +++++++++----
.../components-starter/camel-rest-openapi-starter/pom.xml | 2 +-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 +++++
9 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index cbc51d1..2fc4526 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1246,6 +1246,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-rest-openapi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-rest-swagger</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2805,6 +2810,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-rest-openapi-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-rest-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 7817b24..0ca818b 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -270,6 +270,7 @@
<include>org.apache.camel:camel-ref</include>
<include>org.apache.camel:camel-resilience4j</include>
<include>org.apache.camel:camel-rest</include>
+ <include>org.apache.camel:camel-rest-openapi</include>
<include>org.apache.camel:camel-rest-swagger</include>
<include>org.apache.camel:camel-ribbon</include>
<include>org.apache.camel:camel-robotframework</include>
@@ -621,6 +622,7 @@
<include>org.apache.camel.springboot:camel-reactor-starter</include>
<include>org.apache.camel.springboot:camel-ref-starter</include>
<include>org.apache.camel.springboot:camel-resilience4j-starter</include>
+ <include>org.apache.camel.springboot:camel-rest-openapi-starter</include>
<include>org.apache.camel.springboot:camel-rest-starter</include>
<include>org.apache.camel.springboot:camel-rest-swagger-starter</include>
<include>org.apache.camel.springboot:camel-ribbon-starter</include>
diff --git a/components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc b/components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
index a013925..fbe3858 100644
--- a/components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
+++ b/components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
@@ -153,7 +153,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
[source,xml]
----
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-rest-openapi-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
@@ -161,7 +161,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 10 options, which are listed below.
+The component supports 12 options, which are listed below.
@@ -170,10 +170,12 @@ The component supports 10 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.rest-openapi.base-path* | API basePath, for example /v2. Default is unset, if set overrides the value present in OpenApi specification. | | String
| *camel.component.rest-openapi.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.rest-openapi.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.rest-openapi.component-name* | Name of the Camel component that will perform the requests. The component must be present in Camel registry and it must implement RestProducerFactory service provider interface. If not set CLASSPATH is searched for single component that implements RestProducerFactory SPI. Can be overridden in endpoint configuration. | | String
| *camel.component.rest-openapi.consumes* | What payload type this component capable of consuming. Could be one type, like application/json or multiple types as application/json, application/xml; q=0.5 according to the RFC7231. This equates to the value of Accept HTTP header. If set overrides any value found in the OpenApi specification. Can be overridden in endpoint configuration | | String
-| *camel.component.rest-openapi.enabled* | Enable rest-openapi component | true | Boolean
+| *camel.component.rest-openapi.enabled* | Whether to enable auto configuration of the rest-openapi component. This is enabled by default. | | Boolean
| *camel.component.rest-openapi.host* | Scheme hostname and port to direct the HTTP requests to in the form of \https://hostname:port. Can be configured at the endpoint, component or in the corresponding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-openapi next, and global configuration last. If set overrides any value found in the OpenApi specification, RestConfiguration. Can be overridden in [...]
+| *camel.component.rest-openapi.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 process [...]
| *camel.component.rest-openapi.produces* | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the OpenApi specification. Can be overridden in endpoint configuration. | | String
| *camel.component.rest-openapi.specification-uri* | Path to the OpenApi specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load openapi.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Ca [...]
| *camel.component.rest-openapi.ssl-context-parameters* | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 8ca18f4..8df3117 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -290,6 +290,7 @@
* xref:reactor.adoc[Reactor Component]
* xref:ref-component.adoc[Ref Component]
* xref:resilience4j.adoc[Resilience4j Component]
+* xref:rest-openapi-component.adoc[REST OpenApi Component]
* xref:rest-swagger-component.adoc[REST Swagger Component]
* xref:rest-api-component.adoc[REST API Component]
* xref:rest-component.adoc[REST Component]
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index e25351b..88df8c4 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -6,7 +6,7 @@ The following Apache Camel artifacts are provided:
== Components
// components: START
-Number of Components: 305 in 243 JAR artifacts (0 deprecated)
+Number of Components: 306 in 244 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -260,7 +260,7 @@ Number of Components: 305 in 243 JAR artifacts (0 deprecated)
| xref:hazelcast-seda-component.adoc[Hazelcast SEDA] (camel-hazelcast) | 2.7 | The hazelcast-seda component is used to access Hazelcast BlockingQueue.
-| xref:hazelcast-set-component.adoc[Hazelcast Set] (camel-hazelcast) | 2.7 | The camel Endpoint to access Hazelcast distributed set.
+| xref:hazelcast-set-component.adoc[Hazelcast Set] (camel-hazelcast) | 2.7 | The hazelcast-set component is used to access Hazelcast distributed set.
| xref:hazelcast-topic-component.adoc[Hazelcast Topic] (camel-hazelcast) | 2.15 | The hazelcast-topic component is used to access Hazelcast distributed topic.
@@ -368,7 +368,7 @@ Number of Components: 305 in 243 JAR artifacts (0 deprecated)
| xref:kubernetes-service-accounts-component.adoc[Kubernetes Service Account] (camel-kubernetes) | 2.17 | The Kubernetes Service Accounts component provides a producer to execute service account operations.
-| xref:kubernetes-services-component.adoc[Kubernetes Services] (camel-kubernetes) | 2.17 | The Kubernetes Service Accounts component provides a producer to execute service operations and a consumer to consume service events.
+| xref:kubernetes-services-component.adoc[Kubernetes Services] (camel-kubernetes) | 2.17 | The Kubernetes Services component provides a producer to execute service operations and a consumer to consume service events.
| xref:kudu-component.adoc[Kudu] (camel-kudu) | 3.0 | Represents a Kudu endpoint. A kudu endpoint allows you to interact with Apache Kudu, a free and open source column-oriented data store of the Apache Hadoop ecosystem.
@@ -486,6 +486,8 @@ Number of Components: 305 in 243 JAR artifacts (0 deprecated)
| xref:rest-api-component.adoc[REST API] (camel-rest) | 2.16 | The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel.
+| xref:rest-openapi-component.adoc[REST OpenApi] (camel-rest-openapi) | 3.1 | An awesome REST endpoint backed by OpenApi specifications.
+
| xref:rest-swagger-component.adoc[REST Swagger] (camel-rest-swagger) | 2.19 | An awesome REST endpoint backed by Swagger specifications.
| xref:robotframework-component.adoc[Robot Framework] (camel-robotframework) | 3.0 | Represents a RobotFramework endpoint.
diff --git a/components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc b/docs/components/modules/ROOT/pages/rest-openapi-component.adoc
similarity index 92%
copy from components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
copy to docs/components/modules/ROOT/pages/rest-openapi-component.adoc
index a013925..0dedcba 100644
--- a/components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
+++ b/docs/components/modules/ROOT/pages/rest-openapi-component.adoc
@@ -1,5 +1,6 @@
[[rest-openapi-component]]
= REST OpenApi Component
+:page-source: components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
= REST OpenApi Component
*Since Camel 3.1*
@@ -153,7 +154,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
[source,xml]
----
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-rest-openapi-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
@@ -161,7 +162,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 10 options, which are listed below.
+The component supports 12 options, which are listed below.
@@ -170,10 +171,12 @@ The component supports 10 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.rest-openapi.base-path* | API basePath, for example /v2. Default is unset, if set overrides the value present in OpenApi specification. | | String
| *camel.component.rest-openapi.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.rest-openapi.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.rest-openapi.component-name* | Name of the Camel component that will perform the requests. The component must be present in Camel registry and it must implement RestProducerFactory service provider interface. If not set CLASSPATH is searched for single component that implements RestProducerFactory SPI. Can be overridden in endpoint configuration. | | String
| *camel.component.rest-openapi.consumes* | What payload type this component capable of consuming. Could be one type, like application/json or multiple types as application/json, application/xml; q=0.5 according to the RFC7231. This equates to the value of Accept HTTP header. If set overrides any value found in the OpenApi specification. Can be overridden in endpoint configuration | | String
-| *camel.component.rest-openapi.enabled* | Enable rest-openapi component | true | Boolean
+| *camel.component.rest-openapi.enabled* | Whether to enable auto configuration of the rest-openapi component. This is enabled by default. | | Boolean
| *camel.component.rest-openapi.host* | Scheme hostname and port to direct the HTTP requests to in the form of \https://hostname:port. Can be configured at the endpoint, component or in the corresponding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-openapi next, and global configuration last. If set overrides any value found in the OpenApi specification, RestConfiguration. Can be overridden in [...]
+| *camel.component.rest-openapi.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 process [...]
| *camel.component.rest-openapi.produces* | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the OpenApi specification. Can be overridden in endpoint configuration. | | String
| *camel.component.rest-openapi.specification-uri* | Path to the OpenApi specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load openapi.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Ca [...]
| *camel.component.rest-openapi.ssl-context-parameters* | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
diff --git a/parent/pom.xml b/parent/pom.xml
index 4608be7..8877323 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1986,13 +1986,13 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rest-swagger</artifactId>
+ <artifactId>camel-rest-openapi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.apicurio</groupId>
- <artifactId>apicurio-data-models</artifactId>
- <version>${apicurio-version}</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-rest-swagger</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -3570,6 +3570,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-rest-openapi-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-rest-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/spring-boot/components-starter/camel-rest-openapi-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rest-openapi-starter/pom.xml
index 8f39d2a..4dec47e 100644
--- a/platforms/spring-boot/components-starter/camel-rest-openapi-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rest-openapi-starter/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>components-starter</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
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 c661fcf..f87b7f4 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
@@ -157,6 +157,11 @@
<version>1.7</version>
</dependency>
<dependency>
+ <groupId>io.apicurio</groupId>
+ <artifactId>apicurio-data-models</artifactId>
+ <version>1.0.16.Final</version>
+ </dependency>
+ <dependency>
<groupId>io.krakens</groupId>
<artifactId>java-grok</artifactId>
<version>0.1.9</version>