This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4d31316230235b422c7a5d520bed1b47f591e1d Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon May 17 06:56:02 2021 +0200 Regen --- camel-dependencies/pom.xml | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 62 ++++++++-------------- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index eb31626..35777f5 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -66,7 +66,7 @@ <avro-ipc-netty-version>1.10.2</avro-ipc-netty-version> <avro-version>1.10.2</avro-version> <awaitility-version>4.1.0</awaitility-version> - <aws-java-sdk2-version>2.16.62</aws-java-sdk2-version> + <aws-java-sdk2-version>2.16.63</aws-java-sdk2-version> <aws-xray-version>2.6.1</aws-xray-version> <axiom-version>1.2.14</axiom-version> <azure-jackson2-version>2.11.3</azure-jackson2-version> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index e202ad2..72f9aaa 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -14506,10 +14506,7 @@ is true. <xs:choice maxOccurs="unbounded" minOccurs="0"> <xs:element ref="tns:apiKey"/> <xs:element ref="tns:basicAuth"/> - <xs:element name="bearer" type="tns:restSecurityBearerToken"/> <xs:element ref="tns:oauth2"/> - <xs:element ref="tns:openIdConnect"/> - <xs:element ref="tns:mutualTLS"/> </xs:choice> </xs:sequence> </xs:complexType> @@ -14539,13 +14536,6 @@ To use query parameter as the location of the API key. Default value: false ]]></xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="inCookie" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -To use a cookie as the location of the API key. Default value: false - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> </xs:complexContent> </xs:complexType> @@ -14576,21 +14566,6 @@ A short description for security scheme. </xs:complexContent> </xs:complexType> - <xs:complexType name="restSecurityBearerToken"> - <xs:complexContent> - <xs:extension base="tns:restSecurityDefinition"> - <xs:sequence/> - <xs:attribute name="format" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -A hint to the client to identify how the bearer token is formatted. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="restSecurityOAuth2"> <xs:complexContent> <xs:extension base="tns:restSecurityDefinition"> @@ -14619,14 +14594,6 @@ Required for password, application, and access code flows. ]]></xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="refreshUrl" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -The URL to be used for obtaining refresh tokens. This MUST be in the form of a -URL. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> <xs:attribute name="flow" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ @@ -14639,14 +14606,20 @@ password, application or accessCode. </xs:complexContent> </xs:complexType> - <xs:complexType name="restSecurityOpenIdConnect"> + <xs:complexType name="restSecuritiesRequirement"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="securityRequirement" type="tns:securityDefinition"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="restSecurityBearerToken"> <xs:complexContent> <xs:extension base="tns:restSecurityDefinition"> <xs:sequence/> - <xs:attribute name="url" type="xs:string" use="required"> + <xs:attribute name="format" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ -OpenId Connect URL to discover OAuth2 configuration values. +A hint to the client to identify how the bearer token is formatted. ]]></xs:documentation> </xs:annotation> </xs:attribute> @@ -14662,10 +14635,19 @@ OpenId Connect URL to discover OAuth2 configuration values. </xs:complexContent> </xs:complexType> - <xs:complexType name="restSecuritiesRequirement"> - <xs:sequence> - <xs:element maxOccurs="unbounded" minOccurs="0" name="securityRequirement" type="tns:securityDefinition"/> - </xs:sequence> + <xs:complexType name="restSecurityOpenIdConnect"> + <xs:complexContent> + <xs:extension base="tns:restSecurityDefinition"> + <xs:sequence/> + <xs:attribute name="url" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation xml:lang="en"><![CDATA[ +OpenId Connect URL to discover OAuth2 configuration values. + ]]></xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> </xs:complexType> <xs:complexType name="restsDefinition">