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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new d17edd220c8 [create-pull-request] automated change
d17edd220c8 is described below
commit d17edd220c8e4cd02cb87c2d7cacc3f6d3a1197d
Author: oscerd <[email protected]>
AuthorDate: Tue Nov 8 01:11:38 2022 +0000
[create-pull-request] automated change
---
.../org/apache/camel/springboot/catalog/components/git.json | 3 ++-
.../org/apache/camel/springboot/catalog/components/http.json | 1 +
.../apache/camel/springboot/catalog/components/https.json | 1 +
.../camel-http-starter/src/main/docs/http.json | 6 ++++++
.../http/springboot/HttpComponentConfiguration.java | 12 ++++++++++++
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
6 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/git.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/git.json
index b8d43887e71..74b05d8f97f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/git.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/git.json
@@ -55,6 +55,7 @@
"tagName": { "kind": "parameter", "displayName": "Tag Name", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The tag name to work on" },
"targetBranchName": { "kind": "parameter", "displayName": "Target Branch
Name", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "master", "description": "Name of
target branch in merge operation. If not supplied will try to use
init.defaultBranch git configs. If not configured will use default value" },
"username": { "kind": "parameter", "displayName": "Username", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Remote repository username" },
- "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer (advanced)", "label": "producer,advanced",
"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 other [...]
+ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer (advanced)", "label": "producer,advanced",
"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 other [...]
+ "gitConfigFile": { "kind": "parameter", "displayName": "Git Config File",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "A String with path to a .gitconfig file" }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
index 78d65b9beaa..8d5d87fc1a3 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
@@ -56,6 +56,7 @@
"proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt
Host", "group": "proxy", "label": "producer,proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication domain
(workstation name) to use with NTML" },
"proxyAuthPassword": { "kind": "property", "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": { "kind": "property", "displayName": "Proxy Auth Port",
"group": "proxy", "label": "producer,proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication port" },
+ "proxyAuthScheme": { "kind": "property", "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 protocol scheme" },
"proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth
Username", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "Proxy authentication
username" },
"sslContextParameters": { "kind": "property", "displayName": "Ssl Context
Parameters", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure security
using SSLContextParameters. Important: Only one instance of
org.apache.camel.support.jsse.SSLContextParameters is supported per
HttpComponent. If you need to us [...]
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
index ef7dc32b014..11388523241 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
@@ -56,6 +56,7 @@
"proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt
Host", "group": "proxy", "label": "producer,proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication domain
(workstation name) to use with NTML" },
"proxyAuthPassword": { "kind": "property", "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": { "kind": "property", "displayName": "Proxy Auth Port",
"group": "proxy", "label": "producer,proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication port" },
+ "proxyAuthScheme": { "kind": "property", "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 protocol scheme" },
"proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth
Username", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "Proxy authentication
username" },
"sslContextParameters": { "kind": "property", "displayName": "Ssl Context
Parameters", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure security
using SSLContextParameters. Important: Only one instance of
org.apache.camel.support.jsse.SSLContextParameters is supported per
HttpComponent. If you need to us [...]
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." },
diff --git a/components-starter/camel-http-starter/src/main/docs/http.json
b/components-starter/camel-http-starter/src/main/docs/http.json
index 9d643780ea8..07da32295a3 100644
--- a/components-starter/camel-http-starter/src/main/docs/http.json
+++ b/components-starter/camel-http-starter/src/main/docs/http.json
@@ -213,6 +213,12 @@
"description": "Proxy authentication port",
"sourceType":
"org.apache.camel.component.http.springboot.HttpComponentConfiguration"
},
+ {
+ "name": "camel.component.http.proxy-auth-scheme",
+ "type": "java.lang.String",
+ "description": "Proxy authentication protocol scheme",
+ "sourceType":
"org.apache.camel.component.http.springboot.HttpComponentConfiguration"
+ },
{
"name": "camel.component.http.proxy-auth-username",
"type": "java.lang.String",
diff --git
a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index ccc2c222a5f..728cd3209fc 100644
---
a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
+++
b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -214,6 +214,10 @@ public class HttpComponentConfiguration
* Proxy authentication port
*/
private Integer proxyAuthPort;
+ /**
+ * Proxy authentication protocol scheme
+ */
+ private String proxyAuthScheme;
/**
* Proxy authentication username
*/
@@ -511,6 +515,14 @@ public class HttpComponentConfiguration
this.proxyAuthPort = proxyAuthPort;
}
+ public String getProxyAuthScheme() {
+ return proxyAuthScheme;
+ }
+
+ public void setProxyAuthScheme(String proxyAuthScheme) {
+ this.proxyAuthScheme = proxyAuthScheme;
+ }
+
public String getProxyAuthUsername() {
return proxyAuthUsername;
}
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index b3e33cbf975..992ff18b72d 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -100,6 +100,11 @@
<artifactId>disruptor</artifactId>
<version>3.4.4</version>
</dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j</artifactId>
+ <version>1.13.3</version>
+ </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
