Skip to content

Commit 33e33a3

Browse files
Merge branch 'apache:main' into jms-new-reply-correlation-property
2 parents 903459b + 119b574 commit 33e33a3

File tree

122 files changed

+14862
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+14862
-7
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ updates:
2727
schedule:
2828
interval: "daily"
2929
ignore:
30-
# amazon-kinesis-client 3.x requires protobuf 4.x
31-
# Quarkus forces protobuf to 3.25.5, therefore amazon-kinesis-client has to stay on 2.6.0
32-
- dependency-name: "software.amazon.kinesis:amazon-kinesis-client"
3330
# Quarkus related
3431
- dependency-name: "io.vertx:*"
3532
- dependency-name: "io.smallrye:jandex:*"

bom/camel-bom/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,6 +1522,11 @@
15221522
<artifactId>camel-microprofile-health</artifactId>
15231523
<version>4.15.0-SNAPSHOT</version>
15241524
</dependency>
1525+
<dependency>
1526+
<groupId>org.apache.camel</groupId>
1527+
<artifactId>camel-milo</artifactId>
1528+
<version>4.15.0-SNAPSHOT</version>
1529+
</dependency>
15251530
<dependency>
15261531
<groupId>org.apache.camel</groupId>
15271532
<artifactId>camel-milvus</artifactId>

catalog/camel-allcomponents/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,6 +1331,11 @@
13311331
<artifactId>camel-microprofile-health</artifactId>
13321332
<version>${project.version}</version>
13331333
</dependency>
1334+
<dependency>
1335+
<groupId>org.apache.camel</groupId>
1336+
<artifactId>camel-milo</artifactId>
1337+
<version>${project.version}</version>
1338+
</dependency>
13341339
<dependency>
13351340
<groupId>org.apache.camel</groupId>
13361341
<artifactId>camel-milvus</artifactId>

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ mapstruct
231231
master
232232
metrics
233233
micrometer
234+
milo-browse
235+
milo-client
236+
milo-server
234237
milvus
235238
mina
236239
minio

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-browse.json

Lines changed: 87 additions & 0 deletions
Large diffs are not rendered by default.

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json

Lines changed: 93 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"component": {
3+
"kind": "component",
4+
"name": "milo-server",
5+
"title": "OPC UA Server",
6+
"description": "Make telemetry data available as an OPC UA server.",
7+
"deprecated": false,
8+
"firstVersion": "2.19.0",
9+
"label": "iot",
10+
"javaType": "org.apache.camel.component.milo.server.MiloServerComponent",
11+
"supportLevel": "Stable",
12+
"groupId": "org.apache.camel",
13+
"artifactId": "camel-milo",
14+
"version": "4.15.0-SNAPSHOT",
15+
"scheme": "milo-server",
16+
"extendsScheme": "",
17+
"syntax": "milo-server:itemId",
18+
"async": false,
19+
"api": false,
20+
"consumerOnly": false,
21+
"producerOnly": false,
22+
"lenientProperties": false,
23+
"browsable": false,
24+
"remote": true
25+
},
26+
"componentProperties": {
27+
"applicationName": { "index": 0, "kind": "property", "displayName": "Application Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The application name" },
28+
"applicationUri": { "index": 1, "kind": "property", "displayName": "Application Uri", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The application URI" },
29+
"bindAddresses": { "index": 2, "kind": "property", "displayName": "Bind Addresses", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set the addresses of the local addresses the server should bind to" },
30+
"buildInfo": { "index": 3, "kind": "property", "displayName": "Build Info", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo", "deprecated": false, "autowired": false, "secret": false, "description": "Server build info" },
31+
"namespaceUri": { "index": 4, "kind": "property", "displayName": "Namespace Uri", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "urn:org:apache:camel", "description": "The URI of the namespace, defaults to urn:org:apache:camel" },
32+
"path": { "index": 5, "kind": "property", "displayName": "Path", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path to be appended to the end of the endpoint url. (doesn't need to start with '\/')" },
33+
"port": { "index": 6, "kind": "property", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The TCP port the server binds to" },
34+
"productUri": { "index": 7, "kind": "property", "displayName": "Product Uri", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The product URI" },
35+
"bridgeErrorHandler": { "index": 8, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. Important: This is only possible if the 3rd party component allows Camel to be alerted if an exception was thrown. Some components handle this internally only, and therefore bridgeErrorHandler is not possible. In other situations we may improve the Camel component to hook into the 3rd party component and make this possible for future releases. 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." },
36+
"lazyStartProducer": { "index": 9, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during 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 processed then creating and starting the producer may take a little time and prolong the total processing time of the processing." },
37+
"autowiredEnabled": { "index": 10, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc." },
38+
"certificate": { "index": 11, "kind": "property", "displayName": "Certificate", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.security.cert.X509Certificate", "deprecated": false, "autowired": false, "secret": false, "description": "Server certificate" },
39+
"certificateManager": { "index": 12, "kind": "property", "displayName": "Certificate Manager", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.security.CertificateManager", "deprecated": false, "autowired": false, "secret": false, "description": "Server certificate manager" },
40+
"certificateValidator": { "index": 13, "kind": "property", "displayName": "Certificate Validator", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.security.CertificateValidator", "deprecated": false, "autowired": false, "secret": false, "description": "Validator for client certificates" },
41+
"defaultCertificateValidator": { "index": 14, "kind": "property", "displayName": "Default Certificate Validator", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Validator for client certificates using default file based approach" },
42+
"enableAnonymousAuthentication": { "index": 15, "kind": "property", "displayName": "Enable Anonymous Authentication", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable anonymous authentication, disabled by default" },
43+
"securityPolicies": { "index": 16, "kind": "property", "displayName": "Security Policies", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.util.Set<org.eclipse.milo.opcua.stack.core.security.SecurityPolicy>", "deprecated": false, "autowired": false, "secret": false, "description": "Security policies" },
44+
"securityPoliciesById": { "index": 17, "kind": "property", "displayName": "Security Policies By Id", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Security policies by URI or name. Multiple policies can be separated by comma." },
45+
"userAuthenticationCredentials": { "index": 18, "kind": "property", "displayName": "User Authentication Credentials", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Set user password combinations in the form of user1:pwd1,user2:pwd2 Usernames and passwords will be URL decoded" },
46+
"usernameSecurityPolicyUri": { "index": 19, "kind": "property", "displayName": "Username Security Policy Uri", "group": "security", "label": "security", "required": false, "type": "enum", "javaType": "org.eclipse.milo.opcua.stack.core.security.SecurityPolicy", "enum": [ "None", "Basic128Rsa15", "Basic256", "Basic256Sha256", "Aes128_Sha256_RsaOaep", "Aes256_Sha256_RsaPss" ], "deprecated": false, "autowired": false, "secret": false, "description": "Set the UserTokenPolicy used when" }
47+
},
48+
"properties": {
49+
"itemId": { "index": 0, "kind": "path", "displayName": "Item Id", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "ID of the item" },
50+
"bridgeErrorHandler": { "index": 1, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. Important: This is only possible if the 3rd party component allows Camel to be alerted if an exception was thrown. Some components handle this internally only, and therefore bridgeErrorHandler is not possible. In other situations we may improve the Camel component to hook into the 3rd party component and make this possible for future releases. 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." },
51+
"exceptionHandler": { "index": 2, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored." },
52+
"exchangePattern": { "index": 3, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
53+
"lazyStartProducer": { "index": 4, "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 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 processed then creating and starting the producer may take a little time and prolong the total processing time of the processing." }
54+
}
55+
}

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"emailaddress",
2626
"httpproxypassword",
2727
"kerberosauthticket",
28+
"keypassword",
2829
"keystorePassword",
2930
"keystorepassword",
3031
"login",
@@ -70,6 +71,7 @@
7071
"tokencredential",
7172
"truststorepassword",
7273
"user",
74+
"userauthenticationcredentials",
7375
"username",
7476
"userpassword",
7577
"verificationcode",

components/camel-activemq6/src/main/docs/activemq6-component.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
:tabs-sync-option:
99
:component-header: Both producer and consumer are supported
1010
//Manually maintained attributes
11-
:camel-spring-boot-name: activemq
11+
:camel-spring-boot-name: activemq6
1212

1313
*Since Camel {since}*
1414

components/camel-aws/camel-aws-config/src/main/docs/aws-config-component.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:component-header: Only producer is supported
1010
//Manually maintained attributes
1111
:group: AWS
12-
:camel-spring-boot-name: aws2-ecs
12+
:camel-spring-boot-name: aws-config
1313

1414
*Since Camel {since}*
1515

0 commit comments

Comments
 (0)