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 2025/05/22 10:51:18 UTC
(camel) branch main updated (a4a7c24dedc -> 6e1697074d8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from a4a7c24dedc CAMEL-22100: Uses parent module in plugin deps resolution (#18154)
new dd10c3d1e4c CAMEL-22101: camel-http: Remove Digest from authMethod as it was not supported.
new 6e1697074d8 camel-oauth - Add first version
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/catalog/components/http.json | 14 +++++-----
.../org/apache/camel/catalog/components/https.json | 14 +++++-----
.../org/apache/camel/catalog/others/oauth.json | 1 +
.../camel/http/common/HttpCommonEndpoint.java | 32 +++++++++++-----------
.../camel/http/common/HttpConfiguration.java | 18 ++++++------
.../org/apache/camel/component/http/http.json | 14 +++++-----
.../org/apache/camel/component/http/https.json | 14 +++++-----
components/camel-oauth/pom.xml | 4 +--
.../camel-oauth/src/generated/resources/oauth.json | 1 +
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 12 ++++----
parent/pom.xml | 1 +
11 files changed, 64 insertions(+), 61 deletions(-)
(camel) 01/02: CAMEL-22101: camel-http: Remove Digest from authMethod as it was not supported.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dd10c3d1e4cf73cabeaed4c99247112131673082
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 22 12:43:21 2025 +0200
CAMEL-22101: camel-http: Remove Digest from authMethod as it was not supported.
---
.../org/apache/camel/catalog/components/http.json | 14 +++++-----
.../org/apache/camel/catalog/components/https.json | 14 +++++-----
.../camel/http/common/HttpCommonEndpoint.java | 32 +++++++++++-----------
.../camel/http/common/HttpConfiguration.java | 18 ++++++------
.../org/apache/camel/component/http/http.json | 14 +++++-----
.../org/apache/camel/component/http/https.json | 14 +++++-----
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 12 ++++----
7 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
index 10d843bf738..02056583d25 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
@@ -125,10 +125,10 @@
"httpContext": { "index": 33, "kind": "parameter", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HttpContext instance" },
"maxTotalConnections": { "index": 34, "kind": "parameter", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 200, "description": "The maximum number of connections." },
"useSystemProperties": { "index": 35, "kind": "parameter", "displayName": "Use System Properties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To use System Properties as fallback for configuration for configuring HTTP Client" },
- "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTML" },
+ "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTLM" },
"proxyAuthHost": { "index": 37, "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication host" },
- "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
- "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" },
+ "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
+ "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTLM" },
"proxyAuthPassword": { "index": 40, "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Proxy authentication password" },
"proxyAuthPort": { "index": 41, "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication port" },
"proxyAuthScheme": { "index": 42, "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication scheme to use" },
@@ -136,11 +136,11 @@
"proxyHost": { "index": 44, "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy hostname to use" },
"proxyPort": { "index": 45, "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy port to use" },
"authBearerToken": { "index": 46, "kind": "parameter", "displayName": "Auth Bearer Token", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication bearer token" },
- "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTML" },
+ "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTLM" },
"authenticationPreemptive": { "index": 48, "kind": "parameter", "displayName": "Authentication Preemptive", "group": "security", "label": "producer,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If this option is true, camel-http sends preemptive basic authentication to the server." },
- "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTML" },
- "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
- "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
+ "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTLM" },
+ "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM. (NTLM is deprecated)" },
+ "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, or NTLM. (NTLM is deprecated)" },
"authPassword": { "index": 52, "kind": "parameter", "displayName": "Auth Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication password" },
"authUsername": { "index": 53, "kind": "parameter", "displayName": "Auth Username", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication username" },
"oauth2CachedTokensDefaultExpirySeconds": { "index": 54, "kind": "parameter", "displayName": "Oauth2 Cached Tokens Default Expiry Seconds", "group": "security", "label": "producer,security", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field." },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
index b0ea6dc4976..733d6d39eba 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
@@ -125,10 +125,10 @@
"httpContext": { "index": 33, "kind": "parameter", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HttpContext instance" },
"maxTotalConnections": { "index": 34, "kind": "parameter", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 200, "description": "The maximum number of connections." },
"useSystemProperties": { "index": 35, "kind": "parameter", "displayName": "Use System Properties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To use System Properties as fallback for configuration for configuring HTTP Client" },
- "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTML" },
+ "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTLM" },
"proxyAuthHost": { "index": 37, "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication host" },
- "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
- "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" },
+ "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
+ "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTLM" },
"proxyAuthPassword": { "index": 40, "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Proxy authentication password" },
"proxyAuthPort": { "index": 41, "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication port" },
"proxyAuthScheme": { "index": 42, "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication scheme to use" },
@@ -136,11 +136,11 @@
"proxyHost": { "index": 44, "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy hostname to use" },
"proxyPort": { "index": 45, "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy port to use" },
"authBearerToken": { "index": 46, "kind": "parameter", "displayName": "Auth Bearer Token", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication bearer token" },
- "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTML" },
+ "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTLM" },
"authenticationPreemptive": { "index": 48, "kind": "parameter", "displayName": "Authentication Preemptive", "group": "security", "label": "producer,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If this option is true, camel-http sends preemptive basic authentication to the server." },
- "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTML" },
- "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
- "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
+ "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTLM" },
+ "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM. (NTLM is deprecated)" },
+ "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, or NTLM. (NTLM is deprecated)" },
"authPassword": { "index": 52, "kind": "parameter", "displayName": "Auth Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication password" },
"authUsername": { "index": 53, "kind": "parameter", "displayName": "Auth Username", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication username" },
"oauth2CachedTokensDefaultExpirySeconds": { "index": 54, "kind": "parameter", "displayName": "Oauth2 Cached Tokens Default Expiry Seconds", "group": "security", "label": "producer,security", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field." },
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 121079341f3..2936a111083 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -142,11 +142,11 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
description = "Configure the HTTP method to use. The HttpMethod header cannot override this option if set.")
private HttpMethods httpMethod;
- @UriParam(label = "producer,security", enums = "Basic,Bearer,Digest,NTLM",
- description = "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, Digest or NTLM. (NTLM is deprecated)")
+ @UriParam(label = "producer,security", enums = "Basic,Bearer,NTLM",
+ description = "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM. (NTLM is deprecated)")
private String authMethod;
- @UriParam(label = "producer,security", enums = "Basic,Bearer,Digest,NTLM",
- description = "Which authentication method to prioritize to use, either as Basic, Bearer, Digest or NTLM. (NTLM is deprecated)")
+ @UriParam(label = "producer,security", enums = "Basic,Bearer,NTLM",
+ description = "Which authentication method to prioritize to use, either as Basic, Bearer, or NTLM. (NTLM is deprecated)")
private String authMethodPriority;
@UriParam(label = "producer,security", secret = true, description = "Authentication username")
private String authUsername;
@@ -177,10 +177,10 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
"If you set this parameter to too small value, you can get 4xx http errors because camel will think that the received token is still valid, while in reality the token is expired for the Authentication server.")
private long oauth2CachedTokensExpirationMarginSeconds = 5L;
@Deprecated
- @UriParam(label = "producer,security", description = "Authentication domain to use with NTML")
+ @UriParam(label = "producer,security", description = "Authentication domain to use with NTLM")
private String authDomain;
@Deprecated
- @UriParam(label = "producer,security", description = "Authentication host to use with NTML")
+ @UriParam(label = "producer,security", description = "Authentication host to use with NTLM")
private String authHost;
@UriParam(label = "producer,proxy", description = "Proxy hostname to use")
private String proxyHost;
@@ -188,7 +188,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
private int proxyPort;
@UriParam(label = "producer,proxy", enums = "http,https", description = "Proxy authentication scheme to use")
private String proxyAuthScheme;
- @UriParam(label = "producer,proxy", enums = "Basic,Digest,NTLM", description = "Proxy authentication method to use")
+ @UriParam(label = "producer,proxy", enums = "Basic,Bearer,NTLM", description = "Proxy authentication method to use")
private String proxyAuthMethod;
@UriParam(label = "producer,proxy", secret = true, description = "Proxy authentication username")
private String proxyAuthUsername;
@@ -199,10 +199,10 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
@UriParam(label = "producer,proxy", description = "Proxy authentication port")
private int proxyAuthPort;
@Deprecated
- @UriParam(label = "producer,proxy", description = "Proxy authentication domain to use with NTML")
+ @UriParam(label = "producer,proxy", description = "Proxy authentication domain to use with NTLM")
private String proxyAuthDomain;
@Deprecated
- @UriParam(label = "producer,proxy", description = "Proxy authentication domain (workstation name) to use with NTML")
+ @UriParam(label = "producer,proxy", description = "Proxy authentication domain (workstation name) to use with NTLM")
private String proxyAuthNtHost;
protected HttpCommonEndpoint() {
@@ -648,7 +648,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Authentication methods allowed to use as a comma separated list of values Basic, Digest or NTLM.
+ * Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM (deprecated).
*/
public void setAuthMethod(String authMethod) {
this.authMethod = authMethod;
@@ -659,7 +659,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Which authentication method to prioritize to use, either as Basic, Digest or NTLM.
+ * Which authentication method to prioritize to use, either as Basic, Bearer or NTLM (deprecated).
*/
public void setAuthMethodPriority(String authMethodPriority) {
this.authMethodPriority = authMethodPriority;
@@ -703,7 +703,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Authentication domain to use with NTML
+ * Authentication domain to use with NTLM
*/
public void setAuthDomain(String authDomain) {
this.authDomain = authDomain;
@@ -714,7 +714,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Authentication host to use with NTML
+ * Authentication host to use with NTLM
*/
public void setAuthHost(String authHost) {
this.authHost = authHost;
@@ -769,7 +769,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Proxy authentication domain to use with NTML
+ * Proxy authentication domain to use with NTLM
*/
public void setProxyAuthDomain(String proxyAuthDomain) {
this.proxyAuthDomain = proxyAuthDomain;
@@ -780,7 +780,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Proxy authentication host to use with NTML
+ * Proxy authentication host to use with NTLM
*/
public void setProxyAuthHost(String proxyAuthHost) {
this.proxyAuthHost = proxyAuthHost;
@@ -824,7 +824,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
}
/**
- * Proxy authentication domain (workstation name) to use with NTML
+ * Proxy authentication domain (workstation name) to use with NTLM
*/
public void setProxyAuthNtHost(String proxyAuthNtHost) {
this.proxyAuthNtHost = proxyAuthNtHost;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConfiguration.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConfiguration.java
index ca34928c2c8..b84132714fe 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConfiguration.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConfiguration.java
@@ -25,10 +25,10 @@ public class HttpConfiguration implements Serializable {
private static final long serialVersionUID = 1L;
@Metadata(label = "producer,security",
- description = "Authentication methods allowed to use as a comma separated list of values Basic, Digest or NTLM. (NTLM is deprecated)")
+ description = "Authentication methods allowed to use as a comma separated list of values Basic, or NTLM. (NTLM is deprecated)")
private String authMethod;
- @Metadata(label = "producer,security", enums = "Basic,Bearer,Digest,NTLM",
- description = "Which authentication method to prioritize to use, either as Basic, Bearer, Digest or NTLM. (NTLM is deprecated)")
+ @Metadata(label = "producer,security", enums = "Basic,Bearer,NTLM",
+ description = "Which authentication method to prioritize to use, either as Basic, Bearer, or NTLM. (NTLM is deprecated)")
private String authMethodPriority;
@Metadata(label = "producer,security", secret = true, description = "Authentication username")
private String authUsername;
@@ -71,7 +71,7 @@ public class HttpConfiguration implements Serializable {
private int proxyPort;
@Metadata(label = "producer,proxy", enums = "http,https", description = "Authentication scheme to use")
private String proxyAuthScheme;
- @Metadata(label = "producer,proxy", enums = "Basic,Digest,NTLM", description = "Proxy authentication method to use")
+ @Metadata(label = "producer,proxy", enums = "Basic,Bearer,NTLM", description = "Proxy authentication method to use")
private String proxyAuthMethod;
@Metadata(label = "producer,proxy", secret = true, description = "Proxy authentication username")
private String proxyAuthUsername;
@@ -90,7 +90,7 @@ public class HttpConfiguration implements Serializable {
}
/**
- * Authentication methods allowed to use as a comma separated list of values Basic, Digest or NTLM.
+ * Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM (deprecated).
*/
public void setAuthMethod(String authMethod) {
this.authMethod = authMethod;
@@ -101,7 +101,7 @@ public class HttpConfiguration implements Serializable {
}
/**
- * Which authentication method to prioritize to use, either as Basic, Digest or NTLM.
+ * Which authentication method to prioritize to use, either as Basic, Bearer or NTLM (deprecated).
*/
public void setAuthMethodPriority(String authMethodPriority) {
this.authMethodPriority = authMethodPriority;
@@ -145,7 +145,7 @@ public class HttpConfiguration implements Serializable {
}
/**
- * Authentication domain to use with NTML
+ * Authentication domain to use with NTLM
*/
public void setAuthDomain(String authDomain) {
this.authDomain = authDomain;
@@ -156,7 +156,7 @@ public class HttpConfiguration implements Serializable {
}
/**
- * Authentication host to use with NTML
+ * Authentication host to use with NTLM
*/
public void setAuthHost(String authHost) {
this.authHost = authHost;
@@ -211,7 +211,7 @@ public class HttpConfiguration implements Serializable {
}
/**
- * Proxy authentication domain to use with NTML
+ * Proxy authentication domain to use with NTLM
*/
public void setProxyAuthDomain(String proxyAuthDomain) {
this.proxyAuthDomain = proxyAuthDomain;
diff --git a/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/http.json b/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/http.json
index 10d843bf738..02056583d25 100644
--- a/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/http.json
+++ b/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/http.json
@@ -125,10 +125,10 @@
"httpContext": { "index": 33, "kind": "parameter", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HttpContext instance" },
"maxTotalConnections": { "index": 34, "kind": "parameter", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 200, "description": "The maximum number of connections." },
"useSystemProperties": { "index": 35, "kind": "parameter", "displayName": "Use System Properties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To use System Properties as fallback for configuration for configuring HTTP Client" },
- "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTML" },
+ "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTLM" },
"proxyAuthHost": { "index": 37, "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication host" },
- "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
- "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" },
+ "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
+ "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTLM" },
"proxyAuthPassword": { "index": 40, "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Proxy authentication password" },
"proxyAuthPort": { "index": 41, "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication port" },
"proxyAuthScheme": { "index": 42, "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication scheme to use" },
@@ -136,11 +136,11 @@
"proxyHost": { "index": 44, "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy hostname to use" },
"proxyPort": { "index": 45, "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy port to use" },
"authBearerToken": { "index": 46, "kind": "parameter", "displayName": "Auth Bearer Token", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication bearer token" },
- "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTML" },
+ "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTLM" },
"authenticationPreemptive": { "index": 48, "kind": "parameter", "displayName": "Authentication Preemptive", "group": "security", "label": "producer,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If this option is true, camel-http sends preemptive basic authentication to the server." },
- "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTML" },
- "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
- "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
+ "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTLM" },
+ "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM. (NTLM is deprecated)" },
+ "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, or NTLM. (NTLM is deprecated)" },
"authPassword": { "index": 52, "kind": "parameter", "displayName": "Auth Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication password" },
"authUsername": { "index": 53, "kind": "parameter", "displayName": "Auth Username", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication username" },
"oauth2CachedTokensDefaultExpirySeconds": { "index": 54, "kind": "parameter", "displayName": "Oauth2 Cached Tokens Default Expiry Seconds", "group": "security", "label": "producer,security", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field." },
diff --git a/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/https.json b/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/https.json
index b0ea6dc4976..733d6d39eba 100644
--- a/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/https.json
+++ b/components/camel-http/src/generated/resources/META-INF/org/apache/camel/component/http/https.json
@@ -125,10 +125,10 @@
"httpContext": { "index": 33, "kind": "parameter", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.hc.core5.http.protocol.HttpContext", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HttpContext instance" },
"maxTotalConnections": { "index": 34, "kind": "parameter", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 200, "description": "The maximum number of connections." },
"useSystemProperties": { "index": 35, "kind": "parameter", "displayName": "Use System Properties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To use System Properties as fallback for configuration for configuring HTTP Client" },
- "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTML" },
+ "proxyAuthDomain": { "index": 36, "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain to use with NTLM" },
"proxyAuthHost": { "index": 37, "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication host" },
- "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
- "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTML" },
+ "proxyAuthMethod": { "index": 38, "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication method to use" },
+ "proxyAuthNtHost": { "index": 39, "kind": "parameter", "displayName": "Proxy Auth Nt Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Proxy authentication domain (workstation name) to use with NTLM" },
"proxyAuthPassword": { "index": 40, "kind": "parameter", "displayName": "Proxy Auth Password", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Proxy authentication password" },
"proxyAuthPort": { "index": 41, "kind": "parameter", "displayName": "Proxy Auth Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication port" },
"proxyAuthScheme": { "index": 42, "kind": "parameter", "displayName": "Proxy Auth Scheme", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "autowired": false, "secret": false, "description": "Proxy authentication scheme to use" },
@@ -136,11 +136,11 @@
"proxyHost": { "index": 44, "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy hostname to use" },
"proxyPort": { "index": 45, "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "producer,proxy", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Proxy port to use" },
"authBearerToken": { "index": 46, "kind": "parameter", "displayName": "Auth Bearer Token", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication bearer token" },
- "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTML" },
+ "authDomain": { "index": 47, "kind": "parameter", "displayName": "Auth Domain", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication domain to use with NTLM" },
"authenticationPreemptive": { "index": 48, "kind": "parameter", "displayName": "Authentication Preemptive", "group": "security", "label": "producer,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If this option is true, camel-http sends preemptive basic authentication to the server." },
- "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTML" },
- "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
- "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "Digest", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, Digest or NTLM. (NTLM is deprecated)" },
+ "authHost": { "index": 49, "kind": "parameter", "displayName": "Auth Host", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Authentication host to use with NTLM" },
+ "authMethod": { "index": 50, "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Bearer, or NTLM. (NTLM is deprecated)" },
+ "authMethodPriority": { "index": 51, "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Bearer", "NTLM" ], "deprecated": false, "autowired": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Bearer, or NTLM. (NTLM is deprecated)" },
"authPassword": { "index": 52, "kind": "parameter", "displayName": "Auth Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication password" },
"authUsername": { "index": 53, "kind": "parameter", "displayName": "Auth Username", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Authentication username" },
"oauth2CachedTokensDefaultExpirySeconds": { "index": 54, "kind": "parameter", "displayName": "Oauth2 Cached Tokens Default Expiry Seconds", "group": "security", "label": "producer,security", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 3600, "description": "Default expiration time for cached OAuth2 tokens, in seconds. Used if token response does not contain 'expires_in' field." },
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index b9ff0d858ee..9593b72a0be 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -398,7 +398,7 @@ public interface HttpEndpointBuilderFactory {
return this;
}
/**
- * Proxy authentication domain to use with NTML.
+ * Proxy authentication domain to use with NTLM.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -441,7 +441,7 @@ public interface HttpEndpointBuilderFactory {
return this;
}
/**
- * Proxy authentication domain (workstation name) to use with NTML.
+ * Proxy authentication domain (workstation name) to use with NTLM.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -582,7 +582,7 @@ public interface HttpEndpointBuilderFactory {
return this;
}
/**
- * Authentication domain to use with NTML.
+ * Authentication domain to use with NTLM.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -629,7 +629,7 @@ public interface HttpEndpointBuilderFactory {
return this;
}
/**
- * Authentication host to use with NTML.
+ * Authentication host to use with NTLM.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -645,7 +645,7 @@ public interface HttpEndpointBuilderFactory {
}
/**
* Authentication methods allowed to use as a comma separated list of
- * values Basic, Bearer, Digest or NTLM. (NTLM is deprecated).
+ * values Basic, Bearer, or NTLM. (NTLM is deprecated).
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -660,7 +660,7 @@ public interface HttpEndpointBuilderFactory {
}
/**
* Which authentication method to prioritize to use, either as Basic,
- * Bearer, Digest or NTLM. (NTLM is deprecated).
+ * Bearer, or NTLM. (NTLM is deprecated).
*
* The option is a: <code>java.lang.String</code> type.
*
(camel) 02/02: camel-oauth - Add first version
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6e1697074d82dee35271a55f21e5149c7a34ac17
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 22 12:51:06 2025 +0200
camel-oauth - Add first version
---
.../generated/resources/org/apache/camel/catalog/others/oauth.json | 1 +
components/camel-oauth/pom.xml | 4 ++--
components/camel-oauth/src/generated/resources/oauth.json | 1 +
parent/pom.xml | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/oauth.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/oauth.json
index f5477cc8915..dbd8b68ba8d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/oauth.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/oauth.json
@@ -5,6 +5,7 @@
"title": "Oauth",
"description": "Camel OAuth (Preview)",
"deprecated": false,
+ "firstVersion": "4.12.0",
"supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-oauth",
diff --git a/components/camel-oauth/pom.xml b/components/camel-oauth/pom.xml
index f049ce547e3..5782340a8b1 100644
--- a/components/camel-oauth/pom.xml
+++ b/components/camel-oauth/pom.xml
@@ -33,7 +33,7 @@
<description>Camel OAuth (Preview)</description>
<properties>
- <keycloak.client.version>26.0.5</keycloak.client.version>
+ <firstVersion>4.12.0</firstVersion>
<supportLevel>preview</supportLevel>
</properties>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak.client.version}</version>
+ <version>${keycloak-client-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-oauth/src/generated/resources/oauth.json b/components/camel-oauth/src/generated/resources/oauth.json
index f5477cc8915..dbd8b68ba8d 100644
--- a/components/camel-oauth/src/generated/resources/oauth.json
+++ b/components/camel-oauth/src/generated/resources/oauth.json
@@ -5,6 +5,7 @@
"title": "Oauth",
"description": "Camel OAuth (Preview)",
"deprecated": false,
+ "firstVersion": "4.12.0",
"supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-oauth",
diff --git a/parent/pom.xml b/parent/pom.xml
index 428c3f548ca..436549c6296 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -326,6 +326,7 @@
<jython-version>2.7.4</jython-version>
<jzlib-version>1.1.3</jzlib-version>
<kafka-version>3.8.1</kafka-version>
+ <keycloak-client-version>26.0.5</keycloak-client-version>
<kubernetes-client-version>7.3.1</kubernetes-client-version>
<kudu-version>1.17.1</kudu-version>
<langchain4j-version>0.36.2</langchain4j-version>