[GitHub] [camel-k] nf3lix commented on issue #4117: Kamelets are tried to unmarshal with old Flow
nf3lix commented on issue #4117:
URL: https://github.com/apache/camel-k/issues/4117#issuecomment-1562374666
Hi @squakez
I'm facing the same issue when trying to run an Integration.
```yaml
apiVersion: camel.apache.org/v1
kind: Integration
metadata:
name: sample-route-1
spec:
flows:
- route:
id: route-a1ba
from:
uri: kamelet:timer-source
id: from-8fbf
parameters:
message: hello world
period: 5000
steps:
- log:
message: ${body}
id: log-d8d4
```
When running `kamel run sample-route-1.yaml` I get the same error ("Error:
json: cannot unmarshal object into Go value of type []v1.Flow"). Applying this
integration with `kubectl apply -f sample-route-1.yaml` works fine.
Is anyone able to reproduce that behavior?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] grgrzybek commented on pull request #10205: CAMEL-19386: Support object property on template bean
grgrzybek commented on PR #10205: URL: https://github.com/apache/camel/pull/10205#issuecomment-1562374566 yes, this is what I was thinking about and it's ok: ```java @XmlElement(name = "properties") @XmlJavaTypeAdapter(BeanPropertiesAdapter.class) private Map properties; ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] christophd commented on pull request #4411: chore: Improve Camel dependency validation
christophd commented on PR #4411: URL: https://github.com/apache/camel-k/pull/4411#issuecomment-1562364370 @squakez I think there has been an issue with the validate workflow recently? should I rebase? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (972d6fc3e15 -> 27dfd5ce22f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 972d6fc3e15 camel-elasticsearch: Downgrade the jackson version to 2.14.3 (#10203) add ca2c6815881 (chores) camel-util: return an empty map if there's no parameters add 44d0d0421bf (chores) camel-util: rework the createQueryString to use an array of Strings add 27dfd5ce22f (chores) camel-util: skip replacing percent unless it is present No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/util/URIScanner.java | 11 ++- .../java/org/apache/camel/util/URISupport.java | 38 ++ 2 files changed, 35 insertions(+), 14 deletions(-)
[camel-spring-boot] 01/01: Regen
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
commit 6e1453a2f2feca320f1a26b02a7adcae54970c73
Author: Claus Ibsen
AuthorDate: Thu May 25 06:31:00 2023 +0200
Regen
---
.../springboot/catalog/components/debezium-oracle.json | 4 ++--
.../camel/springboot/catalog/components/slack.json | 2 +-
.../src/main/docs/debezium-oracle.json | 4 ++--
.../DebeziumOracleComponentConfiguration.java | 17 +
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
index 4e93993aa44..0fea549d07f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
@@ -82,7 +82,7 @@
"logMiningSleepTimeMaxMs": { "index": 57, "kind": "property",
"displayName": "Log Mining Sleep Time Max Ms", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "duration", "javaType": "long",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "3s",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The maximum amount [...]
"logMiningSleepTimeMinMs": { "index": 58, "kind": "property",
"displayName": "Log Mining Sleep Time Min Ms", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "duration", "javaType": "long",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"0ms", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The minimum amoun [...]
"logMiningStrategy": { "index": 59, "kind": "property", "displayName":
"Log Mining Strategy", "group": "oracle", "label": "consumer,oracle",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"redo_log_catalog", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "There are [...]
-"logMiningTransactionRetentionHours": { "index": 60, "kind": "property",
"displayName": "Log Mining Transaction Retention Hours", "group": "oracle",
"label": "consumer,oracle", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 0, "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "H [...]
+"logMiningTransactionRetentionMs": { "index": 60, "kind": "property",
"displayName": "Log Mining Transaction Retention Ms", "group": "oracle",
"label": "consumer,oracle", "required": false, "type": "duration", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0ms", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Du [...]
"logMiningUsernameExcludeList": { "index": 61, "kind": "property",
"displayName": "Log Mining Username Exclude List", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Comma separated list
[...]
"maxBatchSize": { "index": 62, "kind": "property", "displayName": "Max
Batch Size", "group": "oracle", "label": "consumer,oracle", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 2048, "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Maximum size of each
batch of source records. [...]
"maxQueueSize": { "index": 63, "kind": "property", "displayName": "Max
Queue Size", "group": "oracle", "label": "consumer,oracle", "required": false,
"type": "integer", "javaType": "int", "deprecated":
[camel-spring-boot] branch main created (now 6e1453a2f2f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 6e1453a2f2f Regen This branch includes the following new commits: new 6e1453a2f2f Regen The 1 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.
[GitHub] [camel] grgrzybek commented on pull request #10205: CAMEL-19386: Support object property on template bean
grgrzybek commented on PR #10205: URL: https://github.com/apache/camel/pull/10205#issuecomment-1562271762 I'll check this PR before noon (CEST). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: Regen
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 6e1453a2f2f Regen
6e1453a2f2f is described below
commit 6e1453a2f2feca320f1a26b02a7adcae54970c73
Author: Claus Ibsen
AuthorDate: Thu May 25 06:31:00 2023 +0200
Regen
---
.../springboot/catalog/components/debezium-oracle.json | 4 ++--
.../camel/springboot/catalog/components/slack.json | 2 +-
.../src/main/docs/debezium-oracle.json | 4 ++--
.../DebeziumOracleComponentConfiguration.java | 17 +
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
index 4e93993aa44..0fea549d07f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-oracle.json
@@ -82,7 +82,7 @@
"logMiningSleepTimeMaxMs": { "index": 57, "kind": "property",
"displayName": "Log Mining Sleep Time Max Ms", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "duration", "javaType": "long",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": "3s",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The maximum amount [...]
"logMiningSleepTimeMinMs": { "index": 58, "kind": "property",
"displayName": "Log Mining Sleep Time Min Ms", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "duration", "javaType": "long",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"0ms", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The minimum amoun [...]
"logMiningStrategy": { "index": 59, "kind": "property", "displayName":
"Log Mining Strategy", "group": "oracle", "label": "consumer,oracle",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"redo_log_catalog", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "There are [...]
-"logMiningTransactionRetentionHours": { "index": 60, "kind": "property",
"displayName": "Log Mining Transaction Retention Hours", "group": "oracle",
"label": "consumer,oracle", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 0, "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "H [...]
+"logMiningTransactionRetentionMs": { "index": 60, "kind": "property",
"displayName": "Log Mining Transaction Retention Ms", "group": "oracle",
"label": "consumer,oracle", "required": false, "type": "duration", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0ms", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Du [...]
"logMiningUsernameExcludeList": { "index": 61, "kind": "property",
"displayName": "Log Mining Username Exclude List", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Comma separated list
[...]
"maxBatchSize": { "index": 62, "kind": "property", "displayName": "Max
Batch Size", "group": "oracle", "label": "consumer,oracle", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 2048, "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Maximum size of each
batch of source records. [...]
"maxQueueSize": { "index": 63, "kind": "property", "displayName": "Max
Queue
[camel] 03/03: (chores) camel-util: skip replacing percent unless it is present
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 27dfd5ce22f6ebb6deac30500d649a57827cdde1
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 18:37:03 2023 +0200
(chores) camel-util: skip replacing percent unless it is present
---
.../src/main/java/org/apache/camel/util/URIScanner.java | 11 ++-
.../src/main/java/org/apache/camel/util/URISupport.java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index c387e89c985..9753dda63fe 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -161,7 +161,8 @@ class URIScanner {
text = value.toString();
} else {
// need to replace % with %25 to avoid losing "%" when decoding
-String s = value.toString().replace("%", "%25");
+final String s = replacePercent(value.toString());
+
text = URLDecoder.decode(s, CHARSET);
}
@@ -259,4 +260,12 @@ class URIScanner {
return null;
}
+public static String replacePercent(String input) {
+if (input.contains("%")) {
+return input.replace("%", "%25");
+}
+
+return input;
+}
+
}
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 6ba36cac9c4..2d3b16fd911 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -512,7 +512,7 @@ public final class URISupport {
if (raw != null) {
// do not encode RAW parameters unless it has %
// need to replace % with %25 to avoid losing "%" when decoding
-String s = value.replace("%", "%25");
+final String s = URIScanner.replacePercent(value);
rc.append(s);
} else {
if (encode) {
[camel] branch main updated (972d6fc3e15 -> 27dfd5ce22f)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 972d6fc3e15 camel-elasticsearch: Downgrade the jackson version to 2.14.3 (#10203) new ca2c6815881 (chores) camel-util: return an empty map if there's no parameters new 44d0d0421bf (chores) camel-util: rework the createQueryString to use an array of Strings new 27dfd5ce22f (chores) camel-util: skip replacing percent unless it is present The 3 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: .../java/org/apache/camel/util/URIScanner.java | 11 ++- .../java/org/apache/camel/util/URISupport.java | 38 ++ 2 files changed, 35 insertions(+), 14 deletions(-)
[GitHub] [camel] orpiske merged pull request #10204: (chores) camel-util: cleanups and perf improvements
orpiske merged PR #10204: URL: https://github.com/apache/camel/pull/10204 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/03: (chores) camel-util: rework the createQueryString to use an array of Strings
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 44d0d0421bf0a9d42f0619424a283c97d832e474
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 18:00:48 2023 +0200
(chores) camel-util: rework the createQueryString to use an array of Strings
---
.../java/org/apache/camel/util/URISupport.java | 33 ++
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 06dd4d72f9b..6ba36cac9c4 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -22,13 +22,14 @@ import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.regex.Pattern;
import static org.apache.camel.util.CamelURIParser.URI_ALREADY_NORMALIZED;
@@ -436,7 +437,8 @@ public final class URISupport {
* options.
*/
public static String createQueryString(Map options) {
-return createQueryString(options.keySet(), options, true);
+final Set keySet = options.keySet();
+return createQueryString(keySet.toArray(new String[keySet.size()]),
options, true);
}
/**
@@ -451,7 +453,7 @@ public final class URISupport {
return createQueryString(options.keySet(), options, encode);
}
-public static String createQueryString(Collection sortedKeys,
Map options, boolean encode) {
+private static String createQueryString(String[] sortedKeys, Map options, boolean encode) {
if (options.isEmpty()) {
return EMPTY_QUERY_STRING;
}
@@ -489,6 +491,11 @@ public final class URISupport {
return rc.toString();
}
+@Deprecated
+public static String createQueryString(Collection sortedKeys,
Map options, boolean encode) {
+return createQueryString(sortedKeys.toArray(new
String[sortedKeys.size()]), options, encode);
+}
+
private static void appendQueryStringParameter(String key, String value,
StringBuilder rc, boolean encode) {
if (encode) {
String encoded = URLEncoder.encode(key, CHARSET);
@@ -646,11 +653,12 @@ public final class URISupport {
return buildUri(scheme, path, query);
} else {
// reorder parameters a..z
-List keys = new ArrayList<>(parameters.keySet());
-keys.sort(null);
+final Set keySet = parameters.keySet();
+final String[] parametersArray = keySet.toArray(new
String[keySet.size()]);
+Arrays.sort(parametersArray);
// build uri object with sorted parameters
-query = URISupport.createQueryString(keys, parameters, true);
+query = URISupport.createQueryString(parametersArray,
parameters, true);
return buildUri(scheme, path, query);
}
}
@@ -680,14 +688,17 @@ public final class URISupport {
// only parse if there are parameters
parameters = URISupport.parseQuery(query, false, false);
}
+
if (parameters == null || parameters.size() == 1) {
return buildUri(scheme, path, query);
} else {
+final Set entries = parameters.keySet();
+
// reorder parameters a..z
// optimize and only build new query if the keys was resorted
boolean sort = false;
String prev = null;
-for (String key : parameters.keySet()) {
+for (String key : entries) {
if (prev == null) {
prev = key;
} else {
@@ -700,10 +711,10 @@ public final class URISupport {
}
}
if (sort) {
-List keys = new ArrayList<>(parameters.keySet());
-keys.sort(null);
-// rebuild query with sorted parameters
-query = URISupport.createQueryString(keys, parameters, true);
+final String[] array = entries.toArray(new
String[entries.size()]);
+Arrays.sort(array);
+
+query = URISupport.createQueryString(array, parameters, true);
}
return buildUri(scheme, path, query);
[camel] 01/03: (chores) camel-util: return an empty map if there's no parameters
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ca2c6815881c9617797566c965ef120d8ca5e8be
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 15:24:03 2023 +0200
(chores) camel-util: return an empty map if there's no parameters
---
core/camel-util/src/main/java/org/apache/camel/util/URISupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 3a0a124d881..06dd4d72f9b 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -210,7 +211,7 @@ public final class URISupport {
public static Map parseQuery(String uri, boolean useRaw,
boolean lenient) throws URISyntaxException {
if (uri == null || uri.isEmpty()) {
// return an empty map
-return new LinkedHashMap<>(0);
+return Collections.emptyMap();
}
// must check for trailing & as the uri.split("&") will ignore those
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 62a5825719 Updated CHANGELOG.md
62a5825719 is described below
commit 62a58257196f380adf0d908a7412f421220a35ea
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu May 25 03:17:07 2023 +
Updated CHANGELOG.md
---
CHANGELOG.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0531d9236b..a08955c842 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
**Merged pull requests:**
+- Upgrade Quarkus to 3.1.0.Final
[\#4925](https://github.com/apache/camel-quarkus/pull/4925)
([jamesnetherton](https://github.com/jamesnetherton))
- Generated sources regen for SBOM
[\#4922](https://github.com/apache/camel-quarkus/pull/4922)
([github-actions[bot]](https://github.com/apps/github-actions))
- Upgrade CycloneDX Maven plugin to version 2.7.9
[\#4917](https://github.com/apache/camel-quarkus/pull/4917)
([oscerd](https://github.com/oscerd))
- fix contributor links
[\#4915](https://github.com/apache/camel-quarkus/pull/4915)
([onderson](https://github.com/onderson))
@@ -1644,7 +1645,7 @@
- \[camel-main\] Csimple: Cannot find compiled csimple language for
expression: Hello ${body}
[\#4745](https://github.com/apache/camel-quarkus/issues/4745)
- \[camel-main\] Foundation: BeanTest.parameterTypes fails with the current
Camel main [\#4735](https://github.com/apache/camel-quarkus/issues/4735)
- java-joor-dsl - Add support of inner classes
[\#4731](https://github.com/apache/camel-quarkus/issues/4731)
-- \[Quarkus X.Y.Z\] Performance regression introduced in Camel Quarkus
3.0.0-M1 [\#4727](https://github.com/apache/camel-quarkus/issues/4727)
+- \[Quarkus 3.0.0.CR2\] Performance regression introduced in Camel Quarkus
3.0.0-M1 [\#4727](https://github.com/apache/camel-quarkus/issues/4727)
- Intermittent failure in Jdbc native tests
[\#4723](https://github.com/apache/camel-quarkus/issues/4723)
- Expand came-quarkus-mybatis test coverage
[\#4717](https://github.com/apache/camel-quarkus/issues/4717)
- java-joor-dsl - Add RegisterForReflection annotation support
[\#4716](https://github.com/apache/camel-quarkus/issues/4716)
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 63ca88b4 Updated CHANGELOG.md 63ca88b4 is described below commit 63ca88b4d6d8c69e2f44a12557886f08fa1a8ac4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu May 25 03:05:08 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e033066d..53c9c6e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Include miscellaneous components in Camel catalog [\#1029](https://github.com/apache/camel-k-runtime/issues/1029) - Release 1.17.0 [\#951](https://github.com/apache/camel-k-runtime/issues/951) **Merged pull requests:**
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #843: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4)
github-actions[bot] opened a new pull request, #843: URL: https://github.com/apache/camel-spring-boot/pull/843 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1562098459 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 5074632270-1023-1c5cc5d7-ede2-4858-b5c2-569a292fcdeb * Camel Quarkus Commit: 490c61b8d7da4266b4cf73858fd86e0184bcaf37 * Camel Main Commit: 25a4e225121e31afda48c64f2511f1a68ef04b9f * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5074632270 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new issue, #2927: [CI] - Camel Main Branch Build Failure
jamesnetherton opened a new issue, #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/camel-master-cron.yaml) for the [`camel-main`](https://github.com/apache/camel-quarkus/tree/camel-main) branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #654: Cannot load Knative configuration from file or env variable
github-actions[bot] commented on issue #654: URL: https://github.com/apache/camel-k/issues/654#issuecomment-1562086400 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 02/02: chore: nightly resource refresh
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 073fe414a3f2ab2b5073bd59b83502194e43ab14
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed May 24 23:49:46 2023 +
chore: nightly resource refresh
---
.../duck/client/internalclientset/fake/register.go | 14 +-
.../client/internalclientset/scheme/register.go| 14 +-
config/crd/bases/camel.apache.org_builds.yaml | 5 +---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 3 --
docs/modules/traits/pages/builder.adoc | 4 +++
helm/camel-k/crds/crd-build.yaml | 5 +---
.../camel/clientset/versioned/fake/register.go | 14 +-
.../camel/clientset/versioned/scheme/register.go | 14 +-
pkg/resources/resources.go | 32 +++---
resources/traits.yaml | 4 +++
10 files changed, 54 insertions(+), 55 deletions(-)
diff --git a/addons/strimzi/duck/client/internalclientset/fake/register.go
b/addons/strimzi/duck/client/internalclientset/fake/register.go
index e6ac15499..53a4309e7 100644
--- a/addons/strimzi/duck/client/internalclientset/fake/register.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This
allows composition
// of clientsets, like in:
//
-// import (
-// "k8s.io/client-go/kubernetes"
-// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-// aggregatorclientsetscheme
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-// )
+// import (
+// "k8s.io/client-go/kubernetes"
+// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+// aggregatorclientsetscheme
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+// )
//
-// kclientset, _ := kubernetes.NewForConfig(c)
-// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+// kclientset, _ := kubernetes.NewForConfig(c)
+// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
// After this, RawExtensions in Kubernetes types will serialize
kube-aggregator types
// correctly.
diff --git a/addons/strimzi/duck/client/internalclientset/scheme/register.go
b/addons/strimzi/duck/client/internalclientset/scheme/register.go
index 6abeca247..11f233b92 100644
--- a/addons/strimzi/duck/client/internalclientset/scheme/register.go
+++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This
allows composition
// of clientsets, like in:
//
-// import (
-// "k8s.io/client-go/kubernetes"
-// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-// aggregatorclientsetscheme
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-// )
+// import (
+// "k8s.io/client-go/kubernetes"
+// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+// aggregatorclientsetscheme
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+// )
//
-// kclientset, _ := kubernetes.NewForConfig(c)
-// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+// kclientset, _ := kubernetes.NewForConfig(c)
+// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
// After this, RawExtensions in Kubernetes types will serialize
kube-aggregator types
// correctly.
diff --git a/config/crd/bases/camel.apache.org_builds.yaml
b/config/crd/bases/camel.apache.org_builds.yaml
index 8898fcfd8..9e525152b 100644
--- a/config/crd/bases/camel.apache.org_builds.yaml
+++ b/config/crd/bases/camel.apache.org_builds.yaml
@@ -743,10 +743,7 @@ spec:
description: Timeout defines the Build maximum execution
duration.
The Build deadline is set to the Build start time plus the
Timeout
duration. If the Build deadline is exceeded, the Build
context is
- canceled, Timeout defines the Pipeline maximum execution
duration.
- The Pipeline deadline is set to the Pipeline start time plus
the
- Timeout duration. If the Pipeline deadline is exceeded, the
Pipeline
- context is canceled, and its phase set to BuildPhaseFailed.
+ canceled, and its phase set to BuildPhaseFailed.
format: duration
type: string
toolImage:
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 67082c59a..e0952e06a 100644
--- a/docs/modules/ROOT/partials/apis
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit a4d36628ea13bee58da94d25a7797bd043a7fb68 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed May 24 23:42:28 2023 + chore: changelog automatic update --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d76a9cb76..3b18398b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Sudden validate issue [\#4408](https://github.com/apache/camel-k/issues/4408) - Delete stale branches [\#4389](https://github.com/apache/camel-k/issues/4389) - No such property: header for class: Script1 [\#4385](https://github.com/apache/camel-k/issues/4385) - camel- k with spring cloud config [\#4370](https://github.com/apache/camel-k/issues/4370) @@ -21,6 +22,7 @@ - Should uninstall --all remove PersistentVolumeClaim? [\#4285](https://github.com/apache/camel-k/issues/4285) - Add statical check if integration refers to components supported by Camel K [\#4283](https://github.com/apache/camel-k/issues/4283) - Camel K 2.0 release process [\#4282](https://github.com/apache/camel-k/issues/4282) +- Transform the Build into a Pipeline [\#4281](https://github.com/apache/camel-k/issues/4281) - Camel-k install and uninstall on a fresh kind cluster in Linux [\#4277](https://github.com/apache/camel-k/issues/4277) - Kamelet redis-source not working [\#4276](https://github.com/apache/camel-k/issues/4276) - Failed to fetch data from Mysql database using camel-k [\#4264](https://github.com/apache/camel-k/issues/4264) @@ -80,6 +82,8 @@ **Merged pull requests:** +- Revert "chore\(ci\): remove autogen resource file" [\#4409](https://github.com/apache/camel-k/pull/4409) ([squakez](https://github.com/squakez)) +- feat\(core\): Change Operator and Builder Pod user as non root 1000 [\#4407](https://github.com/apache/camel-k/pull/4407) ([gansheer](https://github.com/gansheer)) - chore\(ci\): remove autogen resource file [\#4405](https://github.com/apache/camel-k/pull/4405) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/prometheus/common from 0.43.0 to 0.44.0 [\#4404](https://github.com/apache/camel-k/pull/4404) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump github.com/container-tools/spectrum from 0.6.16 to 0.6.17 [\#4403](https://github.com/apache/camel-k/pull/4403) ([dependabot[bot]](https://github.com/apps/dependabot)) @@ -92,6 +96,7 @@ - chore\(deps\): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 [\#4392](https://github.com/apache/camel-k/pull/4392) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.2 [\#4390](https://github.com/apache/camel-k/pull/4390) ([dependabot[bot]](https://github.com/apps/dependabot)) - Remove unused ocp3 option from CI cluster config [\#4386](https://github.com/apache/camel-k/pull/4386) ([claudio4j](https://github.com/claudio4j)) +- feat: enable generic Pipeline [\#4384](https://github.com/apache/camel-k/pull/4384) ([squakez](https://github.com/squakez)) - Improve error logging with external KAMEL\_BIN [\#4383](https://github.com/apache/camel-k/pull/4383) ([bouskaJ](https://github.com/bouskaJ)) - chore\(deps\): bump github.com/otiai10/copy from 1.9.0 to 1.11.0 [\#4382](https://github.com/apache/camel-k/pull/4382) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump github.com/evanphx/json-patch from 4.12.0+incompatible to 5.6.0+incompatible [\#4381](https://github.com/apache/camel-k/pull/4381) ([dependabot[bot]](https://github.com/apps/dependabot))
[camel-k] branch main updated (ec9731986 -> 073fe414a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from ec9731986 chore(ci): Fix validation errors new a4d36628e chore: changelog automatic update new 073fe414a chore: nightly resource refresh 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: CHANGELOG.md | 5 .../duck/client/internalclientset/fake/register.go | 14 +- .../client/internalclientset/scheme/register.go| 14 +- config/crd/bases/camel.apache.org_builds.yaml | 5 +--- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 3 -- docs/modules/traits/pages/builder.adoc | 4 +++ helm/camel-k/crds/crd-build.yaml | 5 +--- .../camel/clientset/versioned/fake/register.go | 14 +- .../camel/clientset/versioned/scheme/register.go | 14 +- pkg/resources/resources.go | 32 +++--- resources/traits.yaml | 4 +++ 11 files changed, 59 insertions(+), 55 deletions(-)
[camel-k] branch release-1.10.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.10.x by this push: new 44405238e chore: changelog automatic update 44405238e is described below commit 44405238e49c2e62c8893bd46f9f137708d95459 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed May 24 23:42:19 2023 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd3dffe04..717ec9fec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Sudden validate issue [\#4408](https://github.com/apache/camel-k/issues/4408) - Delete stale branches [\#4389](https://github.com/apache/camel-k/issues/4389) - No such property: header for class: Script1 [\#4385](https://github.com/apache/camel-k/issues/4385) - camel- k with spring cloud config [\#4370](https://github.com/apache/camel-k/issues/4370) @@ -21,6 +22,7 @@ - Should uninstall --all remove PersistentVolumeClaim? [\#4285](https://github.com/apache/camel-k/issues/4285) - Add statical check if integration refers to components supported by Camel K [\#4283](https://github.com/apache/camel-k/issues/4283) - Camel K 2.0 release process [\#4282](https://github.com/apache/camel-k/issues/4282) +- Transform the Build into a Pipeline [\#4281](https://github.com/apache/camel-k/issues/4281) - Camel-k install and uninstall on a fresh kind cluster in Linux [\#4277](https://github.com/apache/camel-k/issues/4277) - Kamelet redis-source not working [\#4276](https://github.com/apache/camel-k/issues/4276) - Failed to fetch data from Mysql database using camel-k [\#4264](https://github.com/apache/camel-k/issues/4264)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit ffe587fa531da1942869de3eb577b7ecdf1a276c Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed May 24 23:39:36 2023 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd3dffe04..717ec9fec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Sudden validate issue [\#4408](https://github.com/apache/camel-k/issues/4408) - Delete stale branches [\#4389](https://github.com/apache/camel-k/issues/4389) - No such property: header for class: Script1 [\#4385](https://github.com/apache/camel-k/issues/4385) - camel- k with spring cloud config [\#4370](https://github.com/apache/camel-k/issues/4370) @@ -21,6 +22,7 @@ - Should uninstall --all remove PersistentVolumeClaim? [\#4285](https://github.com/apache/camel-k/issues/4285) - Add statical check if integration refers to components supported by Camel K [\#4283](https://github.com/apache/camel-k/issues/4283) - Camel K 2.0 release process [\#4282](https://github.com/apache/camel-k/issues/4282) +- Transform the Build into a Pipeline [\#4281](https://github.com/apache/camel-k/issues/4281) - Camel-k install and uninstall on a fresh kind cluster in Linux [\#4277](https://github.com/apache/camel-k/issues/4277) - Kamelet redis-source not working [\#4276](https://github.com/apache/camel-k/issues/4276) - Failed to fetch data from Mysql database using camel-k [\#4264](https://github.com/apache/camel-k/issues/4264)
[camel-k] branch release-1.12.x updated (3611e5397 -> 12f25f77a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 3611e5397 chore: changelog automatic update new ffe587fa5 chore: changelog automatic update new 12f25f77a chore: nightly resource refresh 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: CHANGELOG.md | 2 + pkg/resources/resources.go | 4 +- resources/camel-catalog-1.17.1-SNAPSHOT.yaml | 111 +++ 3 files changed, 115 insertions(+), 2 deletions(-)
[camel-k] 02/02: chore: nightly resource refresh
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 12f25f77abea168c1379896120d5f99fc4daba06
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed May 24 23:45:27 2023 +
chore: nightly resource refresh
---
pkg/resources/resources.go | 4 +-
resources/camel-catalog-1.17.1-SNAPSHOT.yaml | 111 +++
2 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 3eb87bee9..09543f257 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -604,9 +604,9 @@ var assets = func() http.FileSystem {
"/camel-catalog-1.17.1-SNAPSHOT.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel-catalog-1.17.1-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 86772,
+ uncompressedSize: 91015,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x16\xba\xdb\x7d\xbe\xdd\xef\xca\x3b\xb2\xe5\x38\xb1\x63\x3b\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xa5\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x36\x98\xe1\xfd\xbd\x79\x1b\x5c\xf3\x90\xa5\x8a\x45\x81\x16\x81\xde\xb0\xe0\x34\xa3\xe1\x86\x05\x0b\xb1\xd2\x4f\x54\xb2\xe0\x42\xe4\x69\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x26\xba\x3b\x7d\xbe\xdd\xef\xca\x3b\x72\x94\x38\xb1\x13\x27\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xb9\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x32\x08\xf1\xfe\x5e\xbc\x0c\x3e\xf1\x88\x65\x8a\xc5\x81\x16\x81\xde\xb2\xe0\x2c\xa7\xd1\x96\x05\x4b\xb1\xd6\xf7\x54\xb2\xe0\x5c\x14\x59\x
[...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
diff --git a/resources/camel-catalog-1.17.1-SNAPSHOT.yaml
b/resources/camel-catalog-1.17.1-SNAPSHOT.yaml
index 84b62e9b8..34bd4be53 100644
--- a/resources/camel-catalog-1.17.1-SNAPSHOT.yaml
+++ b/resources/camel-catalog-1.17.1-SNAPSHOT.yaml
@@ -165,6 +165,9 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.atom.AtomComponent
+camel-quarkus-attachments:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-attachments
camel-quarkus-avro:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-avro
@@ -190,6 +193,9 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.aws.secretsmanager.SecretsManagerComponent
+camel-quarkus-aws-xray:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-aws-xray
camel-quarkus-aws2-athena:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-aws2-athena
@@ -531,6 +537,9 @@ spec:
javaTypes:
- org.apache.camel.component.caffeine.cache.CaffeineCacheComponent
- org.apache.camel.component.caffeine.load.CaffeineLoadCacheComponent
+camel-quarkus-caffeine-lrucache:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-caffeine-lrucache
camel-quarkus-cassandraql:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-cassandraql
@@ -565,6 +574,9 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.chunk.ChunkComponent
+camel-quarkus-cloudevents:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-cloudevents
camel-quarkus-cm-sms:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-cm-sms
@@ -613,6 +625,9 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.cometd.CometdComponent
+camel-quarkus-console:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-console
camel-quarkus-consul:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-consul
@@ -659,6 +674,9 @@ spec:
- org.apache.camel.language.simple.FileLanguage
- org.apache.camel.language.simple.SimpleLanguage
- org.apache.camel.language.tokenizer.TokenizeLanguage
+camel-quarkus-core-cloud:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-core-cloud
camel-quarkus-couchbase:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-couchbase
@@ -788,6 +806,9 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.debezium.DebeziumSqlserverComponent
+camel-
[GitHub] [camel] igarashitm commented on pull request #10205: CAMEL-19386: Support object property on template bean
igarashitm commented on PR #10205: URL: https://github.com/apache/camel/pull/10205#issuecomment-1562054431 hmm components/camel-spring-xml tests doesn't fail for me, can I look at the workflow test log? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10205: CAMEL-19386: Support object property on template bean
github-actions[bot] commented on PR #10205: URL: https://github.com/apache/camel/pull/10205#issuecomment-1562039740 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 2 | 0 | -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10205: CAMEL-19386: Support object property on template bean
github-actions[bot] commented on PR #10205: URL: https://github.com/apache/camel/pull/10205#issuecomment-1561979004 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 2 | 0 | -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10205: CAMEL-19386: Support object property on template bean
github-actions[bot] commented on PR #10205: URL: https://github.com/apache/camel/pull/10205#issuecomment-1561929458 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] igarashitm opened a new pull request, #10205: CAMEL-19386: Support object property on template bean
igarashitm opened a new pull request, #10205: URL: https://github.com/apache/camel/pull/10205 # Description Fixes: https://issues.apache.org/jira/browse/CAMEL-19386 Also fixed the annotation for `beans` property on TemplatedRouteDefinitionDeserializer and RouteTemplateDefinitionDeserializer to represent what deserializers actually supports in the generated schema # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I formatted the code using `mvn -Pformat,fastinstall install && mvn -Psourcecheck` Hi @grgrzybek , I believe I made it backward compatible for XML DSL for template bean `property`, while it adds `properties` to accept object property like non-template bean style. Hopefully this won't bother your current work... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (82a17d8e6f6 -> 972d6fc3e15)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 82a17d8e6f6 Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e add 972d6fc3e15 camel-elasticsearch: Downgrade the jackson version to 2.14.3 (#10203) No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 ++ components/camel-elasticsearch/pom.xml | 2 +- parent/pom.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)
[camel-k-runtime] branch dependabot/maven/org.codehaus.gmavenplus-gmavenplus-plugin-3.0.0 created (now b0cfdf33)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.gmavenplus-gmavenplus-plugin-3.0.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at b0cfdf33 build(deps): bump gmavenplus-plugin from 2.1.0 to 3.0.0 No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #1032: build(deps): bump gmavenplus-plugin from 2.1.0 to 3.0.0
dependabot[bot] opened a new pull request, #1032: URL: https://github.com/apache/camel-k-runtime/pull/1032 Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 2.1.0 to 3.0.0. Release notes Sourced from https://github.com/groovy/GMavenPlus/releases";>gmavenplus-plugin's releases. 3.0.0 Bugs https://redirect.github.com/groovy/GMavenPlus/issues/244";>#244 Fix Maven plugin validation warnings. Enhancements https://redirect.github.com/groovy/GMavenPlus/issues/239";>#239 Require Maven 3.2.5. Potentially breaking changes Maven's https://maven.apache.org/developers/compatibility-plan.html";>compatibility plan marked Maven versions older than 3.2.5 as EOL in March 2023. Therefore, we now require 3.2.5 to move forward with the rest of the ecosystem. Notes Fixing the validation warnings removed some Maven dependencies from the plugin's classpath (instead of using the ones from Maven itself). I'm not aware of any negative consequences of this, but it's possible certain specialized use cases might encounter changes in behavior. Commits https://github.com/groovy/GMavenPlus/commit/7ea236cc5256ce9801ded45080a0109c594dcf83";>7ea236c [maven-release-plugin] prepare release 3.0.0 https://github.com/groovy/GMavenPlus/commit/f5d2014df98da9b06c0f0353f22fdfeb9043801e";>f5d2014 Merge pull request https://redirect.github.com/groovy/GMavenPlus/issues/250";>#250 from groovy/guava https://github.com/groovy/GMavenPlus/commit/b27275c4fce28293ec7075953056eb616b404efd";>b27275c Fix Guava CVEs https://github.com/groovy/GMavenPlus/commit/3e50f9e115ccd9267f08a8562d8f8307ddbdeb87";>3e50f9e Merge pull request https://redirect.github.com/groovy/GMavenPlus/issues/249";>#249 from groovy/remove_unneeded_dependencies https://github.com/groovy/GMavenPlus/commit/01b3622c51ade4f4ed05c9c39e6d9e29d6f574df";>01b3622 Remove overridden dependencies no longer needed https://github.com/groovy/GMavenPlus/commit/473d93e30662008d81f352e721d99ca6300827cc";>473d93e Add test SLF4J implementation https://github.com/groovy/GMavenPlus/commit/96da595bb00a4c551224ee9ef08f56d4887307c6";>96da595 Update plugin-plugin configuration https://github.com/groovy/GMavenPlus/commit/31259ae954da0e38dd2336fe5b26a25c25c86960";>31259ae Clean up integration test versions https://github.com/groovy/GMavenPlus/commit/9c99c767ebf7e7f3c8bd079839a994ca400efe51";>9c99c76 Merge pull request https://redirect.github.com/groovy/GMavenPlus/issues/246";>#246 from hazendaz/master https://github.com/groovy/GMavenPlus/commit/52187479d9819a5e767ae15b95fb47c167465a3c";>5218747 Bump a couple integration test plugin versions Additional commits viewable in https://github.com/groovy/GMavenPlus/compare/2.1.0...3.0.0";>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this
[camel] branch downgrade-jackson-for-es deleted (was 097a283c122)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch downgrade-jackson-for-es in repository https://gitbox.apache.org/repos/asf/camel.git was 097a283c122 camel-elasticsearch: Downgrade the jackson version to 2.14.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: camel-elasticsearch: Downgrade the jackson version to 2.14.3 (#10203)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 972d6fc3e15 camel-elasticsearch: Downgrade the jackson version to
2.14.3 (#10203)
972d6fc3e15 is described below
commit 972d6fc3e150c058d1f62b6aacabcfa0a32a3e3c
Author: Nicolas Filotto
AuthorDate: Wed May 24 21:10:37 2023 +0200
camel-elasticsearch: Downgrade the jackson version to 2.14.3 (#10203)
## Motivation
The integration tests of the component `camel-elasticsearch` fail due to a
`NoClassDefFoundError: com/fasterxml/jackson/core/StreamReadConstraints`, this
class has actually a different package name in Jackson 2.15.
## Modifications:
* Downgrade the version of Jackson specifically for the component
`camel-elasticsearch` until a version of `elasticsearch-java` supports Jackson
2.15.
---
camel-dependencies/pom.xml | 2 ++
components/camel-elasticsearch/pom.xml | 2 +-
parent/pom.xml | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a1a5b23ef80..e7423bd6fe8 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -239,6 +239,8 @@
1.0.0-preview.20230409
1.9.12
2.15.1
+
+2.14.3
2.15.1
2.21.16
0.11
diff --git a/components/camel-elasticsearch/pom.xml
b/components/camel-elasticsearch/pom.xml
index d77f07da918..1bb254a2008 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -57,7 +57,7 @@
com.fasterxml.jackson.core
jackson-databind
-${jackson2-version}
+${jackson2.14-version}
diff --git a/parent/pom.xml b/parent/pom.xml
index b3b46eb587b..0d286f7abb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,6 +234,8 @@
1.0.0-preview.20230409
1.9.12
2.15.1
+
+2.14.3
2.15.1
2.21.16
0.11
[GitHub] [camel] essobedo merged pull request #10203: camel-elasticsearch: Downgrade the jackson version to 2.14.3
essobedo merged PR #10203: URL: https://github.com/apache/camel/pull/10203 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10204: (chores) camel-util: cleanups and perf improvements
github-actions[bot] commented on PR #10204: URL: https://github.com/apache/camel/pull/10204#issuecomment-1561688706 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10203: camel-elasticsearch: Downgrade the jackson version to 2.14.3
github-actions[bot] commented on PR #10203: URL: https://github.com/apache/camel/pull/10203#issuecomment-1561635131 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 0 | 1 | -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] christophd commented on pull request #4402: fix(#4361): Avoid errors when components not available in Camel catalog
christophd commented on PR #4402: URL: https://github.com/apache/camel-k/pull/4402#issuecomment-1561618010 @claudio4j yes, but what should be the proper version value? At the moment the operator will overwrite all user defined versions on Camel dependencies in order to force the versions coming from the bom. We would need to also manage the raw Camel version in the catalog to actually set the proper version -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10204: (chores) camel-util: cleanups and perf improvements
github-actions[bot] commented on PR #10204: URL: https://github.com/apache/camel/pull/10204#issuecomment-1561596560 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #10204: (chores) camel-util: cleanups and perf improvements
orpiske opened a new pull request, #10204: URL: https://github.com/apache/camel/pull/10204 On my test machine, the throughput for a test that resolves the URI every single time (as is usual) increased by about 30k exchanges/sec (~3% improvement). In a test machine, I see the following with JMH: Baseline: ``` Benchmark Mode Cnt Score Error Units URISupportTest.normalizeFastUri ss 20 71344.492 ± 1473.562 us/op URISupportTest.normalizeFastUriWithRAWss 20 106508.881 ± 5621.090 us/op ``` This patch: ``` Benchmark Mode Cnt Score Error Units URISupportTest.normalizeFastUri ss 20 61024.779 ± 2892.150 us/op URISupportTest.normalizeFastUriWithRAWss 20 96992.700 ± 6245.092 us/op ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (71ec1f4a4af -> 82a17d8e6f6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 71ec1f4a4af Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e add 2f46ca6dc5e CAMEL-19295: Basic thread-safe LRU cache (#10157) add 82a17d8e6f6 Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (71ec1f4a4af) \ N -- N -- N refs/heads/regen_bot (82a17d8e6f6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/impl/DefaultEndpointRegistryTest.java| 54 .../camel/support/DefaultLRUCacheFactoryTest.java | 292 + .../camel/support/DefaultLRUCacheFactory.java | 253 +- 3 files changed, 590 insertions(+), 9 deletions(-) create mode 100644 core/camel-core/src/test/java/org/apache/camel/support/DefaultLRUCacheFactoryTest.java
[GitHub] [camel] essobedo commented on pull request #10203: camel-elasticsearch: Downgrade the jackson version to 2.14.3
essobedo commented on PR #10203: URL: https://github.com/apache/camel/pull/10203#issuecomment-1561515620 Related to https://github.com/apache/camel/pull/10042 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #10203: camel-elasticsearch: Downgrade the jackson version to 2.14.3
github-actions[bot] commented on PR #10203: URL: https://github.com/apache/camel/pull/10203#issuecomment-1561515181 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Upgrade Quarkus to 3.1.0.Final (#4925)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 25a4e22512 Upgrade Quarkus to 3.1.0.Final (#4925)
25a4e22512 is described below
commit 25a4e225121e31afda48c64f2511f1a68ef04b9f
Author: James Netherton
AuthorDate: Wed May 24 17:16:04 2023 +0100
Upgrade Quarkus to 3.1.0.Final (#4925)
---
docs/antora.yml | 4 ++--
pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index a5479cf501..c3024802fd 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,8 +30,8 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M3 # replace ${camel.version}
camel-docs-version: ""
-quarkus-version: 3.1.0.CR1 # replace ${quarkus.version}
-graalvm-version: 22.3.0 # replace ${graalvm.version}
+quarkus-version: 3.1.0.Final # replace ${quarkus.version}
+graalvm-version: 22.3.2 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
target-maven-version: 3.9.1 # replace ${target-maven-version}
diff --git a/pom.xml b/pom.xml
index 5ee3126808..a5d005df85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
2.0.0
2.0.1
2.0.0
-3.1.0.CR1
+3.1.0.Final
3.0.0
2.1.0
@@ -98,7 +98,7 @@
0.182.1
1.121.0
1.121.0
-22.3.0
+22.3.2
1.55.1
${hapi-version}
${hapi-base-version}
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index a7636f9b15..d41aae16a1 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6407,12 +6407,12 @@
org.graalvm.js
js
-22.3.0
+22.3.2
org.graalvm.js
js-scriptengine
-22.3.0
+22.3.2
org.influxdb
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index a90abceeeb..ad02e07295 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6392,7 +6392,7 @@
org.graalvm.js
js
-22.3.0
+22.3.2
org.influxdb
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index d7891a1720..9933a8c2cb 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6392,7 +6392,7 @@
org.graalvm.js
js
-22.3.0
+22.3.2
org.influxdb
[GitHub] [camel-quarkus] jamesnetherton merged pull request #4925: Upgrade Quarkus to 3.1.0.Final
jamesnetherton merged PR #4925: URL: https://github.com/apache/camel-quarkus/pull/4925 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: camel-elasticsearch: Downgrade the jackson version to 2.14.3
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch downgrade-jackson-for-es
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 097a283c12284f51a50b184e2a6f1cd76b247c38
Author: Nicolas Filotto
AuthorDate: Wed May 24 18:15:26 2023 +0200
camel-elasticsearch: Downgrade the jackson version to 2.14.3
---
camel-dependencies/pom.xml | 2 ++
components/camel-elasticsearch/pom.xml | 2 +-
parent/pom.xml | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a1a5b23ef80..e7423bd6fe8 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -239,6 +239,8 @@
1.0.0-preview.20230409
1.9.12
2.15.1
+
+2.14.3
2.15.1
2.21.16
0.11
diff --git a/components/camel-elasticsearch/pom.xml
b/components/camel-elasticsearch/pom.xml
index d77f07da918..1bb254a2008 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -57,7 +57,7 @@
com.fasterxml.jackson.core
jackson-databind
-${jackson2-version}
+${jackson2.14-version}
diff --git a/parent/pom.xml b/parent/pom.xml
index b3b46eb587b..0d286f7abb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,6 +234,8 @@
1.0.0-preview.20230409
1.9.12
2.15.1
+
+2.14.3
2.15.1
2.21.16
0.11
[camel] branch downgrade-jackson-for-es created (now 097a283c122)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch downgrade-jackson-for-es in repository https://gitbox.apache.org/repos/asf/camel.git at 097a283c122 camel-elasticsearch: Downgrade the jackson version to 2.14.3 This branch includes the following new commits: new 097a283c122 camel-elasticsearch: Downgrade the jackson version to 2.14.3 The 1 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.
[camel] branch main updated: Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e
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
The following commit(s) were added to refs/heads/main by this push:
new 82a17d8e6f6 Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e
82a17d8e6f6 is described below
commit 82a17d8e6f659addbbab5391ada6373569eb9c18
Author: orpiske
AuthorDate: Wed May 24 15:51:11 2023 +
Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e
Signed-off-by: GitHub
---
.../src/main/java/org/apache/camel/util/URISupport.java| 14 +++---
.../test/java/org/apache/camel/util/URIScannerTest.java| 1 -
.../camel/builder/endpoint/AbstractEndpointBuilder.java| 2 --
.../camel/dsl/yaml/deserializers/KameletDeserializer.java | 2 --
.../org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java | 2 --
5 files changed, 7 insertions(+), 14 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index c899e86d92f..3a0a124d881 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -430,9 +430,9 @@ public final class URISupport {
/**
* Assembles a query from the given map.
*
- * @param optionsthe map with the options (eg key/value pairs)
- * @returna query string with
key1=value&key2=value2&..., or an empty string if there
- *is no options.
+ * @param options the map with the options (eg key/value pairs)
+ * @return a query string with
key1=value&key2=value2&..., or an empty string if there is no
+ * options.
*/
public static String createQueryString(Map options) {
return createQueryString(options.keySet(), options, true);
@@ -441,10 +441,10 @@ public final class URISupport {
/**
* Assembles a query from the given map.
*
- * @param optionsthe map with the options (eg key/value pairs)
- * @param encode whether to URL encode the query string
- * @returna query string with
key1=value&key2=value2&..., or an empty string if there
- *is no options.
+ * @param options the map with the options (eg key/value pairs)
+ * @param encode whether to URL encode the query string
+ * @return a query string with
key1=value&key2=value2&..., or an empty string if there is no
+ * options.
*/
public static String createQueryString(Map options,
boolean encode) {
return createQueryString(options.keySet(), options, encode);
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
index b2c2f869e80..666ffcb8ade 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
@@ -34,7 +34,6 @@ class URIScannerTest {
Assertions.assertEquals("++?w0rd", resolvedRaw1);
}
-
@Test
void testURIScannerType2() {
final String resolvedRaw1 = URIScanner.resolveRaw("RAW{++?w0rd}");
diff --git
a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index 34e650a76b5..d942e469477 100644
---
a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++
b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.endpoint;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -28,7 +27,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PropertiesComponent;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
index c55b6693d25..005367e2795 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/ap
[GitHub] [camel] oscerd merged pull request #10202: Generated sources regen
oscerd merged PR #10202: URL: https://github.com/apache/camel/pull/10202 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request, #10202: Generated sources regen
github-actions[bot] opened a new pull request, #10202: URL: https://github.com/apache/camel/pull/10202 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (86efe9b6d4c -> 71ec1f4a4af)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git
from 86efe9b6d4c CAMEL-18177: camel-slack - Changed default delay from 0.5s
to 10s to avoid rate limited by slack
add a1f78f12afe (chores) camel-util: return an static empty String if
there is no query option
add 1a730b81336 (chores) camel-util: break the fast normalizer method
add cb7093f009c (chores) camel-util: avoid unnecessary type conversion
add 2f4b8c2d32b (chores) camel-util: use StandardCharsets to avoid the
costlier conversion of String to Charset
add 7ccb2810f00 (chores) camel-util: use StandardCharsets in the
URIScanner to avoid the costlier conversion of String to Charset
add cb327bba204 (chores) camel-util: added an Unit test for the URIScanner
add a72258f0a78 (chores) camel-api: replace duplicated comparison with
Objects.equals
add 1ebfcb051de (chores) camel-util: avoid unnecessary work when parsing
the query
add 21875c0be05 (chores) camel-util: use an slightly larger buffer size by
default
add fe015490aaa (chores) camel-util: adjust the StringBuilder buffer size
when creating the query string
add 71ec1f4a4af Regen for commit fe015490aaac0e1957254158c5c86c930fe01e8e
No new revisions were added by this update.
Summary of changes:
.../main/java/org/apache/camel/ValueHolder.java| 8 +-
.../java/org/apache/camel/util/URIScanner.java | 127
.../java/org/apache/camel/util/URISupport.java | 161 ++---
.../org/apache/camel/util/URIScannerTest.java} | 27 ++--
.../builder/endpoint/AbstractEndpointBuilder.java | 18 +--
.../yaml/deserializers/KameletDeserializer.java| 8 +-
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 10 +-
7 files changed, 163 insertions(+), 196 deletions(-)
copy
core/{camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java
=> camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java} (61%)
[camel] branch lru-sync deleted (was d8230fd6409)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch lru-sync in repository https://gitbox.apache.org/repos/asf/camel.git was d8230fd6409 CAMEL-19295: Basic thread-safe LRU cache The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: CAMEL-19295: Basic thread-safe LRU cache (#10157)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2f46ca6dc5e CAMEL-19295: Basic thread-safe LRU cache (#10157)
2f46ca6dc5e is described below
commit 2f46ca6dc5e1ca15ac179ac3f48d56c77f9dd2d8
Author: Claus Ibsen
AuthorDate: Wed May 24 17:44:27 2023 +0200
CAMEL-19295: Basic thread-safe LRU cache (#10157)
* CAMEL-19295: Experiment with sync LRUCache and test case that otherwise
will OOME
* CAMEL-19295: Basic thread-safe LRU cache
-
Co-authored-by: Nicolas Filotto
---
.../camel/impl/DefaultEndpointRegistryTest.java| 54
.../camel/support/DefaultLRUCacheFactoryTest.java | 292 +
.../camel/support/DefaultLRUCacheFactory.java | 253 +-
3 files changed, 590 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
index d70fa1d996b..4bcae075a55 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.impl;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.engine.DefaultEndpointRegistry;
+import org.apache.camel.impl.engine.SimpleCamelContext;
import org.apache.camel.spi.EndpointRegistry;
+import org.apache.camel.support.NormalizedUri;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -68,4 +76,50 @@ public class DefaultEndpointRegistryTest {
assertTrue(reg.isStatic("file:error"));
}
+//Testing the issue https://issues.apache.org/jira/browse/CAMEL-19295
+@Test
+public void testConcurrency() throws InterruptedException {
+
+SimpleCamelContext context = new SimpleCamelContext();
+context.start();
+
+ProducerTemplate producerTemplate = context.createProducerTemplate();
+EndpointRegistry endpointRegistry =
context.getEndpointRegistry();
+
+int nThreads = 4;
+ExecutorService executorService =
Executors.newFixedThreadPool(nThreads);
+int iterations = 500;
+
+for (int j = 0; j < iterations; j++) {
+CountDownLatch allThreadCompletionSemaphore = new
CountDownLatch(nThreads);
+for (int i = 0; i < nThreads; i++) {
+
+executorService.submit(() -> {
+
+
producerTemplate.requestBody("controlbus:route?routeId=route1&action=ACTION_STATUS&loggingLevel=off",
null,
+ServiceStatus.class);
+
producerTemplate.requestBody("controlbus:route?routeId=route2&action=ACTION_STATUS&loggingLevel=off",
null,
+ServiceStatus.class);
+
producerTemplate.requestBody("controlbus:route?routeId=route3&action=ACTION_STATUS&loggingLevel=off",
null,
+ServiceStatus.class);
+
producerTemplate.requestBody("controlbus:route?routeId=route4&action=ACTION_STATUS&loggingLevel=off",
null,
+ServiceStatus.class);
+
producerTemplate.requestBody("controlbus:route?routeId=route5&action=ACTION_STATUS&loggingLevel=off",
null,
+ServiceStatus.class);
+
+allThreadCompletionSemaphore.countDown();
+
+});
+}
+
+allThreadCompletionSemaphore.await();
+
+assertTrue(endpointRegistry.values().toArray() != null);
+
+}
+
+executorService.shutdown();
+
+}
+
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/DefaultLRUCacheFactoryTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/DefaultLRUCacheFactoryTest.java
new file mode 100644
index 000..c9f7fdda9b4
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/support/DefaultLRUCacheFactoryTest.java
@@ -0,0 +1,292 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.
[GitHub] [camel] essobedo merged pull request #10157: CAMEL-19295: Basic thread-safe LRU cache
essobedo merged PR #10157: URL: https://github.com/apache/camel/pull/10157 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] essobedo commented on pull request #10157: CAMEL-19295: Basic thread-safe LRU cache
essobedo commented on PR #10157: URL: https://github.com/apache/camel/pull/10157#issuecomment-1561412206 Ok let's merge it and see how the tests go -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] ben-manes commented on pull request #10157: CAMEL-19295: Basic thread-safe LRU cache
ben-manes commented on PR #10157: URL: https://github.com/apache/camel/pull/10157#issuecomment-1561348149 lgtm! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/10: (chores) camel-util: return an static empty String if there is no query option
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a1f78f12afeb5badeb27b4f7b5947a5b53238e4e
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 23 15:04:19 2023 +0200
(chores) camel-util: return an static empty String if there is no query
option
---
.../java/org/apache/camel/util/URISupport.java | 64 +++---
1 file changed, 33 insertions(+), 31 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index e3d281b4449..4285609af52 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -58,6 +58,8 @@ public final class URISupport {
private static final String CHARSET = "UTF-8";
+private static final String EMPTY_QUERY_STRING = "";
+
private URISupport() {
// Helper class
}
@@ -450,43 +452,43 @@ public final class URISupport {
public static String createQueryString(Collection sortedKeys,
Map options, boolean encode)
throws URISyntaxException {
+if (options.isEmpty()) {
+return EMPTY_QUERY_STRING;
+}
+
try {
-if (options.size() > 0) {
-StringBuilder rc = new StringBuilder();
-boolean first = true;
-for (Object o : sortedKeys) {
-if (first) {
-first = false;
-} else {
-rc.append("&");
-}
+StringBuilder rc = new StringBuilder();
+boolean first = true;
+for (Object o : sortedKeys) {
+if (first) {
+first = false;
+} else {
+rc.append("&");
+}
-String key = (String) o;
-Object value = options.get(key);
-
-// the value may be a list since the same key has multiple
-// values
-if (value instanceof List) {
-List list = (List) value;
-for (Iterator it = list.iterator();
it.hasNext();) {
-String s = it.next();
-appendQueryStringParameter(key, s, rc, encode);
-// append & separator if there is more in the list
-// to append
-if (it.hasNext()) {
-rc.append("&");
-}
-}
-} else {
-// use the value as a String
-String s = value != null ? value.toString() : null;
+String key = (String) o;
+Object value = options.get(key);
+
+// the value may be a list since the same key has multiple
+// values
+if (value instanceof List) {
+List list = (List) value;
+for (Iterator it = list.iterator(); it.hasNext();)
{
+String s = it.next();
appendQueryStringParameter(key, s, rc, encode);
+// append & separator if there is more in the list
+// to append
+if (it.hasNext()) {
+rc.append("&");
+}
}
+} else {
+// use the value as a String
+String s = value != null ? value.toString() : null;
+appendQueryStringParameter(key, s, rc, encode);
}
-return rc.toString();
-} else {
-return "";
}
+return rc.toString();
} catch (UnsupportedEncodingException e) {
URISyntaxException se = new URISyntaxException(e.toString(),
"Invalid encoding");
se.initCause(e);
[camel] 10/10: (chores) camel-util: adjust the StringBuilder buffer size when creating the query string
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe015490aaac0e1957254158c5c86c930fe01e8e
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 14:31:47 2023 +0200
(chores) camel-util: adjust the StringBuilder buffer size when creating the
query string
---
core/camel-util/src/main/java/org/apache/camel/util/URISupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 07c14d61a8d..c899e86d92f 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -455,7 +455,7 @@ public final class URISupport {
return EMPTY_QUERY_STRING;
}
-StringBuilder rc = new StringBuilder();
+StringBuilder rc = new StringBuilder(128);
boolean first = true;
for (String key : sortedKeys) {
if (first) {
[camel] 08/10: (chores) camel-util: avoid unnecessary work when parsing the query
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1ebfcb051de9f50f2abd831dc1a2aebbc9cd7536
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 23 19:30:17 2023 +0200
(chores) camel-util: avoid unnecessary work when parsing the query
---
.../src/main/java/org/apache/camel/util/URIScanner.java | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index b9cdd125ddf..d965d4a9ed1 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -62,17 +62,10 @@ class URIScanner {
Map answer = new LinkedHashMap<>();
// parse the uri parameters char by char
-int len = uri.length();
+final int len = uri.length();
for (int i = 0; i < len; i++) {
// current char
-char ch = uri.charAt(i);
-// look ahead of the next char
-char next;
-if (i <= len - 2) {
-next = uri.charAt(i + 1);
-} else {
-next = END;
-}
+final char ch = uri.charAt(i);
if (keyMode) {
// if there is a = sign then the key ends and we are in value
mode
@@ -93,6 +86,8 @@ class URIScanner {
if (isRaw) {
value.append(ch);
+// look ahead of the next char
+final char next = i <= len - 2 ? uri.charAt(i + 1) : END;
if (isAtEnd(ch, next)) {
// raw value end, so add that as a parameter, and
reset flags
addParameter(answer, useRaw || isRaw);
[camel] 05/10: (chores) camel-util: use StandardCharsets in the URIScanner to avoid the costlier conversion of String to Charset
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7ccb2810f00c193d6114947643a0e8c4d806283d
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 23 17:11:17 2023 +0200
(chores) camel-util: use StandardCharsets in the URIScanner to avoid the
costlier conversion of String to Charset
---
.../java/org/apache/camel/util/URIScanner.java | 126 ++---
1 file changed, 58 insertions(+), 68 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index 79862603bdc..b9cdd125ddf 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.util;
-import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -33,10 +33,7 @@ import static
org.apache.camel.util.URISupport.RAW_TOKEN_START;
* RAW syntax aware URI scanner that provides various URI manipulations.
*/
class URIScanner {
-
-// TODO: when upgrading to JDK11 as minimum then use java.nio.Charset
-private static final String CHARSET = "UTF-8";
-
+private static final Charset CHARSET = StandardCharsets.UTF_8;
private static final char END = '\u';
private final StringBuilder key;
@@ -57,82 +54,75 @@ class URIScanner {
this.isRaw = false;
}
-public Map parseQuery(String uri, boolean useRaw) throws
URISyntaxException {
+public Map parseQuery(String uri, boolean useRaw) {
// need to parse the uri query parameters manually as we cannot rely
on splitting by &,
// as & can be used in a parameter value as well.
-try {
-// use a linked map so the parameters is in the same order
-Map answer = new LinkedHashMap<>();
-
-// parse the uri parameters char by char
-int len = uri.length();
-for (int i = 0; i < len; i++) {
-// current char
-char ch = uri.charAt(i);
-// look ahead of the next char
-char next;
-if (i <= len - 2) {
-next = uri.charAt(i + 1);
-} else {
-next = END;
-}
-
-if (keyMode) {
-// if there is a = sign then the key ends and we are in
value mode
-if (ch == '=') {
-keyMode = false;
-continue;
-}
+// use a linked map so the parameters is in the same order
+Map answer = new LinkedHashMap<>();
+
+// parse the uri parameters char by char
+int len = uri.length();
+for (int i = 0; i < len; i++) {
+// current char
+char ch = uri.charAt(i);
+// look ahead of the next char
+char next;
+if (i <= len - 2) {
+next = uri.charAt(i + 1);
+} else {
+next = END;
+}
-if (ch != '&') {
-// regular char so add it to the key
-key.append(ch);
-}
-} else {
-// are we a raw value
-isRaw = checkRaw();
-
-// if we are in raw mode, then we keep adding until we hit
the end marker
-if (isRaw) {
-value.append(ch);
-
-if (isAtEnd(ch, next)) {
-// raw value end, so add that as a parameter, and
reset flags
-addParameter(answer, useRaw || isRaw);
-initState();
-// skip to next as we are in raw mode and have
already added the value
-i++;
-}
-continue;
-}
+if (keyMode) {
+// if there is a = sign then the key ends and we are in value
mode
+if (ch == '=') {
+keyMode = false;
+continue;
+}
-if (ch != '&') {
-// regular char so add it to the value
-value.append(ch);
+if (ch != '&') {
+// regular char so add it to the key
+key.append(ch);
+}
+} else {
+// are we a raw value
+isRaw = checkRaw();
+
+
[camel] 04/10: (chores) camel-util: use StandardCharsets to avoid the costlier conversion of String to Charset
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f4b8c2d32b8e3fd55eb424acfef9b2c6a7b2f0b
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 23 15:59:22 2023 +0200
(chores) camel-util: use StandardCharsets to avoid the costlier conversion
of String to Charset
---
.../java/org/apache/camel/util/URISupport.java | 74 ++
.../builder/endpoint/AbstractEndpointBuilder.java | 16 ++---
.../yaml/deserializers/KameletDeserializer.java| 6 +-
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 8 +--
4 files changed, 42 insertions(+), 62 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 202d107db9f..07c14d61a8d 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -20,6 +20,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -56,7 +58,7 @@ public final class URISupport {
// form "user:password").
private static final Pattern PATH_USERINFO_PASSWORD =
Pattern.compile("(.*?:)(.*)(@)");
-private static final String CHARSET = "UTF-8";
+private static final Charset CHARSET = StandardCharsets.UTF_8;
private static final String EMPTY_QUERY_STRING = "";
@@ -431,9 +433,8 @@ public final class URISupport {
* @param optionsthe map with the options (eg key/value pairs)
* @returna query string with
key1=value&key2=value2&..., or an empty string if there
*is no options.
- * @throws URISyntaxException is thrown if uri has invalid syntax.
*/
-public static String createQueryString(Map options) throws
URISyntaxException {
+public static String createQueryString(Map options) {
return createQueryString(options.keySet(), options, true);
}
@@ -444,59 +445,50 @@ public final class URISupport {
* @param encode whether to URL encode the query string
* @returna query string with
key1=value&key2=value2&..., or an empty string if there
*is no options.
- * @throws URISyntaxException is thrown if uri has invalid syntax.
*/
-public static String createQueryString(Map options,
boolean encode) throws URISyntaxException {
+public static String createQueryString(Map options,
boolean encode) {
return createQueryString(options.keySet(), options, encode);
}
-public static String createQueryString(Collection sortedKeys,
Map options, boolean encode)
-throws URISyntaxException {
+public static String createQueryString(Collection sortedKeys,
Map options, boolean encode) {
if (options.isEmpty()) {
return EMPTY_QUERY_STRING;
}
-try {
-StringBuilder rc = new StringBuilder();
-boolean first = true;
-for (String key : sortedKeys) {
-if (first) {
-first = false;
-} else {
-rc.append("&");
-}
+StringBuilder rc = new StringBuilder();
+boolean first = true;
+for (String key : sortedKeys) {
+if (first) {
+first = false;
+} else {
+rc.append("&");
+}
-Object value = options.get(key);
-
-// the value may be a list since the same key has multiple
-// values
-if (value instanceof List) {
-List list = (List) value;
-for (Iterator it = list.iterator(); it.hasNext();)
{
-String s = it.next();
-appendQueryStringParameter(key, s, rc, encode);
-// append & separator if there is more in the list
-// to append
-if (it.hasNext()) {
-rc.append("&");
-}
-}
-} else {
-// use the value as a String
-String s = value != null ? value.toString() : null;
+Object value = options.get(key);
+
+// the value may be a list since the same key has multiple
+// values
+if (value instanceof List) {
+List list = (List) value;
+for (Iterator it = list.iterator(); it.hasNext();) {
+String s =
[camel] 06/10: (chores) camel-util: added an Unit test for the URIScanner
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cb327bba20498c1afb87eadad9b699b49d5fbd8e
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 23 17:37:26 2023 +0200
(chores) camel-util: added an Unit test for the URIScanner
---
.../java/org/apache/camel/util/URIScannerTest.java | 43 ++
1 file changed, 43 insertions(+)
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
new file mode 100644
index 000..b2c2f869e80
--- /dev/null
+++ b/core/camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.util;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class URIScannerTest {
+
+@Test
+void testNotRawURIScanner() {
+final String resolvedRaw = URIScanner.resolveRaw("foo");
+Assertions.assertNull(resolvedRaw);
+}
+
+@Test
+void testURIScannerRawType1() {
+final String resolvedRaw1 = URIScanner.resolveRaw("RAW(++?w0rd)");
+Assertions.assertEquals("++?w0rd", resolvedRaw1);
+}
+
+
+@Test
+void testURIScannerType2() {
+final String resolvedRaw1 = URIScanner.resolveRaw("RAW{++?w0rd}");
+Assertions.assertEquals("++?w0rd", resolvedRaw1);
+}
+}
[camel] 02/10: (chores) camel-util: break the fast normalizer method
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a730b813365df753f48d2d0a167a88d2a91cb19
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 14:21:19 2023 +0200
(chores) camel-util: break the fast normalizer method
This should provide better reports in profilers
---
.../java/org/apache/camel/util/URISupport.java | 64 --
1 file changed, 34 insertions(+), 30 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 4285609af52..34ab4570322 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -678,39 +678,43 @@ public final class URISupport {
// no parameters then just return
return buildUri(scheme, path, null);
} else {
-Map parameters = null;
-if (query.indexOf('&') != -1) {
-// only parse if there is parameters
-parameters = URISupport.parseQuery(query, false, false);
-}
-if (parameters == null || parameters.size() == 1) {
-return buildUri(scheme, path, query);
-} else {
-// reorder parameters a..z
-// optimize and only build new query if the keys was resorted
-boolean sort = false;
-String prev = null;
-for (String key : parameters.keySet()) {
-if (prev == null) {
-prev = key;
-} else {
-int comp = key.compareTo(prev);
-if (comp < 0) {
-sort = true;
-break;
-}
-prev = key;
+return buildReorderingParameters(scheme, path, query);
+}
+}
+
+private static String buildReorderingParameters(String scheme, String
path, String query) throws URISyntaxException {
+Map parameters = null;
+if (query.indexOf('&') != -1) {
+// only parse if there are parameters
+parameters = URISupport.parseQuery(query, false, false);
+}
+if (parameters == null || parameters.size() == 1) {
+return buildUri(scheme, path, query);
+} else {
+// reorder parameters a..z
+// optimize and only build new query if the keys was resorted
+boolean sort = false;
+String prev = null;
+for (String key : parameters.keySet()) {
+if (prev == null) {
+prev = key;
+} else {
+int comp = key.compareTo(prev);
+if (comp < 0) {
+sort = true;
+break;
}
+prev = key;
}
-if (sort) {
-List keys = new ArrayList<>(parameters.keySet());
-keys.sort(null);
-// rebuild query with sorted parameters
-query = URISupport.createQueryString(keys, parameters,
true);
-}
-
-return buildUri(scheme, path, query);
}
+if (sort) {
+List keys = new ArrayList<>(parameters.keySet());
+keys.sort(null);
+// rebuild query with sorted parameters
+query = URISupport.createQueryString(keys, parameters, true);
+}
+
+return buildUri(scheme, path, query);
}
}
[camel] 03/10: (chores) camel-util: avoid unnecessary type conversion
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cb7093f009cee47066b850e5bc46405613d4bd59
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 14:21:36 2023 +0200
(chores) camel-util: avoid unnecessary type conversion
---
core/camel-util/src/main/java/org/apache/camel/util/URISupport.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 34ab4570322..202d107db9f 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -459,14 +459,13 @@ public final class URISupport {
try {
StringBuilder rc = new StringBuilder();
boolean first = true;
-for (Object o : sortedKeys) {
+for (String key : sortedKeys) {
if (first) {
first = false;
} else {
rc.append("&");
}
-String key = (String) o;
Object value = options.get(key);
// the value may be a list since the same key has multiple
[camel] 09/10: (chores) camel-util: use an slightly larger buffer size by default
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 21875c0be05178803c5278eded15cd16ecb7f7d6
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 24 11:55:50 2023 +0200
(chores) camel-util: use an slightly larger buffer size by default
By default, StringBuffer has an internal buffer of 16 chars. Our keys and
values may usually be larger that, therefore, start with a value slightly
larger to avoid resizing the array in most cases.
---
.../src/main/java/org/apache/camel/util/URIScanner.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index d965d4a9ed1..c387e89c985 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -43,8 +43,12 @@ class URIScanner {
private char rawTokenEnd;
URIScanner() {
-this.key = new StringBuilder();
-this.value = new StringBuilder();
+/*
+ * By default, StringBuffer has an internal buffer of 16 chars. Our
keys and values may usually be larger than,
+ * therefore, start with a value slightly larger than default to avoid
resizing the array in most cases.
+ */
+this.key = new StringBuilder(32);
+this.value = new StringBuilder(32);
}
private void initState() {
[camel] branch main updated (86efe9b6d4c -> fe015490aaa)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 86efe9b6d4c CAMEL-18177: camel-slack - Changed default delay from 0.5s
to 10s to avoid rate limited by slack
new a1f78f12afe (chores) camel-util: return an static empty String if
there is no query option
new 1a730b81336 (chores) camel-util: break the fast normalizer method
new cb7093f009c (chores) camel-util: avoid unnecessary type conversion
new 2f4b8c2d32b (chores) camel-util: use StandardCharsets to avoid the
costlier conversion of String to Charset
new 7ccb2810f00 (chores) camel-util: use StandardCharsets in the
URIScanner to avoid the costlier conversion of String to Charset
new cb327bba204 (chores) camel-util: added an Unit test for the URIScanner
new a72258f0a78 (chores) camel-api: replace duplicated comparison with
Objects.equals
new 1ebfcb051de (chores) camel-util: avoid unnecessary work when parsing
the query
new 21875c0be05 (chores) camel-util: use an slightly larger buffer size by
default
new fe015490aaa (chores) camel-util: adjust the StringBuilder buffer size
when creating the query string
The 10 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:
.../main/java/org/apache/camel/ValueHolder.java| 8 +-
.../java/org/apache/camel/util/URIScanner.java | 127 --
.../java/org/apache/camel/util/URISupport.java | 147 ++---
.../org/apache/camel/util/URIScannerTest.java} | 28 ++--
.../builder/endpoint/AbstractEndpointBuilder.java | 16 +--
.../yaml/deserializers/KameletDeserializer.java| 6 +-
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 8 +-
7 files changed, 157 insertions(+), 183 deletions(-)
copy
core/{camel-core/src/test/java/org/apache/camel/util/InetAddressUtilTest.java
=> camel-util/src/test/java/org/apache/camel/util/URIScannerTest.java} (61%)
[camel] 07/10: (chores) camel-api: replace duplicated comparison with Objects.equals
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a72258f0a7840c39217fa18df97834097f4f996d
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 23 18:33:22 2023 +0200
(chores) camel-api: replace duplicated comparison with Objects.equals
---
core/camel-api/src/main/java/org/apache/camel/ValueHolder.java | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/ValueHolder.java
b/core/camel-api/src/main/java/org/apache/camel/ValueHolder.java
index 0e5777e150c..551dcee8ee8 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ValueHolder.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ValueHolder.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel;
+import java.util.Objects;
+
/**
* Holder object for a given value.
*/
@@ -41,11 +43,7 @@ public class ValueHolder {
ValueHolder that = (ValueHolder) o;
-if (value != null ? !value.equals(that.value) : that.value != null) {
-return false;
-}
-
-return true;
+return Objects.equals(value, that.value);
}
@Override
[GitHub] [camel] orpiske merged pull request #10201: (chores) camel-util: code cleanups
orpiske merged PR #10201: URL: https://github.com/apache/camel/pull/10201 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch revert-4405-chore/resource_go deleted (was 9e94f97dc)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch revert-4405-chore/resource_go in repository https://gitbox.apache.org/repos/asf/camel-k.git was 9e94f97dc chore(ci): Fix validation errors The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k] 01/02: Revert "chore(ci): remove autogen resource file"
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6165252404bb1a12b225f40ede10c30d1622a5d0
Author: Pasquale Congiusti
AuthorDate: Wed May 24 13:11:46 2023 +0200
Revert "chore(ci): remove autogen resource file"
This reverts commit 38a2398e1de0e34311a3ec2112104fc5c48b9f74.
---
pkg/resources/resources.go | 916 +
1 file changed, 916 insertions(+)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
new file mode 100644
index 0..427684a10
--- /dev/null
+++ b/pkg/resources/resources.go
@@ -0,0 +1,916 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by vfsgen; DO NOT EDIT.
+
+package resources
+
+import (
+ "bytes"
+ "compress/gzip"
+ "fmt"
+ "io"
+ "io/ioutil"
+ "net/http"
+ "os"
+ pathpkg "path"
+ "time"
+)
+
+// assets statically implements the virtual filesystem provided to vfsgen.
+var assets = func() http.FileSystem {
+ fs := vfsgen۰FS{
+ "/": &vfsgen۰DirInfo{
+ name:"/",
+ modTime: time.Time{},
+ },
+ "/addons": &vfsgen۰DirInfo{
+ name:"addons",
+ modTime: time.Time{},
+ },
+ "/addons/master": &vfsgen۰DirInfo{
+ name:"master",
+ modTime: time.Time{},
+ },
+ "/addons/master/master-role-binding.tmpl":
&vfsgen۰CompressedFileInfo{
+ name: "master-role-binding.tmpl",
+ modTime: time.Time{},
+ uncompressedSize: 357,
+
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x90\x3d\x4f\xc4\x30\x0c\x86\xf7\xfc\x0a\xab\x7b\x83\xd8\x50\x36\x58\xd8\x18\x8a\xc4\xee\xa6\x06\x4c\x93\x38\xca\x47\x07\xaa\xfe\x77\xd4\x16\xe9\x7a\xd2\xa9\x37\x26\x8f\x5e\xfb\xf1\x3b\x72\x18\x0c\x74\xe2\xe8\x85\xc3\xc0\xe1\x4b\x61\xe4\x0f\x4a\x99\x25\x18\x48\x3d\x5a\x8d\xb5\x7c\x4b\xe2\x5f\x2c\x2c\x41\x8f\x4f\x59\xb3\x3c\x4c\x8f\xca\x53\xc1\x01\x0b\x1a\x05\x10\xd0\x93\x81\x79\x06\xfd\x86\x9e\x60\x59\xfe\xff\x72\x
[...]
+ },
+ "/addons/master/master-role-configmap.tmpl":
&vfsgen۰CompressedFileInfo{
+ name: "master-role-configmap.tmpl",
+ modTime: time.Time{},
+ uncompressedSize: 342,
+
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x8d\xb1\x4e\x04\x31\x0c\x44\xfb\x7c\x85\xb5\xfd\x2e\xa2\x43\xf9\x01\x3a\x0a\x0a\x7a\x6f\x62\xee\xac\x4d\x62\xcb\x49\x0e\x89\xd3\xfd\x3b\x22\x7b\x2b\x21\x68\xa8\x3c\x7e\x33\xf6\x6c\x5c\xa2\x87\x57\x49\xe4\x50\xf9\x8d\xac\xb2\x14\x0f\xb6\x62\x58\xb0\xb7\xb3\x18\x7f\x62\x63\x29\xcb\xf6\x54\x17\x96\x87\xcb\xa3\xcb\xd4\x30\x62\x43\xef\x00\x0a\x66\xf2\x70\xbd\xc2\xf2\x82\x99\xe0\x76\xbb\xb3\xaa\x18\x7e\x18\x63\xdd\xdd\x
[...]
+ },
+ "/addons/master/master-role-lease.tmpl":
&vfsgen۰CompressedFileInfo{
+ name: "master-role-lease.tmpl",
+ modTime: time.Time{},
+ uncompressedSize: 389,
+
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8e\x31\x4e\xc4\x30\x10\x45\x7b\x9f\x62\x94\x3e\x41\x74\xc8\x17\xa0\xa3\xa0\xa0\x9f\xd8\x5f\xac\x15\xc7\x63\x8d\xed\x45\x62\xb5\x77\x47\xeb\x04\x69\x21\xdb\x7d\xff\x19\xbf\x79\x4b\x48\xde\xd2\xbb\x44\x18\xce\xe1\x03\x5a\x82\x24\x4b\x3a\xb3\x9b\xb8\xd5\x93\x68\xf8\xe6\x1a\x24\x4d\xcb\x4b\x99\x82\x3c\x9d\x9f\xcd\x8a\xca\x9e\x2b\x5b\x43\x94\x78\x85\xa5\xcb\x85\xa6\x37\x5e\x41\xd7\xeb\xde\x95\xcc\xee\x6e\xd0\x9f\xdb\x
[...]
+ },
+ "/builder": &vfsgen۰DirInfo{
+ name:"builder",
+ modTime: time.Time{},
+ },
+ "/builder/builder-role-binding-openshift.yaml":
&vfsgen۰CompressedFileInfo{
+
[camel-k] 02/02: chore(ci): Fix validation errors
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ec973198649f9a28e1377361e5c2b67dcd697178
Author: Gaelle Fournier
AuthorDate: Wed May 24 13:53:42 2023 +0200
chore(ci): Fix validation errors
---
pkg/controller/build/build_pod.go | 2 +-
pkg/install/operator.go | 2 +-
pkg/resources/resources.go| 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/controller/build/build_pod.go
b/pkg/controller/build/build_pod.go
index 5f6ab09d5..7f660edb8 100644
--- a/pkg/controller/build/build_pod.go
+++ b/pkg/controller/build/build_pod.go
@@ -114,7 +114,7 @@ var (
func newBuildPod(ctx context.Context, c ctrl.Reader, build *v1.Build)
(*corev1.Pod, error) {
var ugfid int64 = 1000
- var nonRoot bool = true
+ var nonRoot = true
pod := &corev1.Pod{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index 54c2a1af5..315d078c0 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -205,7 +205,7 @@ func OperatorOrCollect(ctx context.Context, cmd
*cobra.Command, c client.Client,
fmt.Sprintf("--health-port=%d",
cfg.Health.Port))
d.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet.Port =
intstr.FromInt(int(cfg.Health.Port))
var ugfid int64 = 1000
- var nonRoot bool = true
+ var nonRoot = true
d.Spec.Template.Spec.SecurityContext =
&corev1.PodSecurityContext{
FSGroup: &ugfid,
RunAsGroup: &ugfid,
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 427684a10..5047fd8b2 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -632,9 +632,9 @@ var assets = func() http.FileSystem {
"/camel-catalog-2.16.0-SNAPSHOT.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel-catalog-2.16.0-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 86772,
+ uncompressedSize: 91015,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x16\xba\xdb\x7d\xbe\xdd\xef\xca\x3b\xb2\xe5\x38\xb1\x63\x3b\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xa5\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x36\x98\xe1\xfd\xbd\x79\x1b\x5c\xf3\x90\xa5\x8a\x45\x81\x16\x81\xde\xb0\xe0\x34\xa3\xe1\x86\x05\x0b\xb1\xd2\x4f\x54\xb2\xe0\x42\xe4\x69\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x26\xba\x3b\x7d\xbe\xdd\xef\xca\x3b\x72\x94\x38\xb1\x13\x27\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xb9\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x32\x08\xf1\xfe\x5e\xbc\x0c\x3e\xf1\x88\x65\x8a\xc5\x81\x16\x81\xde\xb2\xe0\x2c\xa7\xd1\x96\x05\x4b\xb1\xd6\xf7\x54\xb2\xe0\x5c\x14\x59\x
[...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
[camel-k] branch main updated (230343c5d -> ec9731986)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 230343c5d chore: revert default build IP new 616525240 Revert "chore(ci): remove autogen resource file" new ec9731986 chore(ci): Fix validation errors 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: pkg/controller/build/build_pod.go | 2 +- pkg/install/operator.go | 2 +- pkg/resources/resources.go| 916 ++ 3 files changed, 918 insertions(+), 2 deletions(-) create mode 100644 pkg/resources/resources.go
[GitHub] [camel-k] squakez closed issue #4408: Sudden validate issue
squakez closed issue #4408: Sudden validate issue URL: https://github.com/apache/camel-k/issues/4408 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez opened a new pull request, #4412: chore: remove useless code
squakez opened a new pull request, #4412: URL: https://github.com/apache/camel-k/pull/4412 Ref #4281 **Release Note** ```release-note chore: remove useless code ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez merged pull request #4409: Revert "chore(ci): remove autogen resource file"
squakez merged PR #4409: URL: https://github.com/apache/camel-k/pull/4409 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (513c41cc980 -> 86efe9b6d4c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 513c41cc980 Regen for commit aef3b6b990477e826e42938657fa0be181939dcd add 8d92c3ba968 CAMEL-18177: camel-slack - Changed default delay from 0.5s to 10s to avoid rate limited by slack add 86efe9b6d4c CAMEL-18177: camel-slack - Changed default delay from 0.5s to 10s to avoid rate limited by slack No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/slack.json| 2 +- .../component/slack/SlackEndpointConfigurer.java | 2 +- .../org/apache/camel/component/slack/slack.json | 2 +- .../apache/camel/component/slack/SlackConsumer.java | 2 ++ .../apache/camel/component/slack/SlackEndpoint.java | 19 +++ .../modules/ROOT/pages/camel-4-migration-guide.adoc | 4 .../endpoint/dsl/SlackEndpointBuilderFactory.java | 4 ++-- 7 files changed, 30 insertions(+), 5 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #10201: (chores) camel-util: code cleanups
github-actions[bot] commented on PR #10201: URL: https://github.com/apache/camel/pull/10201#issuecomment-1561217877 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets-examples] oscerd commented on issue #21: Add example for Kafka kamelet consuming with Azure Schema Registry in YAML DSL
oscerd commented on issue #21: URL: https://github.com/apache/camel-kamelets-examples/issues/21#issuecomment-1561214652 We have example of integration between camel kafka quarkus and apicurio, but not through kamelets and not by using beans. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 03/09: feat(trait): enable custom tasks via builder
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit c864d653d569354704780d027e9a442af341cfea Author: Pasquale Congiusti AuthorDate: Thu May 18 17:05:21 2023 +0200 feat(trait): enable custom tasks via builder --- .../bases/camel.apache.org_integrationkits.yaml| 6 +++ .../camel.apache.org_integrationplatforms.yaml | 12 ++ .../crd/bases/camel.apache.org_integrations.yaml | 6 +++ .../bases/camel.apache.org_kameletbindings.yaml| 6 +++ config/crd/bases/camel.apache.org_pipes.yaml | 6 +++ config/rbac/operator-role.yaml | 1 + docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 41 ++ e2e/common/traits/builder_test.go | 24 +++ helm/camel-k/crds/crd-integration-kit.yaml | 6 +++ helm/camel-k/crds/crd-integration-platform.yaml| 12 ++ helm/camel-k/crds/crd-integration.yaml | 6 +++ helm/camel-k/crds/crd-kamelet-binding.yaml | 6 +++ helm/camel-k/crds/crd-pipe.yaml| 6 +++ pkg/apis/camel/v1/trait/builder.go | 12 ++ pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 20 + pkg/controller/build/build_pod.go | 15 +++ pkg/controller/build/monitor_pod.go| 49 +++--- pkg/trait/builder.go | 27 +++- pkg/trait/builder_test.go | 29 + pkg/util/kubernetes/log/util.go| 21 ++ 20 files changed, 285 insertions(+), 26 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index 530927802..8ff5668a5 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -229,6 +229,12 @@ spec: description: The strategy to use, either `pod` or `routine` (default routine) type: string + tasks: +description: A list of tasks to be executed (available only + when using `pod` strategy) with format ;; +items: + type: string +type: array verbose: description: Enable verbose logging on build components that support it (e.g. Kaniko build pod). diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 45fbbb428..94b37247d 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -727,6 +727,12 @@ spec: description: The strategy to use, either `pod` or `routine` (default routine) type: string + tasks: +description: A list of tasks to be executed (available only + when using `pod` strategy) with format ;; +items: + type: string +type: array verbose: description: Enable verbose logging on build components that support it (e.g. Kaniko build pod). @@ -2653,6 +2659,12 @@ spec: description: The strategy to use, either `pod` or `routine` (default routine) type: string + tasks: +description: A list of tasks to be executed (available only + when using `pod` strategy) with format ;; +items: + type: string +type: array verbose: description: Enable verbose logging on build components that support it (e.g. Kaniko build pod). diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index b29aac0b2..0912bebc7 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -6212,6 +6212,12 @@ spec: description: The strategy to use, either `pod` or `routine` (default routine) type: string + tasks: +description: A list of tasks to be executed (available only + when using `pod` strategy) with format ;; +items: +
[camel-k] 07/09: chore(ctrl): enable max running pipelines
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 06f922d44836fc16663bc0a82753c30007c142c4
Author: Pasquale Congiusti
AuthorDate: Fri May 19 16:08:04 2023 +0200
chore(ctrl): enable max running pipelines
---
pkg/apis/camel/v1/build_types.go | 4 ++--
pkg/controller/build/build_controller.go | 10 ++
pkg/trait/builder.go | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pkg/apis/camel/v1/build_types.go b/pkg/apis/camel/v1/build_types.go
index 6a7107df9..4c309e997 100644
--- a/pkg/apis/camel/v1/build_types.go
+++ b/pkg/apis/camel/v1/build_types.go
@@ -25,9 +25,9 @@ import (
// NOTE: json tags are required. Any new fields you add must have json tags
for the fields to be serialized.
// Important: Run "make generate-deepcopy" to regenerate code after modifying
this file
-// PipelineSpec defines the Build operation to be executed
+// PipelineSpec defines the Pipeline to be execute
type PipelineSpec struct {
- // The sequence of Build tasks to be performed as part of the Build
execution.
+ // The sequence of Pipeline tasks to be performed.
Tasks []Task `json:"tasks,omitempty"`
// Timeout defines the Pipeline maximum execution duration.
// The Pipeline deadline is set to the Pipeline start time plus the
Timeout duration.
diff --git a/pkg/controller/build/build_controller.go
b/pkg/controller/build/build_controller.go
index 354f84043..065337a37 100644
--- a/pkg/controller/build/build_controller.go
+++ b/pkg/controller/build/build_controller.go
@@ -141,11 +141,13 @@ func (r *reconcileBuild) Reconcile(ctx context.Context,
request reconcile.Reques
targetLog := rlog.ForBuild(target)
var actions []Action
-
+ ip, err := platform.GetOrFindForResource(ctx, r.client, &instance, true)
+ if err != nil {
+ rlog.Error(err, "Could not find a platform bound to this Build")
+ return reconcile.Result{}, err
+ }
buildMonitor := Monitor{
- // TODO enable this where we have the MaxRunningPipelines (the
platform likely)
- // maxRunningBuilds: instance.Spec.MaxRunningBuilds,
- maxRunningBuilds: 10,
+ maxRunningBuilds: ip.Status.Pipeline.MaxRunningPipelines,
}
switch instance.BuilderConfiguration().Strategy {
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index a96ddee15..317ecd4d6 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -245,7 +245,7 @@ func getImageName(e *Environment) string {
}
func (t *builderTrait) customTasks() []v1.Task {
- customTasks := make([]v1.Task, 0, len(t.Tasks))
+ customTasks := make([]v1.Task, len(t.Tasks), len(t.Tasks))
for i, t := range t.Tasks {
// TODO, better strategy than a simple split!
splitted := strings.Split(t, ";")
[camel-k] 02/09: feat(trait): remove builder configuration from environment
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit db46f1e48f288e43377c1624ff0556dcb0cbf214
Author: Pasquale Congiusti
AuthorDate: Wed May 17 17:12:42 2023 +0200
feat(trait): remove builder configuration from environment
---
.../camel.apache.org_integrationplatforms.yaml | 8 +--
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 1 +
helm/camel-k/crds/crd-integration-platform.yaml| 8 +--
pkg/apis/camel/v1/build_types_support.go | 15 -
pkg/apis/camel/v1/integrationplatform_types.go | 8 +--
pkg/controller/integrationkit/build.go | 18 +++---
pkg/trait/builder.go | 65 --
pkg/trait/quarkus.go | 8 ---
pkg/trait/trait_types.go | 1 -
9 files changed, 70 insertions(+), 62 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml
b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index 0248cb5e8..45fbbb428 100644
--- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -44,19 +44,19 @@ spec:
name: Phase
type: string
- description: The default build strategy
- jsonPath: .status.build.buildStrategy
+ jsonPath: .status.pipeline.buildStrategy
name: Build strategy
type: string
- description: The default publish strategy
- jsonPath: .status.build.publishStrategy
+ jsonPath: .status.pipeline.publishStrategy
name: Publish strategy
type: string
- description: The container registry address
- jsonPath: .status.build.registry.address
+ jsonPath: .status.pipeline.registry.address
name: Registry address
type: string
- description: The default runtime version
- jsonPath: .status.build.runtimeVersion
+ jsonPath: .status.pipeline.runtimeVersion
name: Default runtime
type: string
name: v1
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 10af8c2f6..59e476879 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -2415,6 +2415,7 @@ IntegrationPlatformBuildPublishStrategy defines the
strategy used to package and
IntegrationPlatformBuildSpec contains platform related pipeline information.
This configuration can be used to tune the behavior of the
Integration/IntegrationKit image builds.
You can define the build strategy, the image registry to use and the Maven
configuration to adopt.
+Deprecated: use IntegrationPlatformPipelineSpec instead.
[cols="2,2a",options="header"]
|===
diff --git a/helm/camel-k/crds/crd-integration-platform.yaml
b/helm/camel-k/crds/crd-integration-platform.yaml
index 0248cb5e8..45fbbb428 100644
--- a/helm/camel-k/crds/crd-integration-platform.yaml
+++ b/helm/camel-k/crds/crd-integration-platform.yaml
@@ -44,19 +44,19 @@ spec:
name: Phase
type: string
- description: The default build strategy
- jsonPath: .status.build.buildStrategy
+ jsonPath: .status.pipeline.buildStrategy
name: Build strategy
type: string
- description: The default publish strategy
- jsonPath: .status.build.publishStrategy
+ jsonPath: .status.pipeline.publishStrategy
name: Publish strategy
type: string
- description: The container registry address
- jsonPath: .status.build.registry.address
+ jsonPath: .status.pipeline.registry.address
name: Registry address
type: string
- description: The default runtime version
- jsonPath: .status.build.runtimeVersion
+ jsonPath: .status.pipeline.runtimeVersion
name: Default runtime
type: string
name: v1
diff --git a/pkg/apis/camel/v1/build_types_support.go
b/pkg/apis/camel/v1/build_types_support.go
index d94b16e9c..6131f909b 100644
--- a/pkg/apis/camel/v1/build_types_support.go
+++ b/pkg/apis/camel/v1/build_types_support.go
@@ -56,7 +56,13 @@ func (build *Build) BuilderPodNamespace() string {
// BuilderConfiguration returns the builder configuration for this Build.
func (build *Build) BuilderConfiguration() *BuildConfiguration {
- for _, t := range build.Spec.Tasks {
+ return BuilderConfigurationTasks(build.Spec.Tasks)
+
+}
+
+// BuilderConfigurationTasks returns the builder configuration from the task
list.
+func BuilderConfigurationTasks(tasks []Task) *BuildConfiguration {
+ for _, t := range tasks {
if t.Builder != nil {
return &t.Builder.Configuration
}
@@ -66,7 +72,12 @@ func (build *Build) BuilderConfiguration()
*BuildConfiguration {
// SetBuilderConfiguration set the configuration required for this B
[camel-k] 06/09: chore(lint): fixes
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e49064758f17d897227f83cdc40b644624227752
Author: Pasquale Congiusti
AuthorDate: Fri May 19 15:11:25 2023 +0200
chore(lint): fixes
---
pkg/controller/build/monitor_pod.go | 35 ++-
pkg/trait/builder.go| 8
pkg/trait/quarkus.go| 9 -
3 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/pkg/controller/build/monitor_pod.go
b/pkg/controller/build/monitor_pod.go
index 439cacf0f..d16928e00 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -301,7 +301,7 @@ func (action *monitorPodAction) getTerminatedTime(pod
*corev1.Pod) metav1.Time {
return finishedAt
}
-// setConditionsFromTerminationMessages sets a condition for all those
containers which have been terminated (successfully or not)
+// setConditionsFromTerminationMessages sets a condition for all those
containers which have been terminated (successfully or not).
func (action *monitorPodAction) setConditionsFromTerminationMessages(ctx
context.Context, pod *corev1.Pod, buildStatus *v1.BuildStatus) {
var containers []corev1.ContainerStatus
containers = append(containers, pod.Status.InitContainerStatuses...)
@@ -309,6 +309,7 @@ func (action *monitorPodAction)
setConditionsFromTerminationMessages(ctx context
for _, container := range containers {
if t := container.State.Terminated; t != nil {
+ var err error
terminationMessage := t.Message
// Dynamic condition type (it depends on each container
name)
containerConditionType :=
v1.BuildConditionType(fmt.Sprintf("Container %s succeeded", container.Name))
@@ -316,22 +317,22 @@ func (action *monitorPodAction)
setConditionsFromTerminationMessages(ctx context
if t.ExitCode != 0 {
containerSucceeded = corev1.ConditionFalse
}
-
- var maxLines int64
- // TODO we can make it a user variable !?
- maxLines = 10
- logOptions := corev1.PodLogOptions{
- Container: container.Name,
- TailLines: &maxLines,
- }
- terminationMessage, err := log.DumpLog(ctx,
action.client, pod, logOptions)
- if err != nil {
- action.L.Errorf(err, "Dumping log for %s
container in %s Pod failed", container.Name, pod.Name)
- terminationMessage = fmt.Sprintf(
- "Operator was not able to retrieve the
error message, please, check the container %s log directly from %s Pod",
- container.Name,
- pod.Name,
- )
+ if terminationMessage == "" {
+ // TODO we can make it a user variable !?
+ var maxLines int64 = 10
+ logOptions := corev1.PodLogOptions{
+ Container: container.Name,
+ TailLines: &maxLines,
+ }
+ terminationMessage, err = log.DumpLog(ctx,
action.client, pod, logOptions)
+ if err != nil {
+ action.L.Errorf(err, "Dumping log for
%s container in %s Pod failed", container.Name, pod.Name)
+ terminationMessage = fmt.Sprintf(
+ "Operator was not able to
retrieve the error message, please, check the container %s log directly from %s
Pod",
+ container.Name,
+ pod.Name,
+ )
+ }
}
terminationReason := fmt.Sprintf("%s (%d)", t.Reason,
t.ExitCode)
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index bd20b38f1..a96ddee15 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -245,11 +245,11 @@ func getImageName(e *Environment) string {
}
func (t *builderTrait) customTasks() []v1.Task {
- var customTasks []v1.Task
- for _, t := range t.Tasks {
+ customTasks := make([]v1.Task, 0, len(t.Tasks))
+ for i, t := range t.Tasks {
// TODO, better strategy than a simple split!
splitted := strings.Split(t, ";")
- customT
[camel-k] 05/09: doc: pipeline usage
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 43f882f24fa166818f9bf3986fbb861d28969558
Author: Pasquale Congiusti
AuthorDate: Fri May 19 12:17:21 2023 +0200
doc: pipeline usage
---
docs/modules/ROOT/nav.adoc | 1 +
docs/modules/ROOT/pages/pipeline/pipeline.adoc | 105 +
2 files changed, 106 insertions(+)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index e655589f2..ff74541c5 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -43,6 +43,7 @@
** xref:configuration/runtime-properties.adoc[Properties]
** xref:configuration/runtime-config.adoc[Runtime configuration]
** xref:configuration/runtime-resources.adoc[Runtime resources]
+* xref:pipeline/pipeline.adoc[Pipeline]
* Observability
** xref:observability/logging.adoc[Logging]
*** xref:observability/logging/operator.adoc[Operator]
diff --git a/docs/modules/ROOT/pages/pipeline/pipeline.adoc
b/docs/modules/ROOT/pages/pipeline/pipeline.adoc
new file mode 100644
index 0..d58e5c8ef
--- /dev/null
+++ b/docs/modules/ROOT/pages/pipeline/pipeline.adoc
@@ -0,0 +1,105 @@
+[[build-pipeline]]
+= Build Pipeline
+
+Since version 2.0, we've introduced the concept of `Pipeline` in order to
provide a degree of flexibility for those user that want to customize the
entire building process. We can think of a pipeline as a series of tasks that
can be executed after the project generation and before the artifact publishing
into the container registry.
+
+In Camel K version 1 we used to have 2 static tasks: `builder` and `publisher`
(named after the strategy adopted, ie, `spectrum`). Now you can include any
futher task in the middle by opportunely configuring the Build. Let's see an
example:
+
+```yaml
+spec:
+ tasks:
+ - builder:
+ ...
+ - custom:
+ command: tree
+ image: alpine
+ name: custom1
+ - custom:
+ command: cat maven/pom.xml
+ image: alpine
+ name: custom2
+ - spectrum:
+ ...
+```
+The custom tasks will be executed in the directory where the Camel K runtime
Maven project was generated. In this example we're creating 2 tasks to retrieve
certain values from the project just for the scope of illustrating the feature.
For each task you need to specify a name, the container image which you want to
use to run and the command to execute.
+
+The goal is to let the user perform custom tasks which may result in a success
or a failure. If the task executed results in a failure, then, the entire build
is stopped and fails accordingly.
+
+[[build-pipeline-trait]]
+== Configuring via builder trait
+
+We are aware that configuring the `Build` type directly is something that the
majority of users won't do. For this reason we're enabling the same feature in
the xref:traits:builder.adoc[Builder trait].
+
+Maintaining the example above as a reference, configuring a custom task will
be as easy as adding a trait property when running your Integration, for
instance, via CLI:
+
+```
+kamel run Test.java -t builder.tasks=custom1;alpine;tree -t
builder.tasks="custom2;alpine;cat maven/pom.xml"
+```
+
+[[build-pipeline-result]]
+== Getting task execution status
+
+Altough the main goal of this custom task execution is to have a
success/failure result, we thought it could be useful to get the log of each
task to be consulted by the user. For this reason, you will be able to read it
directly in the Build type. See the following example:
+
+```
+ conditions:
+ - lastTransitionTime: "2023-05-19T09:56:02Z"
+lastUpdateTime: "2023-05-19T09:56:02Z"
+message: |
+ ...
+
{"level":"info","ts":1684490148.080175,"logger":"camel-k.builder","msg":"base
image: docker.io/eclipse-temurin:11"}
+
{"level":"info","ts":1684490148.0801787,"logger":"camel-k.builder","msg":"resolved
base image: docker.io/eclipse-temurin:11"}
+reason: Completed (0)
+status: "True"
+type: Container builder succeeded
+ - lastTransitionTime: "2023-05-19T09:56:02Z"
+lastUpdateTime: "2023-05-19T09:56:02Z"
+message: |2
+ │ │ ├── org.slf4j.slf4j-api-1.7.36.jar
+ │ │ └── org.yaml.snakeyaml-1.33.jar
+ │ ├── quarkus
+ │ │ ├── generated-bytecode.jar
+ │ │ └── quarkus-application.dat
+ │ ├── quarkus-app-dependencies.txt
+ │ └── quarkus-run.jar
+ └── quarkus-artifact.properties
+
+ 21 directories, 294 files
+reason: Completed (0)
+status: "True"
+type: Container custom1 succeeded
+ - lastTransitionTime: "2023-05-19T09:56:02Z"
+lastUpdateTime: "2023-05-19T09:56:02Z"
+message: |2-
+
+
+
+
+
+
+
+
+
+
+reason:
[camel-k] 09/09: chore: revert default build IP
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 230343c5d1686b9334442d1f1c854f3a65447711
Author: Pasquale Congiusti
AuthorDate: Tue May 23 10:11:26 2023 +0200
chore: revert default build IP
---
config/samples/bases/camel_v1_integrationplatform.yaml | 2 +-
pkg/platform/defaults.go | 5 +
pkg/platform/defaults_test.go | 13 +++--
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/config/samples/bases/camel_v1_integrationplatform.yaml
b/config/samples/bases/camel_v1_integrationplatform.yaml
index 2f36ec07b..fe0440802 100644
--- a/config/samples/bases/camel_v1_integrationplatform.yaml
+++ b/config/samples/bases/camel_v1_integrationplatform.yaml
@@ -22,6 +22,6 @@ metadata:
labels:
app: "camel-k"
spec:
- pipeline:
+ build:
buildConfiguration:
strategy: pod
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index e33b8a371..f6d14829a 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -289,6 +289,11 @@ func applyPlatformSpec(source *v1.IntegrationPlatform,
target *v1.IntegrationPla
target.Status.Build.BuildCatalogToolTimeout =
source.Status.Build.BuildCatalogToolTimeout
}
+ if target.Status.Build.MaxRunningBuilds <= 0 {
+ log.Debugf("Integration Platform %s [%s]: setting max running
builds", target.Name, target.Namespace)
+ target.Status.Build.MaxRunningBuilds =
source.Status.Build.MaxRunningBuilds
+ }
+
if len(target.Status.Kamelet.Repositories) == 0 {
log.Debugf("Integration Platform %s [%s]: setting kamelet
repositories", target.Name, target.Namespace)
target.Status.Kamelet.Repositories =
source.Status.Kamelet.Repositories
diff --git a/pkg/platform/defaults_test.go b/pkg/platform/defaults_test.go
index c90b2008d..79579b7ed 100644
--- a/pkg/platform/defaults_test.go
+++ b/pkg/platform/defaults_test.go
@@ -82,19 +82,15 @@ func TestApplyGlobalPlatformSpec(t *testing.T) {
assert.Equal(t, v1.IntegrationPlatformClusterOpenShift,
ip.Status.Cluster)
assert.Equal(t, v1.TraitProfileOpenShift, ip.Status.Profile)
assert.Equal(t, v1.BuildStrategyRoutine,
ip.Status.Build.BuildConfiguration.Strategy)
-
- // TODO assert.True(t, ip.Status.Build.MaxRunningBuilds == 3) //
default for build strategy routine
-
+ assert.True(t, ip.Status.Build.MaxRunningBuilds == 3) // default for
build strategy routine
assert.Equal(t, len(global.Status.Build.Maven.CLIOptions),
len(ip.Status.Build.Maven.CLIOptions))
assert.Equal(t, global.Status.Build.Maven.CLIOptions,
ip.Status.Build.Maven.CLIOptions)
-
assert.NotNil(t, ip.Status.Traits)
assert.NotNil(t, ip.Status.Traits.Logging)
assert.Equal(t, "DEBUG", ip.Status.Traits.Logging.Level)
assert.NotNil(t, ip.Status.Traits.Container)
assert.Equal(t, corev1.PullAlways,
ip.Status.Traits.Container.ImagePullPolicy)
assert.Equal(t, "0.1", ip.Status.Traits.Container.LimitCPU)
-
assert.Equal(t, 2, len(ip.Status.Build.Maven.Properties))
assert.Equal(t, "global_value1",
ip.Status.Build.Maven.Properties["global_prop1"])
assert.Equal(t, "global_value2",
ip.Status.Build.Maven.Properties["global_prop2"])
@@ -148,6 +144,7 @@ func TestRetainLocalPlatformSpec(t *testing.T) {
BuildConfiguration: v1.BuildConfiguration{
Strategy: v1.BuildStrategyPod,
},
+ MaxRunningBuilds: 1,
Maven: v1.MavenSpec{
Properties: map[string]string{
"local_prop1": "local_value1",
@@ -172,19 +169,15 @@ func TestRetainLocalPlatformSpec(t *testing.T) {
assert.Equal(t, v1.IntegrationPlatformClusterKubernetes,
ip.Status.Cluster)
assert.Equal(t, v1.TraitProfileKnative, ip.Status.Profile)
assert.Equal(t, v1.BuildStrategyPod,
ip.Status.Build.BuildConfiguration.Strategy)
-
- // TODO assert.True(t, ip.Status.Build.MaxRunningBuilds == 1)
-
+ assert.True(t, ip.Status.Build.MaxRunningBuilds == 1)
assert.Equal(t, len(global.Status.Build.Maven.CLIOptions),
len(ip.Status.Build.Maven.CLIOptions))
assert.Equal(t, global.Status.Build.Maven.CLIOptions,
ip.Status.Build.Maven.CLIOptions)
-
assert.NotNil(t, ip.Status.Traits)
assert.NotNil(t, ip.Status.Traits.Logging)
assert.Equal(t, "DEBUG", ip.Status.Traits.Logging.Level)
assert.NotNil(t, ip.Status.Traits.Container)
assert.Equal(t, corev1.PullAlways,
ip.Status.Traits.Container.ImagePullPolicy)
assert.Equal(t, "0.1", ip.Status.Traits.Container.Li
[camel-k] branch main updated (827202632 -> 230343c5d)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 827202632 feat(core): Fix Operator and Builder Pod user as non root
1000
new bb355e00d feat(api): rename BuildSpec to PipelineSpec
new db46f1e48 feat(trait): remove builder configuration from environment
new c864d653d feat(trait): enable custom tasks via builder
new 1494ca9f1 feat(build): added container execution condition
new 43f882f24 doc: pipeline usage
new e49064758 chore(lint): fixes
new 06f922d44 chore(ctrl): enable max running pipelines
new 7b0572983 chore(api): revert breaking compatibility changes
new 230343c5d chore: revert default build IP
The 9 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:
.../duck/client/internalclientset/fake/register.go | 14 +--
.../client/internalclientset/scheme/register.go| 14 +--
config/crd/bases/camel.apache.org_builds.yaml | 90 --
.../bases/camel.apache.org_integrationkits.yaml| 6 +
.../camel.apache.org_integrationplatforms.yaml | 44 +--
.../crd/bases/camel.apache.org_integrations.yaml | 6 +
.../bases/camel.apache.org_kameletbindings.yaml| 6 +
config/crd/bases/camel.apache.org_pipes.yaml | 6 +
config/rbac/operator-role.yaml | 1 +
docs/modules/ROOT/nav.adoc | 1 +
.../architecture/cr/integration-platform.adoc | 4 +-
.../ROOT/pages/installation/advanced/maven.adoc| 12 +-
.../installation/advanced/multi-architecture.adoc | 6 +-
.../ROOT/pages/installation/registry/registry.adoc | 4 +-
docs/modules/ROOT/pages/pipeline/pipeline.adoc | 105 +
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 129 -
e2e/common/traits/builder_test.go | 65 +++
e2e/support/test_support.go| 12 +-
helm/camel-k/crds/crd-build.yaml | 90 --
helm/camel-k/crds/crd-integration-kit.yaml | 6 +
helm/camel-k/crds/crd-integration-platform.yaml| 44 +--
helm/camel-k/crds/crd-integration.yaml | 6 +
helm/camel-k/crds/crd-kamelet-binding.yaml | 6 +
helm/camel-k/crds/crd-pipe.yaml| 6 +
pkg/apis/camel/v1/build_types.go | 31 -
pkg/apis/camel/v1/build_types_support.go | 40 ++-
pkg/apis/camel/v1/common_types.go | 4 +
pkg/apis/camel/v1/integrationplatform_types.go | 6 +-
pkg/apis/camel/v1/trait/builder.go | 12 ++
pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 20
pkg/apis/camel/v1/zz_generated.deepcopy.go | 22
.../camel/v1/buildconfiguration.go | 28 -
.../applyconfiguration/camel/v1/buildertask.go | 23 ++--
...dspec.go => integrationplatformpipelinespec.go} | 40 +++
.../applyconfiguration/camel/v1/pipelinespec.go| 58 +
.../camel/applyconfiguration/camel/v1/task.go | 9 ++
.../camel/v1/{s2itask.go => usertask.go} | 32 ++---
pkg/client/camel/applyconfiguration/utils.go | 2 +
.../camel/clientset/versioned/fake/register.go | 14 +--
.../camel/clientset/versioned/scheme/register.go | 14 +--
pkg/cmd/install.go | 12 +-
pkg/controller/build/build_controller.go | 12 +-
pkg/controller/build/build_monitor_test.go | 18 +--
pkg/controller/build/build_pod.go | 19 ++-
pkg/controller/build/monitor_pod.go| 69 +--
pkg/controller/integrationkit/build.go | 23 ++--
pkg/platform/defaults_test.go | 8 --
pkg/trait/builder.go | 100 ++--
pkg/trait/builder_test.go | 51 ++--
pkg/trait/quarkus.go | 19 +--
pkg/trait/quarkus_test.go | 4 +-
pkg/trait/registry.go | 2 +-
pkg/trait/trait_types.go | 3 +-
pkg/util/kubernetes/log/util.go| 21
54 files changed, 1115 insertions(+), 284 deletions(-)
create mode 100644 docs/modules/ROOT/pages/pipeline/pipeline.adoc
copy
pkg/client/camel/applyconfiguration/camel/v1/{integrationplatformbuildspec.go
=> integrationplatformpipelinespec.go} (69%)
create mode 100644 pkg/client/camel/applyconfiguration/camel/v1/pipelinespec.go
copy pkg/client/camel/applyconfiguration/camel/v1/{s2itask.go => usertask.go}
(54%)
[camel-k] 04/09: feat(build): added container execution condition
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1494ca9f1f78e7367ec58adb6534333929e3d783
Author: Pasquale Congiusti
AuthorDate: Fri May 19 11:45:11 2023 +0200
feat(build): added container execution condition
* Added a condition for each container execution during build (either
success or failure)
* Added E2E test to cover such feature
---
e2e/common/traits/builder_test.go | 43 -
e2e/support/test_support.go | 10 +
pkg/controller/build/monitor_pod.go | 41 +++
3 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/e2e/common/traits/builder_test.go
b/e2e/common/traits/builder_test.go
index 9b47e48ff..da8e6f39b 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -93,7 +93,7 @@ func TestBuilderTrait(t *testing.T) {
Eventually(BuilderPod(ns,
builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(),
TestTimeoutShort).Should(Equal("2Gi"))
Eventually(BuilderPod(ns,
builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(),
TestTimeoutShort).Should(Equal("3Gi"))
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task", func(t *testing.T) {
@@ -114,9 +114,50 @@ func TestBuilderTrait(t *testing.T) {
Eventually(BuilderPod(ns,
builderKitName)().Spec.InitContainers[0].Name,
TestTimeoutShort).Should(Equal("builder"))
Eventually(BuilderPod(ns,
builderKitName)().Spec.InitContainers[1].Name,
TestTimeoutShort).Should(Equal("custom1"))
Eventually(BuilderPod(ns,
builderKitName)().Spec.InitContainers[2].Name,
TestTimeoutShort).Should(Equal("custom2"))
+
+ // Check containers conditions
+ Eventually(Build(ns, integrationKitName),
TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(
+ Build(
+ ns,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container
custom1 succeeded")).Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(
+ Build(ns,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container
custom1 succeeded")).Message,
+
TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar"))
+ Eventually(Build(ns, integrationKitName),
TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(
+ Build(ns,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container
custom2 succeeded")).Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(
+ Build(ns,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container
custom2 succeeded")).Message,
+ TestTimeoutShort).Should(ContainSubstring(""))
+
+ // Check logs
Eventually(Logs(ns, builderKitName,
corev1.PodLogOptions{Container:
"custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
Eventually(Logs(ns, builderKitName,
corev1.PodLogOptions{Container:
"custom2"})).Should(ContainSubstring(`camel-k-runtime-bom`))
Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
})
+
+ name = "java-error"
+ t.Run("Run custom pipeline task error", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.tasks=custom1;alpine;cat
missingfile.txt",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPhase(ns,
name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ integrationKitName := IntegrationKit(ns, name)()
+ // Check containers conditions
+ Eventually(Build(ns, integrationKitName),
TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(BuildConditions(ns, integrationKitName),
TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(
+ Build(ns,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container
custom1 succeeded")).Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(
+ Build(ns,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container
custom1 succeeded")).Message,
+ TestTimeoutShort).Should(ContainSubstring("No such file
or directory"))
+
+
[GitHub] [camel-k] squakez merged pull request #4384: feat: enable generic Pipeline
squakez merged PR #4384: URL: https://github.com/apache/camel-k/pull/4384 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on pull request #4402: fix(#4361): Avoid errors when components not available in Camel catalog
claudio4j commented on PR #4402: URL: https://github.com/apache/camel-k/pull/4402#issuecomment-1561189122 > for dependencies not listed in the catalog is also not working because the raw Camel version is not resolvable in the generated Maven builder project. I see errors such as 'dependencies.dependency.version' for org.apache.camel:camel-resilience4j:jar is missing because there is no bom that resolves the raw Camel dependency. In this case the `` should be also added as part of the dependency, as the quarkus platform bom cannot resolve it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 09/12: Bean: Use properties instead of property with key and value - Kafka not secured source
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-kamelets.git
commit 26b83e326d92021a696b8d813b3581184b8ff798
Author: Andrea Cosentino
AuthorDate: Wed May 24 15:22:52 2023 +0200
Bean: Use properties instead of property with key and value - Kafka not
secured source
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-not-secured-source.kamelet.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/kamelets/kafka-not-secured-source.kamelet.yaml
b/kamelets/kafka-not-secured-source.kamelet.yaml
index 3579cffa..f78807c2 100644
--- a/kamelets/kafka-not-secured-source.kamelet.yaml
+++ b/kamelets/kafka-not-secured-source.kamelet.yaml
@@ -102,9 +102,8 @@ spec:
beans:
- name: kafkaHeaderDeserializer
type:
"#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
-property:
- - key: enabled
-value: '{{deserializeHeaders}}'
+properties:
+ enabled: '{{deserializeHeaders}}'
from:
uri: "kafka:{{topic}}"
parameters:
[camel-kamelets] 07/12: Bean: Use properties instead of property with key and value - IBM MQ Sink
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-kamelets.git
commit 90662e0e68db03047aed0f080466d577a864919a
Author: Andrea Cosentino
AuthorDate: Wed May 24 15:17:30 2023 +0200
Bean: Use properties instead of property with key and value - IBM MQ Sink
Signed-off-by: Andrea Cosentino
---
kamelets/jms-ibm-mq-sink.kamelet.yaml | 29 ++---
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/kamelets/jms-ibm-mq-sink.kamelet.yaml
b/kamelets/jms-ibm-mq-sink.kamelet.yaml
index d1f8edc1..330b6fe0 100644
--- a/kamelets/jms-ibm-mq-sink.kamelet.yaml
+++ b/kamelets/jms-ibm-mq-sink.kamelet.yaml
@@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
-property:
- - key: XMSC_WMQ_HOST_NAME
-value: '{{serverName}}'
- - key: XMSC_WMQ_PORT
-value: '{{serverPort}}'
- - key: XMSC_WMQ_CHANNEL
-value: '{{channel}}'
- - key: XMSC_WMQ_QUEUE_MANAGER
-value: '{{queueManager}}'
- - key: XMSC_WMQ_CONNECTION_MODE
-value: 1
- - key: XMSC_USERID
-value: '{{username}}'
- - key: XMSC_PASSWORD
-value: '{{password}}'
- - key: XMSC_CLIENT_ID
-value: '{{?clientId}}'
- - key: XMSC_WMQ_SSL_CIPHER_SUITE
-value: '{{?sslCipherSuite}}'
+properties:
+ XMSC_WMQ_HOST_NAME: '{{serverName}}'
+ XMSC_WMQ_PORT: '{{serverPort}}'
+ XMSC_WMQ_CHANNEL: '{{channel}}'
+ XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
+ XMSC_WMQ_CONNECTION_MODE: 1
+ XMSC_USERID: '{{username}}'
+ XMSC_PASSWORD: '{{password}}'
+ XMSC_CLIENT_ID: '{{?clientId}}'
+ XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "kamelet:source"
steps:
[camel-kamelets] branch regen_bot updated (ebb8eb2c -> aaeff8e4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from ebb8eb2c Bean: Use properties instead of property with key and value - JMS AMQP Sink add 57705fec Bean: Use properties instead of property with key and value - JMS Artemis Source add c80b27d0 Bean: Use properties instead of property with key and value - JMS Artemis Source add 49afbffc Bean: Use properties instead of property with key and value - JMS Artemis Sink add bb559c3a Bean: Use properties instead of property with key and value - JMS Artemis Sink add 23a84f12 Bean: Use properties instead of property with key and value - IBM MQ Sink add 9b35defc Bean: Use properties instead of property with key and value - IBM MQ Source add 90662e0e Bean: Use properties instead of property with key and value - IBM MQ Sink add 197c02e1 Bean: Use properties instead of property with key and value - IBM MQ Sink add 26b83e32 Bean: Use properties instead of property with key and value - Kafka not secured source add 036c880a Bean: Use properties instead of property with key and value - Kafka not secured source add b0173cc2 Bean: Use properties instead of property with key and value - Kafka not secured sink add aaeff8e4 Bean: Use properties instead of property with key and value - Kafka not secured sink No new revisions were added by this update. Summary of changes: kamelets/jms-apache-artemis-sink.kamelet.yaml | 5 ++-- kamelets/jms-apache-artemis-source.kamelet.yaml| 5 ++-- kamelets/jms-ibm-mq-sink.kamelet.yaml | 29 -- kamelets/jms-ibm-mq-source.kamelet.yaml| 29 -- kamelets/kafka-not-secured-sink.kamelet.yaml | 14 --- kamelets/kafka-not-secured-source.kamelet.yaml | 5 ++-- .../kamelets/jms-apache-artemis-sink.kamelet.yaml | 5 ++-- .../jms-apache-artemis-source.kamelet.yaml | 5 ++-- .../kamelets/jms-ibm-mq-sink.kamelet.yaml | 29 -- .../kamelets/jms-ibm-mq-source.kamelet.yaml| 29 -- .../kamelets/kafka-not-secured-sink.kamelet.yaml | 14 --- .../kamelets/kafka-not-secured-source.kamelet.yaml | 5 ++-- 12 files changed, 62 insertions(+), 112 deletions(-)
[camel-kamelets] 06/12: Bean: Use properties instead of property with key and value - IBM MQ Source
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-kamelets.git
commit 9b35defc46b4927ec86154f32f7351d7f9e23db7
Author: Andrea Cosentino
AuthorDate: Wed May 24 15:15:00 2023 +0200
Bean: Use properties instead of property with key and value - IBM MQ Source
Signed-off-by: Andrea Cosentino
---
.../kamelets/jms-ibm-mq-source.kamelet.yaml| 29 --
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
index 68dce581..0fc79820 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
@@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
-property:
- - key: XMSC_WMQ_HOST_NAME
-value: '{{serverName}}'
- - key: XMSC_WMQ_PORT
-value: '{{serverPort}}'
- - key: XMSC_WMQ_CHANNEL
-value: '{{channel}}'
- - key: XMSC_WMQ_QUEUE_MANAGER
-value: '{{queueManager}}'
- - key: XMSC_WMQ_CONNECTION_MODE
-value: 1
- - key: XMSC_USERID
-value: '{{username}}'
- - key: XMSC_PASSWORD
-value: '{{password}}'
- - key: XMSC_CLIENT_ID
-value: '{{?clientId}}'
- - key: XMSC_WMQ_SSL_CIPHER_SUITE
-value: '{{?sslCipherSuite}}'
+properties:
+ XMSC_WMQ_HOST_NAME: '{{serverName}}'
+ XMSC_WMQ_PORT: '{{serverPort}}'
+ XMSC_WMQ_CHANNEL: '{{channel}}'
+ XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
+ XMSC_WMQ_CONNECTION_MODE: 1
+ XMSC_USERID: '{{username}}'
+ XMSC_PASSWORD: '{{password}}'
+ XMSC_CLIENT_ID: '{{?clientId}}'
+ XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "jms:{{destinationType}}:{{destinationName}}"
parameters:
[camel-kamelets] 10/12: Bean: Use properties instead of property with key and value - Kafka not secured source
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-kamelets.git
commit 036c880af9a59611c8a791143e083af7bf7afc3e
Author: Andrea Cosentino
AuthorDate: Wed May 24 15:25:01 2023 +0200
Bean: Use properties instead of property with key and value - Kafka not
secured source
Signed-off-by: Andrea Cosentino
---
.../main/resources/kamelets/kafka-not-secured-source.kamelet.yaml| 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
index 3579cffa..f78807c2 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
@@ -102,9 +102,8 @@ spec:
beans:
- name: kafkaHeaderDeserializer
type:
"#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
-property:
- - key: enabled
-value: '{{deserializeHeaders}}'
+properties:
+ enabled: '{{deserializeHeaders}}'
from:
uri: "kafka:{{topic}}"
parameters:
[camel-kamelets] 03/12: Bean: Use properties instead of property with key and value - JMS Artemis Sink
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-kamelets.git
commit 49afbffc59254ba9824b7e56501508f00daa50fa
Author: Andrea Cosentino
AuthorDate: Wed May 24 15:08:11 2023 +0200
Bean: Use properties instead of property with key and value - JMS Artemis
Sink
Signed-off-by: Andrea Cosentino
---
kamelets/jms-apache-artemis-sink.kamelet.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/kamelets/jms-apache-artemis-sink.kamelet.yaml
b/kamelets/jms-apache-artemis-sink.kamelet.yaml
index c6a8d430..ce9d69dc 100644
--- a/kamelets/jms-apache-artemis-sink.kamelet.yaml
+++ b/kamelets/jms-apache-artemis-sink.kamelet.yaml
@@ -60,9 +60,8 @@ spec:
beans:
- name: connectionFactoryBean
type:
"#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory"
-property:
- - key: brokerURL
-value: '{{brokerURL}}'
+properties:
+ brokerURL: '{{brokerURL}}'
from:
uri: "kamelet:source"
steps:
[camel-kamelets] 08/12: Bean: Use properties instead of property with key and value - IBM MQ Sink
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-kamelets.git
commit 197c02e1eea82934e43d52ca35ce662c6cbd35fb
Author: Andrea Cosentino
AuthorDate: Wed May 24 15:19:20 2023 +0200
Bean: Use properties instead of property with key and value - IBM MQ Sink
Signed-off-by: Andrea Cosentino
---
.../kamelets/jms-ibm-mq-sink.kamelet.yaml | 29 --
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
index d1f8edc1..330b6fe0 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
@@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
-property:
- - key: XMSC_WMQ_HOST_NAME
-value: '{{serverName}}'
- - key: XMSC_WMQ_PORT
-value: '{{serverPort}}'
- - key: XMSC_WMQ_CHANNEL
-value: '{{channel}}'
- - key: XMSC_WMQ_QUEUE_MANAGER
-value: '{{queueManager}}'
- - key: XMSC_WMQ_CONNECTION_MODE
-value: 1
- - key: XMSC_USERID
-value: '{{username}}'
- - key: XMSC_PASSWORD
-value: '{{password}}'
- - key: XMSC_CLIENT_ID
-value: '{{?clientId}}'
- - key: XMSC_WMQ_SSL_CIPHER_SUITE
-value: '{{?sslCipherSuite}}'
+properties:
+ XMSC_WMQ_HOST_NAME: '{{serverName}}'
+ XMSC_WMQ_PORT: '{{serverPort}}'
+ XMSC_WMQ_CHANNEL: '{{channel}}'
+ XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
+ XMSC_WMQ_CONNECTION_MODE: 1
+ XMSC_USERID: '{{username}}'
+ XMSC_PASSWORD: '{{password}}'
+ XMSC_CLIENT_ID: '{{?clientId}}'
+ XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "kamelet:source"
steps:
[camel-kamelets] 11/12: Bean: Use properties instead of property with key and value - Kafka not secured sink
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-kamelets.git commit b0173cc2e50456010777d7260dc99d87cdcb2eb2 Author: Andrea Cosentino AuthorDate: Wed May 24 15:26:26 2023 +0200 Bean: Use properties instead of property with key and value - Kafka not secured sink Signed-off-by: Andrea Cosentino --- kamelets/kafka-not-secured-sink.kamelet.yaml | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/kamelets/kafka-not-secured-sink.kamelet.yaml b/kamelets/kafka-not-secured-sink.kamelet.yaml index 9a17c380..67f3a4cf 100644 --- a/kamelets/kafka-not-secured-sink.kamelet.yaml +++ b/kamelets/kafka-not-secured-sink.kamelet.yaml @@ -64,15 +64,11 @@ spec: beans: - name: deDuplicateHeaders type: "#class:org.apache.camel.kamelets.utils.headers.DeDuplicateNamingHeaders" -property: - - key: prefix -value: 'kafka.' - - key: renamingPrefix -value: 'kafka.' - - key: mode -value: 'filtering' - - key: selectedHeaders -value: 'kafka.key,kafka.topic,kafka.override_topic' +properties: + prefix: 'kafka.' + renamingPrefix: 'kafka.' + mode: 'filtering' + selectedHeaders: 'kafka.key,kafka.topic,kafka.override_topic' from: uri: "kamelet:source" steps:
[camel-kamelets] 12/12: Bean: Use properties instead of property with key and value - Kafka not secured sink
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-kamelets.git commit aaeff8e4f8f4b834b4e2377facb6ea1a60e9add5 Author: Andrea Cosentino AuthorDate: Wed May 24 15:28:29 2023 +0200 Bean: Use properties instead of property with key and value - Kafka not secured sink Signed-off-by: Andrea Cosentino --- .../resources/kamelets/kafka-not-secured-sink.kamelet.yaml | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml index 9a17c380..67f3a4cf 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml @@ -64,15 +64,11 @@ spec: beans: - name: deDuplicateHeaders type: "#class:org.apache.camel.kamelets.utils.headers.DeDuplicateNamingHeaders" -property: - - key: prefix -value: 'kafka.' - - key: renamingPrefix -value: 'kafka.' - - key: mode -value: 'filtering' - - key: selectedHeaders -value: 'kafka.key,kafka.topic,kafka.override_topic' +properties: + prefix: 'kafka.' + renamingPrefix: 'kafka.' + mode: 'filtering' + selectedHeaders: 'kafka.key,kafka.topic,kafka.override_topic' from: uri: "kamelet:source" steps:
[camel-kamelets] 02/12: Bean: Use properties instead of property with key and value - JMS Artemis Source
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-kamelets.git
commit c80b27d075a8d1ecdaa139075d04117fcbc36066
Author: Andrea Cosentino
AuthorDate: Wed May 24 13:01:18 2023 +0200
Bean: Use properties instead of property with key and value - JMS Artemis
Source
Signed-off-by: Andrea Cosentino
---
.../main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
index ec09f5cd..5e538ca2 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
@@ -59,9 +59,8 @@ spec:
beans:
- name: connectionFactoryBean
type:
"#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory"
-property:
- - key: brokerURL
-value: '{{brokerURL}}'
+properties:
+ brokerURL: '{{brokerURL}}'
from:
uri: "jms:{{destinationType}}:{{destinationName}}"
parameters:
