Re: [PR] CAMEL-19998: move several internal APIs to the CamelContext extension [camel]
orpiske merged PR #11734: URL: https://github.com/apache/camel/pull/11734 -- 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
Re: [PR] CAMEL-19998: move several internal APIs to the CamelContext extension [camel]
orpiske commented on PR #11734: URL: https://github.com/apache/camel/pull/11734#issuecomment-1765720437 Looking good on CI. Ready to merge. -- 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 main updated: CAMEL-19998: move several internal APIs to the CamelContext extension
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
The following commit(s) were added to refs/heads/main by this push:
new 2e246758916 CAMEL-19998: move several internal APIs to the
CamelContext extension
2e246758916 is described below
commit 2e2467589168413cefb085f90dd52aba948fe2c4
Author: Otavio Rodolfo Piske
AuthorDate: Mon Oct 16 17:46:50 2023 +0200
CAMEL-19998: move several internal APIs to the CamelContext extension
---
.../camel/impl/engine/AbstractCamelContext.java| 170 +++
.../impl/engine/DefaultCamelContextExtension.java | 238 +
2 files changed, 268 insertions(+), 140 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 36b2f98a0b0..b7f6ac58ab1 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -224,7 +224,6 @@ public abstract class AbstractCamelContext extends
BaseService
private String managementName;
private ClassLoader applicationContextClassLoader;
private boolean autoCreateComponents = true;
-private volatile RestConfiguration restConfiguration;
private volatile VaultConfiguration vaultConfiguration = new
VaultConfiguration();
private final List routePolicyFactories = new
ArrayList<>();
@@ -262,25 +261,12 @@ public abstract class AbstractCamelContext extends
BaseService
private Boolean autowiredEnabled = Boolean.TRUE;
private Long delay;
private Map globalOptions = new HashMap<>();
-private volatile PropertiesComponent propertiesComponent;
-private volatile CamelContextNameStrategy nameStrategy;
-private volatile ManagementNameStrategy managementNameStrategy;
private volatile TypeConverter typeConverter;
private volatile TypeConverterRegistry typeConverterRegistry;
private volatile Injector injector;
-private volatile RestRegistryFactory restRegistryFactory;
-private volatile RestRegistry restRegistry;
-private volatile ClassResolver classResolver;
-private volatile MessageHistoryFactory messageHistoryFactory;
-private volatile StreamCachingStrategy streamCachingStrategy;
-private volatile InflightRepository inflightRepository;
private volatile ShutdownStrategy shutdownStrategy;
private volatile ExecutorServiceManager executorServiceManager;
-private volatile UuidGenerator uuidGenerator;
private volatile RouteController routeController;
-private volatile Tracer tracer;
-private volatile TransformerRegistry transformerRegistry;
-private volatile ValidatorRegistry validatorRegistry;
private EndpointRegistry endpoints;
private RuntimeEndpointRegistry runtimeEndpointRegistry;
private ShutdownRoute shutdownRoute = ShutdownRoute.Default;
@@ -435,36 +421,22 @@ public abstract class AbstractCamelContext extends
BaseService
@Override
public CamelContextNameStrategy getNameStrategy() {
-if (nameStrategy == null) {
-synchronized (lock) {
-if (nameStrategy == null) {
-setNameStrategy(createCamelContextNameStrategy());
-}
-}
-}
-return nameStrategy;
+return camelContextExtension.getNameStrategy();
}
@Override
public void setNameStrategy(CamelContextNameStrategy nameStrategy) {
-this.nameStrategy = internalServiceManager.addService(nameStrategy);
+camelContextExtension.setNameStrategy(nameStrategy);
}
@Override
public ManagementNameStrategy getManagementNameStrategy() {
-if (managementNameStrategy == null) {
-synchronized (lock) {
-if (managementNameStrategy == null) {
-setManagementNameStrategy(createManagementNameStrategy());
-}
-}
-}
-return managementNameStrategy;
+return camelContextExtension.getManagementNameStrategy();
}
@Override
public void setManagementNameStrategy(ManagementNameStrategy
managementNameStrategy) {
-this.managementNameStrategy =
internalServiceManager.addService(managementNameStrategy);
+
camelContextExtension.setManagementNameStrategy(managementNameStrategy);
}
@Override
@@ -1641,19 +1613,12 @@ public abstract class AbstractCamelContext extends
BaseService
@Override
public PropertiesComponent getPropertiesComponent() {
-if (propertiesComponent == null) {
-synchronized (lock) {
-if (propertiesComponent == null) {
-
Re: [I] Clarification Required: S3 Source Connector doesn't fetch new files [camel-kafka-connector]
ajithcnambiar commented on issue #1570: URL: https://github.com/apache/camel-kafka-connector/issues/1570#issuecomment-1765717078 Thanks a lot for https://github.com/apache/camel-kamelets/pull/1692 I'm just curious, when can we expect a version of the connector with this configuration? -- 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
Re: [PR] fix(ctrl): Change reconciliation of int in error [camel-k]
squakez commented on PR #4793: URL: https://github.com/apache/camel-k/pull/4793#issuecomment-1765714939 @lburgazzoli given the new E2E test provided by @gansheer, I think we are safe to merge this PR. Basically we stop the latest reconciliation loop to apply traits when both the Integration and the Kit are in an error state. Hence, there is no reason to continue applying trait logic. Do you have any further concern? -- 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 main updated: fix(ci): fabric8 deps update
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 The following commit(s) were added to refs/heads/main by this push: new 17a4516a6 fix(ci): fabric8 deps update 17a4516a6 is described below commit 17a4516a6874c08f757ea701eed8e3bee2e3101f Author: Pasquale Congiusti AuthorDate: Mon Oct 16 17:06:33 2023 +0200 fix(ci): fabric8 deps update --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 8cc419432..7e008d7ac 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -35,7 +35,7 @@ 11 11 -6.4.1 +6.9.0 3.0.0-M8
Re: [PR] fix(ci): fabric8 deps update [camel-k]
squakez merged PR #4828: URL: https://github.com/apache/camel-k/pull/4828 -- 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
[PR] fix(ci): fabric8 deps update [camel-k]
squakez opened a new pull request, #4828: URL: https://github.com/apache/camel-k/pull/4828 **Release Note** ```release-note fix(ci): fabric8 deps update ``` -- 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
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1765651526 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 6541655376-1272-7f1a4b0c-69ae-424a-8873-1a76cd0b2044 * Camel Quarkus Commit: 213701d8817c006c52b6b2b0a1e4d63931a963b0 * Quarkus Main Commit: 51461900c930fb5ed27b83b52ecd68eaaf1953bc * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6541655376 -- 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] 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-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 92f6e371 Updated CHANGELOG.md 92f6e371 is described below commit 92f6e371e952465b4ae834793815d57a7f20f5eb Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 17 03:07:44 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 4 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d457a139..7becb52c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Expose maxMessagesPerPoll in AWS S3 Source Kamelet [\#1690](https://github.com/apache/camel-kamelets/issues/1690) +- Update to Camel 4.1.0 [\#1687](https://github.com/apache/camel-kamelets/issues/1687) - Create a Specialized Kamelet starting from Kafka Source using Apicurio Registry [\#1681](https://github.com/apache/camel-kamelets/issues/1681) - Azure Storage Blob Changefeed : remove dependencies not required anymore [\#1674](https://github.com/apache/camel-kamelets/issues/1674) - Splunk-source kamelet - initEarliestTime is required parameter [\#1663](https://github.com/apache/camel-kamelets/issues/1663) @@ -14,6 +16,8 @@ **Merged pull requests:** +- Upgrade to Camel 4.1.0 [\#1694](https://github.com/apache/camel-kamelets/pull/1694) ([oscerd](https://github.com/oscerd)) +- Expose maxMessagesPerPoll in AWS S3 Source Kamelet [\#1692](https://github.com/apache/camel-kamelets/pull/1692) ([oscerd](https://github.com/oscerd)) - Bump golang.org/x/net from 0.12.0 to 0.17.0 in /script/validator [\#1686](https://github.com/apache/camel-kamelets/pull/1686) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump golang.org/x/net from 0.12.0 to 0.17.0 in /script/generator [\#1685](https://github.com/apache/camel-kamelets/pull/1685) ([dependabot[bot]](https://github.com/apps/dependabot)) - Create a Specialized Kamelet starting from Kafka Source using Apicurio Registry [\#1682](https://github.com/apache/camel-kamelets/pull/1682) ([oscerd](https://github.com/oscerd))
Re: [PR] Sql: Test SqlTest#testDefaultErrorCode fails with mssql [camel-quarkus]
zhfeng commented on PR #5435: URL: https://github.com/apache/camel-quarkus/pull/5435#issuecomment-1765546013 The failure is unrelated. -- 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
Re: [PR] Sql: Test SqlTest#testDefaultErrorCode fails with mssql [camel-quarkus]
zhfeng merged PR #5435: URL: https://github.com/apache/camel-quarkus/pull/5435 -- 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 3.2.x updated: Sql: Test SqlTest#testDefaultErrorCode fails with mssql
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch 3.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.2.x by this push:
new 0f47355c2a Sql: Test SqlTest#testDefaultErrorCode fails with mssql
0f47355c2a is described below
commit 0f47355c2a2104f674c5d35f8a18f9476c3c14d1
Author: JiriOndrusek
AuthorDate: Mon Oct 9 11:51:23 2023 +0200
Sql: Test SqlTest#testDefaultErrorCode fails with mssql
---
.../org/apache/camel/quarkus/component/sql/it/SqlResource.java | 7 +++
.../java/org/apache/camel/quarkus/component/sql/it/SqlTest.java | 9 -
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java
b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java
index 5eace4f388..36849c2477 100644
---
a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java
+++
b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java
@@ -205,4 +205,11 @@ public class SqlResource {
}
}
+@Path("/dbKind")
+@GET
+@Produces(MediaType.APPLICATION_JSON)
+public String getDbKind() {
+return dbKind;
+}
+
}
diff --git
a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
index 80c442645f..9db910560d 100644
---
a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
+++
b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
@@ -153,9 +153,16 @@ class SqlTest {
@Test
public void testDefaultErrorCode() throws InterruptedException {
+String dbKind = RestAssured
+.get("/sql/dbKind")
+.then()
+.statusCode(200)
+.extract().asString();
postMap("/sql/toDirect/transacted",
CollectionHelper.mapOf(SqlConstants.SQL_QUERY, "select * from NOT_EXIST"))
.statusCode(200)
-
.body(startsWith("org.springframework.jdbc.BadSqlGrammarException"));
+//SQLExceptionSubclassTranslator does not transalate mssql
error - https://github.com/apache/camel-quarkus/issues/5411
+.body("mssql".equals(dbKind) ? containsString("Invalid object
name 'NOT_EXIST'")
+:
startsWith("org.springframework.jdbc.BadSqlGrammarException"));
}
@Test
[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-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d7541b2a739c6735b2ebd51ec744d3d9057edae4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 17 01:21:13 2023 + chore: changelog automatic update --- CHANGELOG.md | 373 ++- 1 file changed, 191 insertions(+), 182 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f3dbef21..822fef8f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) +## [v2.1.0](https://github.com/apache/camel-k/tree/v2.1.0) (2023-10-16) -[Full Changelog](https://github.com/apache/camel-k/compare/2.0.2-nightly...HEAD) +[Full Changelog](https://github.com/apache/camel-k/compare/camel-k-crds-2.1.0...v2.1.0) + +## [camel-k-crds-2.1.0](https://github.com/apache/camel-k/tree/camel-k-crds-2.1.0) (2023-10-16) + +[Full Changelog](https://github.com/apache/camel-k/compare/2.0.2-nightly...camel-k-crds-2.1.0) **Closed issues:** @@ -31,7 +35,9 @@ - Add GH issue template [\#4675](https://github.com/apache/camel-k/issues/4675) - Separating Java and native image compilation [\#4648](https://github.com/apache/camel-k/issues/4648) - IntegrationPlatform reconciliation should warn or fail when missing registry [\#4647](https://github.com/apache/camel-k/issues/4647) +- Let Camel framework manage Kamelets [\#4618](https://github.com/apache/camel-k/issues/4618) - Add plugin repository when `kamel run --maven-repository` [\#4608](https://github.com/apache/camel-k/issues/4608) +- Kamelet: `template.id` and/or `template.route.id` causes a failure to be resolved [\#4546](https://github.com/apache/camel-k/issues/4546) - Security warning messages from the operator pod on Openshift [\#4424](https://github.com/apache/camel-k/issues/4424) - Report error when any registry problem happen [\#4272](https://github.com/apache/camel-k/issues/4272) - unable to access the URL and unable to expose port after the integration build is successfully deployed. [\#4256](https://github.com/apache/camel-k/issues/4256) @@ -46,6 +52,7 @@ - How Camel K build container images [\#3336](https://github.com/apache/camel-k/issues/3336) - Missing Maven Server API description [\#3332](https://github.com/apache/camel-k/issues/3332) - Create proper Camel event source page on Knative website [\#3262](https://github.com/apache/camel-k/issues/3262) +- Use yaml camelCase for all the project resources [\#3229](https://github.com/apache/camel-k/issues/3229) - Local dependencies examples [\#3167](https://github.com/apache/camel-k/issues/3167) - `make build-resources` does not work on Windows [\#3134](https://github.com/apache/camel-k/issues/3134) - Invalid replica state for HPA [\#3132](https://github.com/apache/camel-k/issues/3132) @@ -58,6 +65,8 @@ - Persist trait status [\#2024](https://github.com/apache/camel-k/issues/2024) - Multiple knative revisions created when integration references multiple Knative channels [\#1826](https://github.com/apache/camel-k/issues/1826) - kamelets: distribution model documentation [\#1576](https://github.com/apache/camel-k/issues/1576) +- kamelets: architecture documentation [\#1573](https://github.com/apache/camel-k/issues/1573) +- Hide platform traits [\#1328](https://github.com/apache/camel-k/issues/1328) - validate platform configurations [\#383](https://github.com/apache/camel-k/issues/383) - Rethink profiles [\#262](https://github.com/apache/camel-k/issues/262) @@ -231,7 +240,7 @@ ## [2.0.1-nightly](https://github.com/apache/camel-k/tree/2.0.1-nightly) (2023-07-24) -[Full Changelog](https://github.com/apache/camel-k/compare/pkg/apis/camel/v2.0.0...2.0.1-nightly) +[Full Changelog](https://github.com/apache/camel-k/compare/v2.0.0...2.0.1-nightly) **Closed issues:** @@ -305,21 +314,21 @@ - fix\(build\): complete repo name for default baseImage [\#4480](https://github.com/apache/camel-k/pull/4480) ([gansheer](https://github.com/gansheer)) - fix\(e2e\): remove workaround pre 1.12.1 [\#4479](https://github.com/apache/camel-k/pull/4479) ([squakez](https://github.com/squakez)) -## [pkg/apis/camel/v2.0.0](https://github.com/apache/camel-k/tree/pkg/apis/camel/v2.0.0) (2023-07-17) +## [v2.0.0](https://github.com/apache/camel-k/tree/v2.0.0) (2023-07-17) -[Full Changelog](https://github.com/apache/camel-k/compare/pkg/client/camel/v2.0.0...pkg/apis/camel/v2.0.0) +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/kamelet/repository/v2.0.0...v2.0.0) -## [pkg/client/camel/v2.0.0](https://github.com/apache/camel-k/tree/pkg/client/camel/v2.0.0) (2023-07-17) +## [pkg/kamelet/repository/v2.0.0](https://github.com/apache/camel-k/tree/pkg/kamelet/repository/v2.0.0) (2023-07-17) -[Full
[camel-k] branch release-2.0.x updated (6216cf16d -> cbb336f9f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 6216cf16d chore: nightly SBOM update new d7541b2a7 chore: changelog automatic update new cbb336f9f chore: nightly SBOM update 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 | 373 + camel-k-sbom/camel-k-sbom.json | 12 +- 2 files changed, 197 insertions(+), 188 deletions(-)
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit cbb336f9f6539ac9b69921b8450e42618ea7a86b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Oct 17 01:26:34 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index bc99af5e2..2232dd10e 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:ed18496c-3bbf-4a50-8b03-bf8c33d9c428",
+ "serialNumber": "urn:uuid:b2c18eaf-8604-4c87-aa69-8768c5f76f46",
"version": 1,
"metadata": {
-"timestamp": "2023-10-16T00:47:41Z",
+"timestamp": "2023-10-17T01:26:34Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231015004654-b63f832f540f?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017012113-d7541b2a739c?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231015004654-b63f832f540f",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231015004654-b63f832f540f?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231017012113-d7541b2a739c",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017012113-d7541b2a739c?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -4021,7 +4021,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231015004654-b63f832f540f?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017012113-d7541b2a739c?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.29?type=module",
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1765482529 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 6540736769-1168-efc2012d-5c2c-4877-91ac-78020df333f9 * Camel Quarkus Commit: c9d47bfc18a2abfa9143d5322093b2bbbe958880 * Camel Main Commit: 51461900c930fb5ed27b83b52ecd68eaaf1953bc * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6540736769 -- 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 release-2.1.x updated (68d5c8cd6 -> 784c8f6ae)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 68d5c8cd6 chore(ci): preparing for next release new d7eb1c2ce chore: changelog automatic update new af24c0369 chore: nightly SBOM update new 784c8f6ae chore: nightly coverage badge update 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: CHANGELOG.md | 432 ++--- README.adoc| 2 +- camel-k-sbom/camel-k-sbom.json | 12 +- 3 files changed, 198 insertions(+), 248 deletions(-)
[camel-k] 03/03: chore: nightly coverage badge update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 784c8f6aed7feb8fc089d5d265d967abb29066cc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 17 00:38:14 2023 + chore: nightly coverage badge update --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index f529d68af..00b2ab183 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-33.6%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-33.7%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider.
[camel-k] 02/03: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.1.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit af24c03696af402809ba33c4aa38b077d195ab61
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Oct 17 00:35:44 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 6b7628a3a..87631c2db 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:f3408cd3-389b-486d-8a25-a566d554b137",
+ "serialNumber": "urn:uuid:f1575245-fc55-414d-92c4-51e38b0b9c74",
"version": 1,
"metadata": {
-"timestamp": "2023-10-15T23:43:56Z",
+"timestamp": "2023-10-17T00:35:44Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231014234331-2c00a53f00b4?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017003134-d7eb1c2ce129?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231014234331-2c00a53f00b4",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231014234331-2c00a53f00b4?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231017003134-d7eb1c2ce129",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017003134-d7eb1c2ce129?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231014234331-2c00a53f00b4?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017003134-d7eb1c2ce129?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
[camel-k] 01/03: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d7eb1c2ce12975e51980f7f0cb57d074b6a72c5f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 17 00:31:34 2023 + chore: changelog automatic update --- CHANGELOG.md | 432 ++- 1 file changed, 191 insertions(+), 241 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c36730846..822fef8f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) +## [v2.1.0](https://github.com/apache/camel-k/tree/v2.1.0) (2023-10-16) -[Full Changelog](https://github.com/apache/camel-k/compare/2.0.2-nightly...HEAD) +[Full Changelog](https://github.com/apache/camel-k/compare/camel-k-crds-2.1.0...v2.1.0) + +## [camel-k-crds-2.1.0](https://github.com/apache/camel-k/tree/camel-k-crds-2.1.0) (2023-10-16) + +[Full Changelog](https://github.com/apache/camel-k/compare/2.0.2-nightly...camel-k-crds-2.1.0) **Closed issues:** @@ -31,7 +35,9 @@ - Add GH issue template [\#4675](https://github.com/apache/camel-k/issues/4675) - Separating Java and native image compilation [\#4648](https://github.com/apache/camel-k/issues/4648) - IntegrationPlatform reconciliation should warn or fail when missing registry [\#4647](https://github.com/apache/camel-k/issues/4647) +- Let Camel framework manage Kamelets [\#4618](https://github.com/apache/camel-k/issues/4618) - Add plugin repository when `kamel run --maven-repository` [\#4608](https://github.com/apache/camel-k/issues/4608) +- Kamelet: `template.id` and/or `template.route.id` causes a failure to be resolved [\#4546](https://github.com/apache/camel-k/issues/4546) - Security warning messages from the operator pod on Openshift [\#4424](https://github.com/apache/camel-k/issues/4424) - Report error when any registry problem happen [\#4272](https://github.com/apache/camel-k/issues/4272) - unable to access the URL and unable to expose port after the integration build is successfully deployed. [\#4256](https://github.com/apache/camel-k/issues/4256) @@ -46,6 +52,7 @@ - How Camel K build container images [\#3336](https://github.com/apache/camel-k/issues/3336) - Missing Maven Server API description [\#3332](https://github.com/apache/camel-k/issues/3332) - Create proper Camel event source page on Knative website [\#3262](https://github.com/apache/camel-k/issues/3262) +- Use yaml camelCase for all the project resources [\#3229](https://github.com/apache/camel-k/issues/3229) - Local dependencies examples [\#3167](https://github.com/apache/camel-k/issues/3167) - `make build-resources` does not work on Windows [\#3134](https://github.com/apache/camel-k/issues/3134) - Invalid replica state for HPA [\#3132](https://github.com/apache/camel-k/issues/3132) @@ -58,68 +65,11 @@ - Persist trait status [\#2024](https://github.com/apache/camel-k/issues/2024) - Multiple knative revisions created when integration references multiple Knative channels [\#1826](https://github.com/apache/camel-k/issues/1826) - kamelets: distribution model documentation [\#1576](https://github.com/apache/camel-k/issues/1576) +- kamelets: architecture documentation [\#1573](https://github.com/apache/camel-k/issues/1573) +- Hide platform traits [\#1328](https://github.com/apache/camel-k/issues/1328) - validate platform configurations [\#383](https://github.com/apache/camel-k/issues/383) - Rethink profiles [\#262](https://github.com/apache/camel-k/issues/262) -**Merged pull requests:** - -- Bump X/Net to version 0.17.0 [\#4820](https://github.com/apache/camel-k/pull/4820) ([oscerd](https://github.com/oscerd)) -- feat\(trait\): disable incremental image option [\#4816](https://github.com/apache/camel-k/pull/4816) ([squakez](https://github.com/squakez)) -- e2e\(ctrl\): Add reconciliation recovery tests [\#4815](https://github.com/apache/camel-k/pull/4815) ([gansheer](https://github.com/gansheer)) -- fix\(knative\): sort services [\#4814](https://github.com/apache/camel-k/pull/4814) ([squakez](https://github.com/squakez)) -- feat\(trait\): quarkus native advanced configuration [\#4813](https://github.com/apache/camel-k/pull/4813) ([squakez](https://github.com/squakez)) -- fix\(ci\): OLM resources display name [\#4810](https://github.com/apache/camel-k/pull/4810) ([squakez](https://github.com/squakez)) -- chore\(deps\): bump github.com/spf13/viper from 1.16.0 to 1.17.0 [\#4809](https://github.com/apache/camel-k/pull/4809) ([dependabot[bot]](https://github.com/apps/dependabot)) -- chore\(deps\): bump golang.org/x/oauth2 from 0.12.0 to 0.13.0 [\#4807](https://github.com/apache/camel-k/pull/4807) ([dependabot[bot]](https://github.com/apps/dependabot)) -- chore\(deps\): bump
[camel-k] 01/04: 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 5f45b1456473317e502bfd1e4cc56ef585612134 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Oct 16 23:40:56 2023 + chore: changelog automatic update --- CHANGELOG.md | 492 ++- 1 file changed, 254 insertions(+), 238 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c36730846..91b8dbb48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,72 +2,18 @@ ## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) -[Full Changelog](https://github.com/apache/camel-k/compare/2.0.2-nightly...HEAD) - -**Closed issues:** - -- Bump X/Net to version 0.17.0 [\#4819](https://github.com/apache/camel-k/issues/4819) -- Camel K doesn't install on a restricted namespace [\#4786](https://github.com/apache/camel-k/issues/4786) -- Remove deprecated linters [\#4785](https://github.com/apache/camel-k/issues/4785) -- Camel K on operatorhub.io [\#4783](https://github.com/apache/camel-k/issues/4783) -- Consider adding `/PipeSpec/traits` [\#4780](https://github.com/apache/camel-k/issues/4780) -- 1st Integration after Camel K runtime version update failing [\#4776](https://github.com/apache/camel-k/issues/4776) -- E2E failure on common TestRunExtraRepository test [\#4774](https://github.com/apache/camel-k/issues/4774) -- Logger error in `--dev` mode [\#4770](https://github.com/apache/camel-k/issues/4770) -- Prometheus checks failing in Camel 4 [\#4765](https://github.com/apache/camel-k/issues/4765) -- Unable to work under azure k8s at latest version with a minimal example [\#4758](https://github.com/apache/camel-k/issues/4758) -- Quarkus image hardcoded [\#4756](https://github.com/apache/camel-k/issues/4756) -- E2E - Recurrent golang stacktrace logs [\#4754](https://github.com/apache/camel-k/issues/4754) -- E2E kamelets.camel.apache.org "my-own-timer-source" already exists failure [\#4750](https://github.com/apache/camel-k/issues/4750) -- Buildah check regression [\#4744](https://github.com/apache/camel-k/issues/4744) -- Kamelet - Inject secret in Azure KeyVault Trait [\#4743](https://github.com/apache/camel-k/issues/4743) -- Regression: upgrade check failing after 2.0.1 [\#4721](https://github.com/apache/camel-k/issues/4721) -- Insecure internal registry fails while pulling the kit [\#4720](https://github.com/apache/camel-k/issues/4720) -- kamel reports error when trying to use a camel-k-runtime version not following the sematic version [\#4715](https://github.com/apache/camel-k/issues/4715) -- Camel Quarkus 3.2.0 errors [\#4709](https://github.com/apache/camel-k/issues/4709) -- Missing license [\#4700](https://github.com/apache/camel-k/issues/4700) -- Camel K 2.0 go package is broken [\#4683](https://github.com/apache/camel-k/issues/4683) -- Camel K 1.12.1 : XSLT/XSLT-saxon: javax.xml.transform.TransformerConfigurationException: Could not compile stylesheet [\#4677](https://github.com/apache/camel-k/issues/4677) -- Add GH issue template [\#4675](https://github.com/apache/camel-k/issues/4675) -- Separating Java and native image compilation [\#4648](https://github.com/apache/camel-k/issues/4648) -- IntegrationPlatform reconciliation should warn or fail when missing registry [\#4647](https://github.com/apache/camel-k/issues/4647) -- Add plugin repository when `kamel run --maven-repository` [\#4608](https://github.com/apache/camel-k/issues/4608) -- Security warning messages from the operator pod on Openshift [\#4424](https://github.com/apache/camel-k/issues/4424) -- Report error when any registry problem happen [\#4272](https://github.com/apache/camel-k/issues/4272) -- unable to access the URL and unable to expose port after the integration build is successfully deployed. [\#4256](https://github.com/apache/camel-k/issues/4256) -- Language page for documentation of camel-k 1.12.x missing [\#4176](https://github.com/apache/camel-k/issues/4176) -- Redesign traits that have runtime dependencies [\#4166](https://github.com/apache/camel-k/issues/4166) -- Error creating Integration with Kaniko build strategy and Docker Desktop [\#4158](https://github.com/apache/camel-k/issues/4158) -- Transition issue when native image takes over the non-native image [\#4125](https://github.com/apache/camel-k/issues/4125) -- camel-k 1.6.1 camel-xmljson dependency is failed to download [\#3971](https://github.com/apache/camel-k/issues/3971) -- provide link to resume strategy documentation from resume trait documentation [\#3643](https://github.com/apache/camel-k/issues/3643) -- Traits in kamel-config.yaml are ignored if a trait is present as a modeline or as a command parameter [\#3598](https://github.com/apache/camel-k/issues/3598) -- Buildah pods will wait for Istio container to finish then timeout
[camel-k] 04/04: chore: nightly coverage badge 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 901905a551e55867fdde771cf06bf7aaf178eb78 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Oct 16 23:48:35 2023 + chore: nightly coverage badge update --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index f529d68af..00b2ab183 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-33.6%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-33.7%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider.
[camel-k] 03/04: chore: nightly SBOM 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 42aaa50f578bdb427bdcf11e0a2b576419fe922e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Oct 16 23:45:39 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 6b7628a3a..03bf50f6b 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:f3408cd3-389b-486d-8a25-a566d554b137",
+ "serialNumber": "urn:uuid:9395187e-919a-4a7b-ab26-b5c64ceaf071",
"version": 1,
"metadata": {
-"timestamp": "2023-10-15T23:43:56Z",
+"timestamp": "2023-10-16T23:45:39Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231014234331-2c00a53f00b4?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231016234509-0100ef8863ae?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231014234331-2c00a53f00b4",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231014234331-2c00a53f00b4?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231016234509-0100ef8863ae",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231016234509-0100ef8863ae?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231014234331-2c00a53f00b4?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231016234509-0100ef8863ae?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
[camel-k] 02/04: chore: autogenerated project resource 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 0100ef8863ae6f27e8fa7610bfa8635d58079a36
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Oct 16 23:45:09 2023 +
chore: autogenerated project resource update
---
pkg/resources/resources.go | 40
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 1684f3e77..080f3393a 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -117,9 +117,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_builds.yaml":
۰CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
modTime: time.Time{},
- uncompressedSize: 91926,
+ uncompressedSize: 92354,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1b\x37\x96\xe8\x77\xfd\x8a\x53\xf1\x07\xcb\x55\x22\x35\xe3\xc9\xce\x66\x75\x6b\xeb\x96\x56\x4e\x66\x35\x4e\x6c\xaf\x29\x7b\x32\xb5\xb5\x55\x02\xbb\x0f\x49\x84\xdd\x40\x5f\x00\x2d\x9a\xb9\x75\xff\xfb\x2d\xbc\xfa\x21\xb2\xbb\x01\x8a\xf4\xa3\xd2\xf8\x92\x58\x44\x03\xe7\xe0\x71\xde\x38\xe7\x19\x4c\x8e\xd7\xce\x9e\xc1\xcf\x34\x41\x26\x31\x05\xc5\x41\xad\x10\xae\x0b\x92\xac\x10\x66\x7c\xa1\x36\x44\x20\xfc\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\xe3\x36\x96\xe8\x77\xff\x8a\x53\xe9\x0f\xed\xae\xb2\xe4\xa4\x93\x99\xcd\xfa\xd6\xd6\x2d\xaf\x3b\x99\xf5\xf4\x73\x5b\xee\x9e\x4c\x6d\x4d\x95\x21\xf2\x48\x42\x44\x02\xbc\x00\x68\xb5\x72\xeb\xfe\xf7\x5b\x78\x91\xd4\x83\x24\x20\x4b\xfd\xa8\x10\x5f\x92\xb6\x40\xe0\x1c\x3c\xce\x1b\xe7\x3c\x81\xd1\xf1\xda\xd9\x13\x78\x45\x13\x64\x12\x53\x50\x1c\xd4\x02\xe1\xba\x20\xc9\x02\x61\xc2\x67\x6a\x45\x04\xc2\xaf\xbc\x
[...]
},
"/crd/bases/camel.apache.org_camelcatalogs.yaml":
۰CompressedFileInfo{
name: "camel.apache.org_camelcatalogs.yaml",
@@ -131,44 +131,44 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_integrationkits.yaml":
۰CompressedFileInfo{
name:
"camel.apache.org_integrationkits.yaml",
modTime: time.Time{},
- uncompressedSize: 24489,
+ uncompressedSize: 24414,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3c\x6b\x6f\xe3\xb6\x96\xdf\xfd\x2b\x0e\x26\x1f\x26\x01\x6c\xa7\xbd\x5b\x14\x0b\xdf\x6e\x81\x34\x9d\xf6\x06\x93\x99\xc9\xc6\x99\x16\x17\xb7\x17\x30\x2d\x1d\xdb\xac\x25\x52\x25\x29\x3b\xde\xc7\x7f\x5f\xf0\x90\xd4\xc3\x96\x64\xc5\x99\xdc\x9d\xbb\x3b\xfe\x32\x13\x89\x3c\x3c\xef\x17\x49\x9d\xc1\xe8\xd3\xfd\x06\x67\x70\xcb\x23\x14\x1a\x63\x30\x12\xcc\x0a\xe1\x2a\x63\xd1\x0a\x61\x2a\x17\x66\xcb\x14\xc2\x4f\x32\x17\x31\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3c\x6b\x6f\xe3\xb6\x96\xdf\xfd\x2b\x0e\x26\x1f\x26\x03\xd8\x4e\x7b\xb7\x28\x16\xb9\xdd\x02\x69\x3a\xed\x0d\xe6\x95\x4d\x32\x2d\x2e\x6e\x2f\xe0\x63\xe9\xd8\x66\x2d\x91\x2a\x49\x39\xf1\x3e\xfe\xfb\x82\x87\xa4\x2c\xdb\x92\xac\x38\x93\xee\xf4\xa2\xfe\x32\x13\x89\x3c\x3c\xef\x17\x49\x9d\xc0\xe8\xd3\xfd\x06\x27\xf0\x56\x24\x24\x0d\xa5\x60\x15\xd8\x05\xc1\x45\x81\xc9\x82\xe0\x56\xcd\xec\x3d\x6a\x82\x1f\x54\x29\x53\xb4\x
[...]
},
"/crd/bases/camel.apache.org_integrationplatforms.yaml":
۰CompressedFileInfo{
name:
"camel.apache.org_integrationplatforms.yaml",
modTime: time.Time{},
- uncompressedSize: 198698,
+ uncompressedSize: 197362,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\xdb\x36\xb6\x38\xfc\x7f\x3f\x05\xc6\x9d\x3b\x71\x32\x96\x94\xec\xde\xee\xf6\xfa\x6e\xef\xf3\x73\x9d\xb4\x75\x13\xc7\xbe\xb6\x93\xbd\x3b\xdd\x4e\x05\x91\x47\x12\x62\x12\xe0\x02\xa0\x6c\x75\xf6\xc3\x3f\x83\x03\x80\xa4\x24\x12\xa4\x5e\xec\xb8\xad\x98\x99\xd6\x92\x48\xf0\xe0\xe0\xe0\xbc\xe1\xbc\x7c\x49\x7a\xbb\xbb\xbe\xf8\x92\xbc\x63\x11\x70\x05\x31\xd1\x82\xe8\x29\x90\x93\x8c\x46\x53\x20\xd7\x62\xac\xef\x
[...]
+ compressedContent:
[camel-k] branch main updated (13c5d3723 -> 901905a55)
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 13c5d3723 chore: starting release branch for release-2.1.x new 5f45b1456 chore: changelog automatic update new 0100ef886 chore: autogenerated project resource update new 42aaa50f5 chore: nightly SBOM update new 901905a55 chore: nightly coverage badge update The 4 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 | 492 + README.adoc| 2 +- camel-k-sbom/camel-k-sbom.json | 12 +- pkg/resources/resources.go | 40 ++-- 4 files changed, 281 insertions(+), 265 deletions(-)
[camel] branch regen_bot updated (6dfd3ed7ac2 -> bfb3e31954e)
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 6dfd3ed7ac2 CAMEL-19996 avoid NPE when handling exception without coordinator (#11733) add bfb3e31954e CAMEL-19689: camel-jbang - Load classpath resources that have src/main/resources as prefix. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java | 4 1 file changed, 4 insertions(+)
[camel] branch regen_bot_40x updated (6dfd3ed7ac2 -> bfb3e31954e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_40x in repository https://gitbox.apache.org/repos/asf/camel.git from 6dfd3ed7ac2 CAMEL-19996 avoid NPE when handling exception without coordinator (#11733) add bfb3e31954e CAMEL-19689: camel-jbang - Load classpath resources that have src/main/resources as prefix. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java | 4 1 file changed, 4 insertions(+)
[camel] branch camel-4.0.x updated: CAMEL-19689: camel-jbang - Load classpath resources that have src/main/resources as prefix.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 8988f33d50b CAMEL-19689: camel-jbang - Load classpath resources that
have src/main/resources as prefix.
8988f33d50b is described below
commit 8988f33d50bd15badf141bf8e2821561ef91312c
Author: Claus Ibsen
AuthorDate: Mon Oct 16 21:17:59 2023 +0200
CAMEL-19689: camel-jbang - Load classpath resources that have
src/main/resources as prefix.
---
.../main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java | 4
1 file changed, 4 insertions(+)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
index 01017acc86b..7e60e8245df 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
@@ -40,6 +40,10 @@ public final class ExtraFilesClassLoader extends ClassLoader
{
@Override
public URL getResource(String name) {
+// clip leading slash
+if (name.startsWith("/")) {
+name = name.substring(1);
+}
for (String f : files) {
String source = f;
// deal with adding files to classpath that are in
src/main/resources
[camel] branch main updated: CAMEL-19689: camel-jbang - Load classpath resources that have src/main/resources as prefix.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bfb3e31954e CAMEL-19689: camel-jbang - Load classpath resources that
have src/main/resources as prefix.
bfb3e31954e is described below
commit bfb3e31954e809f099cf5fe077148f4fd4a90d49
Author: Claus Ibsen
AuthorDate: Mon Oct 16 21:17:59 2023 +0200
CAMEL-19689: camel-jbang - Load classpath resources that have
src/main/resources as prefix.
---
.../main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java | 4
1 file changed, 4 insertions(+)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
index 01017acc86b..7e60e8245df 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
@@ -40,6 +40,10 @@ public final class ExtraFilesClassLoader extends ClassLoader
{
@Override
public URL getResource(String name) {
+// clip leading slash
+if (name.startsWith("/")) {
+name = name.substring(1);
+}
for (String f : files) {
String source = f;
// deal with adding files to classpath that are in
src/main/resources
Re: [PR] Added build-catalog-tool-timeout parameter to install command. [camel-k]
github-actions[bot] commented on PR #4827: URL: https://github.com/apache/camel-k/pull/4827#issuecomment-1764909485 :camel: **Thank you for contributing!** Code Coverage Report :warning: - Coverage changed: 33.7% --> 33.6% (Coverage difference: **-.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
Re: [PR] Added build-catalog-tool-timeout parameter to install command. [camel-k]
valdar commented on PR #4821: URL: https://github.com/apache/camel-k/pull/4821#issuecomment-1764905223 Ok thank to @squakez I figured out that for some days this PR is actually irrelevant for `main` due to https://github.com/apache/camel-k/pull/4764 . I have ported it to `release-2.0.x` and opened against that branch here https://github.com/apache/camel-k/pull/4827 if it can be useful. -- 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
Re: [PR] Added build-catalog-tool-timeout parameter to install command. [camel-k]
valdar closed pull request #4821: Added build-catalog-tool-timeout parameter to install command. URL: https://github.com/apache/camel-k/pull/4821 -- 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
[PR] Added build-catalog-tool-timeout parameter to install command. [camel-k]
valdar opened a new pull request, #4827: URL: https://github.com/apache/camel-k/pull/4827 Added `build-catalog-tool-timeout` parameter to the `install` command. Added `CAMEL_K_BUILD_CATALOG_TOOL_TIMEOUT` to e2e tests scripts to leverage the new install parameter. Updated doc. Small addition to .gitignore This is useful in environment where the default timeout of 2 minutes is not sufficient. **Release Note** ```release-note NONE ``` -- 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
[PR] Bump @babel/traverse from 7.10.1 to 7.23.2 in /antora-ui-camel [camel-website]
dependabot[bot] opened a new pull request, #1075: URL: https://github.com/apache/camel-website/pull/1075 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.10.1 to 7.23.2. Release notes Sourced from https://github.com/babel/babel/releases;>@babel/traverse's releases. v7.23.2 (2023-10-11) NOTE: This release also re-publishes @babel/core, even if it does not appear in the linked release commit. Thanks https://github.com/jimmydief;>@jimmydief for your first PR! :bug: Bug Fix babel-traverse https://redirect.github.com/babel/babel/pull/16033;>#16033 Only evaluate own String/Number/Math methods (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) babel-preset-typescript https://redirect.github.com/babel/babel/pull/16022;>#16022 Rewrite .tsx extension when using rewriteImportExtensions (https://github.com/jimmydief;>@jimmydief) babel-helpers https://redirect.github.com/babel/babel/pull/16017;>#16017 Fix: fallback to typeof when toString is applied to incompatible object (https://github.com/JLHwung;>@JLHwung) babel-helpers, babel-plugin-transform-modules-commonjs, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime https://redirect.github.com/babel/babel/pull/16025;>#16025 Avoid override mistake in namespace imports (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) Committers: 5 Babel Bot (https://github.com/babel-bot;>@babel-bot) Huáng Jùnliàng (https://github.com/JLHwung;>@JLHwung) James Diefenderfer (https://github.com/jimmydief;>@jimmydief) Nicolò Ribaudo (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) https://github.com/liuxingbaoyu;>@liuxingbaoyu v7.23.1 (2023-09-25) Re-publishing @babel/helpers due to a publishing error in 7.23.0. v7.23.0 (2023-09-25) Thanks https://github.com/lorenzoferre;>@lorenzoferre and https://github.com/RajShukla1;>@RajShukla1 for your first PRs! :rocket: New Feature babel-plugin-proposal-import-wasm-source, babel-plugin-syntax-import-source, babel-plugin-transform-dynamic-import https://redirect.github.com/babel/babel/pull/15870;>#15870 Support transforming import source for wasm (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) babel-helper-module-transforms, babel-helpers, babel-plugin-proposal-import-defer, babel-plugin-syntax-import-defer, babel-plugin-transform-modules-commonjs, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-standalone https://redirect.github.com/babel/babel/pull/15878;>#15878 Implement import defer proposal transform support (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) babel-generator, babel-parser, babel-types https://redirect.github.com/babel/babel/pull/15845;>#15845 Implement import defer parsing support (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) https://redirect.github.com/babel/babel/pull/15829;>#15829 Add parsing support for the source phase imports proposal (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) babel-generator, babel-helper-module-transforms, babel-parser, babel-plugin-transform-dynamic-import, babel-plugin-transform-modules-amd, babel-plugin-transform-modules-commonjs, babel-plugin-transform-modules-systemjs, babel-traverse, babel-types https://redirect.github.com/babel/babel/pull/15682;>#15682 Add createImportExpressions parser option (https://github.com/JLHwung;>@JLHwung) babel-standalone https://redirect.github.com/babel/babel/pull/15671;>#15671 Pass through nonce to the transformed script element (https://github.com/JLHwung;>@JLHwung) babel-helper-function-name, babel-helper-member-expression-to-functions, babel-helpers, babel-parser, babel-plugin-proposal-destructuring-private, babel-plugin-proposal-optional-chaining-assign, babel-plugin-syntax-optional-chaining-assign, babel-plugin-transform-destructuring, babel-plugin-transform-optional-chaining, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-standalone, babel-types https://redirect.github.com/babel/babel/pull/15751;>#15751 Add support for optional chain in assignments (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) babel-helpers, babel-plugin-proposal-decorators https://redirect.github.com/babel/babel/pull/15895;>#15895 Implement the decorator metadata proposal (https://github.com/nicolo-ribaudo;>@nicolo-ribaudo) babel-traverse, babel-types https://redirect.github.com/babel/babel/pull/15893;>#15893 Add t.buildUndefinedNode (https://github.com/liuxingbaoyu;>@liuxingbaoyu) babel-preset-typescript ... (truncated) Changelog Sourced from https://github.com/babel/babel/blob/main/CHANGELOG.md;>@babel/traverse's changelog. v7.23.2 (2023-10-11) :bug:
[camel-website] branch dependabot/npm_and_yarn/antora-ui-camel/babel/traverse-7.23.2 created (now 7d77550d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/antora-ui-camel/babel/traverse-7.23.2 in repository https://gitbox.apache.org/repos/asf/camel-website.git at 7d77550d Bump @babel/traverse from 7.10.1 to 7.23.2 in /antora-ui-camel No new revisions were added by this update.
Re: [I] Release 2.1.0 [camel-k]
squakez commented on issue #4752: URL: https://github.com/apache/camel-k/issues/4752#issuecomment-1764859513 Release on vote -- 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
svn commit: r64557 - /dev/camel/camel-k/2.1.0/
Author: pcongiusti Date: Mon Oct 16 16:25:52 2023 New Revision: 64557 Log: Import camel-k release Added: dev/camel/camel-k/2.1.0/ dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz (with props) dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.asc dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.sha512 dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz (with props) dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz.asc dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz.sha512 dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-linux-amd64.tar.gz (with props) dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-linux-amd64.tar.gz.asc dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-linux-amd64.tar.gz.sha512 dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-linux-arm64.tar.gz (with props) dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-linux-arm64.tar.gz.asc dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-linux-arm64.tar.gz.sha512 dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-windows-amd64.tar.gz (with props) dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-windows-amd64.tar.gz.asc dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-windows-amd64.tar.gz.sha512 dev/camel/camel-k/2.1.0/camel-k-crds-2.1.0.jar (with props) dev/camel/camel-k/2.1.0/camel-k-sources-2.1.0.tar.gz (with props) dev/camel/camel-k/2.1.0/camel-k-sources-2.1.0.tar.gz.asc dev/camel/camel-k/2.1.0/camel-k-sources-2.1.0.tar.gz.sha512 Added: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz -- svn:mime-type = application/octet-stream Added: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.asc == --- dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.asc (added) +++ dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.asc Mon Oct 16 16:25:52 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEDV4jKJJJXejlQHXMrtxqiqrKh1YFAmUtY/sACgkQrtxqiqrK +h1ZGyRAAtJTkAvxBWQOnNReDXwOgBwxU4qE99euaHYth0K+VyYewEk5ErWuM4BUJ +Ld4+GLl2L0lr3+kI/vGh7ZfQ02a5cFvaOElUifvKzeWpXblDwCryyANC0j5JhsWO +/nPbQm/g0P3un1Fe4AFpkgDFh1d6fcGehl04JN3ompEJIJ8+aPGztFihm39ZGhLD +NGlBpV4azeHRBjLMVkbxVSxKZZYG2QhRBj76i5oAme2Pr+oCPyl9jecSVCw5RP2n +7GbNjrCyUyB3JDMfU+dak1Zh7QwY7xDJd5G7KVjdP5o+T02LtPxNIpRWt1KLpxf9 +r3MHI4OjYZl+chbCAy3alc5amZ96FrcYdYRJpDuBcmlrLMIXjYv+bUnmQkHjuAms +4qtwhro8u4OxcwZTQxJ9qoVd3RpnOJzTJUhGHEvYdX6phqvW9Sngdrve0MJZBMKW ++IcgaSb6ZoXZIBI632QoNK5HBvuIfIv1t9Q/SxGHFzB//211ulVCJ+/nTSza/eYq +acqyQYkMnUH4QM4kswR6HhNpcSHOSSjUFr12R1J32CBvYuVfNlYE+ABa2LkC6Nw0 +dV0XQ3wtnpNCWIkaapVENpxk7wAyC8S+KmuqvnC8CcNOXIhMCM2XhmxABoQHreYv +xEXAstySQbBqlLFOeF10MiuqvIg+3/rwdE22kVvH/gDPsRbQ5m8= +=cAYl +-END PGP SIGNATURE- Added: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.sha512 == --- dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.sha512 (added) +++ dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-amd64.tar.gz.sha512 Mon Oct 16 16:25:52 2023 @@ -0,0 +1 @@ +ffae3960b8cff65009253d474eade01a1f1203e95982d6dcb38d5556480156e50091caa7434fbf3b78a33d688e1ba19faa647cd903a22dbd66999b063d29bdb8 *camel-k-client-2.1.0-darwin-amd64.tar.gz Added: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz -- svn:mime-type = application/octet-stream Added: dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz.asc == --- dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz.asc (added) +++ dev/camel/camel-k/2.1.0/camel-k-client-2.1.0-darwin-arm64.tar.gz.asc Mon Oct 16 16:25:52 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEDV4jKJJJXejlQHXMrtxqiqrKh1YFAmUtY/sACgkQrtxqiqrK +h1ZdwA//RkE2ov6wePlI2LPr96XC9FKgoLMOsnYbdsrwpi84nUV5aH6QYnE5wSF5 +NKev5lEq03u/FoyZYmxh3W0ussPgqfNNyUie7excsy6uBnHJ5hoSymO8B7ukfBTH +RuFW5hpPgb2i+fQmthu8x4QW9ybhxleUc6/ncPRNqWu5SyxUqTcCwOpuhizhR7xb +h11yUYTuj3zFMljRjULQ22CZQ0cgYTkrUUOr4pyb9MkrvQkaJi2I9uz9ClCShjpC +5NIv2+s/0eFEuJeoCCjJQdKwoALufY+awZs7ObruRCM3FQdFsvVWYHem86TvLoDK +yHoMtcGQVEawU4Ql7UuixO9BRiSLF0oB4Z/tDVvTBNKI3jMfdy6TQPuw/L4gAIjQ +I0KY5UjHv5MvDrhQm+nxJKjKIqKKzsSfUqO2C8Iirz0bSX5c7kFwY3aw0IhUkeWQ
[camel-k] tag v2.1.0 created (now 68d5c8cd6)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to tag v2.1.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 68d5c8cd6 (commit) No new revisions were added by this update.
[camel-k] branch release-2.1.x updated: chore(ci): preparing for next release
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-2.1.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.1.x by this push:
new 68d5c8cd6 chore(ci): preparing for next release
68d5c8cd6 is described below
commit 68d5c8cd6945ffa5ea859d248da801797e0bc655
Author: Pasquale Congiusti
AuthorDate: Mon Oct 16 18:08:22 2023 +0200
chore(ci): preparing for next release
---
config/manager/operator-deployment.yaml| 6 +--
.../bases/camel-k.clusterserviceversion.yaml | 2 +-
helm/camel-k/Chart.yaml| 2 +-
helm/camel-k/values.yaml | 2 +-
pkg/resources/resources.go | 44 +++---
pkg/util/defaults/defaults.go | 2 +-
script/Makefile| 2 +-
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/config/manager/operator-deployment.yaml
b/config/manager/operator-deployment.yaml
index 26898da2d..af49b45b1 100644
--- a/config/manager/operator-deployment.yaml
+++ b/config/manager/operator-deployment.yaml
@@ -25,7 +25,7 @@ metadata:
name: camel-k-operator
app.kubernetes.io/component: operator
app.kubernetes.io/name: camel-k
-app.kubernetes.io/version: "2.1.0-SNAPSHOT"
+app.kubernetes.io/version: "2.1.0"
spec:
replicas: 1
strategy:
@@ -41,12 +41,12 @@ spec:
app: "camel-k"
app.kubernetes.io/component: operator
app.kubernetes.io/name: camel-k
-app.kubernetes.io/version: "2.1.0-SNAPSHOT"
+app.kubernetes.io/version: "2.1.0"
spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:2.1.0-SNAPSHOT
+ image: docker.io/apache/camel-k:2.1.0
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 3597a23a7..f80e3d9c2 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
certified: "false"
-containerImage: docker.io/apache/camel-k:2.1.0-SNAPSHOT
+containerImage: docker.io/apache/camel-k:2.1.0
createdAt: 2023-10-16T08:21:55Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index fa26d2737..0812b09cd 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -35,7 +35,7 @@ version: 0.13.1
# This is the version number of the application being deployed. This version
number should be
# incremented each time you make changes to the application.
-appVersion: 2.1.0-SNAPSHOT
+appVersion: 2.1.0
icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png
home: https://camel.apache.org/camel-k/latest/
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index e6eae0afc..ecf2d28ba 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,7 +23,7 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:2.1.0-SNAPSHOT
+ image: docker.io/apache/camel-k:2.1.0
global: "false"
resources: {}
securityContext: {}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 1684f3e77..07b3d74f9 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -117,9 +117,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_builds.yaml":
۰CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
modTime: time.Time{},
- uncompressedSize: 91926,
+ uncompressedSize: 92354,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1b\x37\x96\xe8\x77\xfd\x8a\x53\xf1\x07\xcb\x55\x22\x35\xe3\xc9\xce\x66\x75\x6b\xeb\x96\x56\x4e\x66\x35\x4e\x6c\xaf\x29\x7b\x32\xb5\xb5\x55\x02\xbb\x0f\x49\x84\xdd\x40\x5f\x00\x2d\x9a\xb9\x75\xff\xfb\x2d\xbc\xfa\x21\xb2\xbb\x01\x8a\xf4\xa3\xd2\xf8\x92\x58\x44\x03\xe7\xe0\x71\xde\x38\xe7\x19\x4c\x8e\xd7\xce\x9e\xc1\xcf\x34\x41\x26\x31\x05\xc5\x41\xad\x10\xae\x0b\x92\xac\x10\x66\x7c\xa1\x36\x44\x20\xfc\x
[...]
+ compressedContent:
[camel] branch regen_bot_3x updated (01460f132c7 -> bc61bc87ee5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 01460f132c7 CAMEL-19968: The Tracing Strategy is failing when using pollEnrich wi… (#11724) add bc61bc87ee5 CAMEL-19996 avoid NPE when handling exception without coordinator (#11733) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-)
[I] JDK 17 release error for Camel K CRDS artifact [camel-k]
squakez opened a new issue, #4826: URL: https://github.com/apache/camel-k/issues/4826 ### What happened? It was a warning in Java 11, now this is an error when performing release: ``` ./mvnw release:perform -Prelease [INFO] [WARNING] File /tmp/camel-k/java/target/checkout/java/target/generated-sources/java/org/apache/camel/v1/PipeStatus.java already exists, overwriting ... ``` ### Steps to reproduce _No response_ ### Relevant log output _No response_ ### Camel K version _No response_ -- 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
Re: [PR] CAMEL-19998: move several internal APIs to the CamelContext extension [camel]
orpiske commented on PR #11734: URL: https://github.com/apache/camel/pull/11734#issuecomment-1764794817 Obs.: marking as a draft as I wait for a full test on my CI. -- 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
Re: [PR] CAMEL-19998: move several internal APIs to the CamelContext extension [camel]
orpiske commented on PR #11734: URL: https://github.com/apache/camel/pull/11734#issuecomment-1764793405 Continuing the cleanup on the context and moving some of the internal code to the extension ... -- 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
Re: [PR] CAMEL-19998: move several internal APIs to the CamelContext extension [camel]
github-actions[bot] commented on PR #11734: URL: https://github.com/apache/camel/pull/11734#issuecomment-1764791166 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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
[PR] CAMEL-19998: move several internal APIs to the CamelContext extension [camel]
orpiske opened a new pull request, #11734: URL: https://github.com/apache/camel/pull/11734 (no comment) -- 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-performance-tests] branch main updated: Added a simple test with fixed dynamic resolution (#129)
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-performance-tests.git
The following commit(s) were added to refs/heads/main by this push:
new f9801ef Added a simple test with fixed dynamic resolution (#129)
f9801ef is described below
commit f9801ef75a0e6123601b23403cb4bbe76e52213c
Author: Otavio Rodolfo Piske
AuthorDate: Mon Oct 16 17:49:47 2023 +0200
Added a simple test with fixed dynamic resolution (#129)
---
.../apache/camel/itest/jmh/eip/ToDHeaderTest.java | 133 +
1 file changed, 133 insertions(+)
diff --git
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/eip/ToDHeaderTest.java
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/eip/ToDHeaderTest.java
new file mode 100644
index 000..ce0bed5
--- /dev/null
+++
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/eip/ToDHeaderTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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.itest.jmh.eip;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.Endpoint;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.results.format.ResultFormatType;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+/**
+ * This tests the toD when using a header for the routing decision.
+ */
+public class ToDHeaderTest {
+private static String DATA = "HELLO";
+private static final String HEADER = "name";
+private static final String POSITIVE = "positive";
+
+@Test
+public void launchBenchmark() throws Exception {
+Options opt = new OptionsBuilder()
+// Specify which benchmarks to run.
+// You can be more specific if you'd like to run only one
benchmark per test.
+.include(this.getClass().getName() + ".*")
+// Set the following options as needed
+.measurementIterations(10)
+.warmupIterations(5)
+.forks(1)
+.resultFormat(ResultFormatType.JSON)
+.result(this.getClass().getSimpleName() + ".jmh.json")
+.build();
+
+new Runner(opt).run();
+}
+
+// The JMH samples are the best documentation for how to use it
+//
http://hg.openjdk.java.net/code-tools/jmh/file/tip/jmh-samples/src/main/java/org/openjdk/jmh/samples/
+@State(Scope.Benchmark)
+public static class BenchmarkState {
+CamelContext context;
+ProducerTemplate producerTemplate;
+ConsumerTemplate consumerTemplate;
+
+Endpoint endpoint;
+Endpoint consumerPositiveEndpoint;
+
+@Setup(Level.Trial)
+public void initialize() throws Exception {
+context = new DefaultCamelContext();
+
+producerTemplate = context.createProducerTemplate();
+consumerTemplate = context.createConsumerTemplate();
+
+endpoint = context.getEndpoint("disruptor:test");
+consumerPositiveEndpoint =
context.getEndpoint("disruptor:positive");
+
+context.addRoutes(new RouteBuilder() {
+@Override
+public void configure() {
+from(endpoint)
+.toD("disruptor:${header[\"name\"]}");
+
+}
+});
+
+context.start();
+}
+}
+
+
+
Re: [PR] Added a simple test with fixed dynamic resolution [camel-performance-tests]
orpiske merged PR #129: URL: https://github.com/apache/camel-performance-tests/pull/129 -- 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-performance-tests] branch main updated: Added a simple test for the EndpointHelper (#130)
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-performance-tests.git
The following commit(s) were added to refs/heads/main by this push:
new 23caae6 Added a simple test for the EndpointHelper (#130)
23caae6 is described below
commit 23caae699a0955b5e4370e18d85f89436c3952e4
Author: Otavio Rodolfo Piske
AuthorDate: Mon Oct 16 17:49:35 2023 +0200
Added a simple test for the EndpointHelper (#130)
---
.../apache/camel/itest/jmh/EndpointHelperTest.java | 103 +
1 file changed, 103 insertions(+)
diff --git
a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/EndpointHelperTest.java
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/EndpointHelperTest.java
new file mode 100644
index 000..d3bbb3b
--- /dev/null
+++
b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/EndpointHelperTest.java
@@ -0,0 +1,103 @@
+package org.apache.camel.itest.jmh;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.EndpointRegistry;
+import org.apache.camel.support.EndpointHelper;
+import org.apache.camel.support.NormalizedUri;
+import org.junit.jupiter.api.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.results.format.ResultFormatType;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+/**
+ * These tests specific operations of the EndpointHelper in single-thread
scenarios.
+ */
+public class EndpointHelperTest {
+
+@Test
+public void launchBenchmark() throws Exception {
+Options opt = new OptionsBuilder()
+// Specify which benchmarks to run.
+// You can be more specific if you'd like to run only one
benchmark per test.
+.include(this.getClass().getName() + ".*")
+// Set the following options as needed
+.measurementIterations(10)
+.warmupIterations(5)
+.forks(1)
+.resultFormat(ResultFormatType.JSON)
+.result(this.getClass().getSimpleName() + ".jmh.json")
+.build();
+
+new Runner(opt).run();
+}
+
+@State(Scope.Benchmark)
+public static class BenchmarkState {
+DefaultCamelContext context;
+ProducerTemplate producerTemplate;
+EndpointRegistry endpointRegistry;
+
+String[] stringRoutes = new String[500];
+NormalizedUri[] routes = new NormalizedUri[500];
+NormalizedUri[] nonExistentRoutes = new NormalizedUri[500];
+Endpoint[] endpoints = new Endpoint[500];
+
+@Setup(Level.Trial)
+public void initialize() throws Exception {
+context = new DefaultCamelContext();
+
+context.start();
+producerTemplate = context.createProducerTemplate();
+endpointRegistry = context.getEndpointRegistry();
+
+for (int i = 0; i < routes.length; i++) {
+final String route = "controlbus:route?routeId=route" + i +
"=status=off";
+
+stringRoutes[i] = route;
+routes[i] = NormalizedUri.newNormalizedUri(route, false);
+
+endpoints[i] = context.getEndpoint(route);
+producerTemplate.requestBody(endpoints[i], null,
ServiceStatus.class);
+
+nonExistentRoutes[i] =
NormalizedUri.newNormalizedUri("controlbus:route?routeId=nonExistentRoutes" + i
+ "=status=off",
+false);
+
+}
+}
+}
+
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@BenchmarkMode(Mode.AverageTime)
+@Benchmark
+public void testMatchEndpointSame(BenchmarkState state, Blackhole bh) {
+for (String route : state.stringRoutes) {
+bh.consume(EndpointHelper.matchEndpoint(state.context, route,
route));
+}
+}
+
+
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@BenchmarkMode(Mode.AverageTime)
+@Benchmark
+public void testMatchEndpointNotSame(BenchmarkState state, Blackhole bh) {
+for (int i = 0; i < state.routes.length; i++) {
+bh.consume(EndpointHelper.matchEndpoint(state.context,
state.routes[i].toString(), state.stringRoutes[i]));
+}
+}
+
+}
Re: [PR] Added a simple test for the EndpointHelper [camel-performance-tests]
orpiske merged PR #130: URL: https://github.com/apache/camel-performance-tests/pull/130 -- 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_40x updated (64384e606c4 -> 6dfd3ed7ac2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_40x in repository https://gitbox.apache.org/repos/asf/camel.git from 64384e606c4 Regen for commit 03836e0e722d6163ccd1fd3385d37643c19c165b (#11728) add 3e80d38c903 CAMEL-19992: Upgrade bytebuddy that can support Java 21 (#11729) add e30d8f3c488 Upgrade Infinispan to version 14.0.19.Final (#11730) add 1d8e3a98af0 CAMEL-19995: camel-jbang - Run and reload from clipboard add 8fb46f02bfe CAMEL-19973 - Camel-AWS components: Revisit description - Athena Component (#11731) add 3663571daef CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch component (#11732) add 6dfd3ed7ac2 CAMEL-19996 avoid NPE when handling exception without coordinator (#11733) No new revisions were added by this update. Summary of changes: components/camel-aws/camel-aws2-athena/pom.xml | 2 +- .../services/org/apache/camel/component.properties | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../apache/camel/processor/saga/SagaProcessor.java | 11 ++- .../modules/ROOT/pages/camel-jbang.adoc| 14 .../camel/periodic-task/clipboard-reload-strategy | 2 +- .../java/org/apache/camel/main/KameletMain.java| 12 .../camel/main/util/ClipboardReloadStrategy.java | 78 ++ parent/pom.xml | 15 - .../services/InfinispanLocalContainerService.java | 2 +- 11 files changed, 131 insertions(+), 11 deletions(-) copy catalog/camel-catalog-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/catalog => dsl/camel-kamelet-main/src/generated/resources/META-INF/services/org/apache/camel/periodic-task/clipboard-reload-strategy (50%) create mode 100644 dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ClipboardReloadStrategy.java
[camel] branch regen_bot updated (3663571daef -> 6dfd3ed7ac2)
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 3663571daef CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch component (#11732) add 6dfd3ed7ac2 CAMEL-19996 avoid NPE when handling exception without coordinator (#11733) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-)
[camel] branch camel-3.20.x updated: CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 0a51ab29184 CAMEL-19996 avoid NPE when handling exception without
coordinator (#11733)
0a51ab29184 is described below
commit 0a51ab291844e29031fb7ba93a92af02bb74b86d
Author: Johannes Boßle
AuthorDate: Mon Oct 16 17:14:16 2023 +0200
CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
Co-authored-by: Johannes Boßle
---
.../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index 2e0354de516..a9acf56b73f 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -76,10 +76,15 @@ public abstract class SagaProcessor extends
DelegateAsyncProcessor implements Tr
AsyncCallback callback) {
if (this.completionMode == SagaCompletionMode.AUTO) {
if (exchange.getException() != null) {
-coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
-setCurrentSagaCoordinator(exchange, previousCoordinator);
+if (coordinator != null) {
+coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
+setCurrentSagaCoordinator(exchange,
previousCoordinator);
+callback.done(false);
+}));
+} else {
+// No coordinator available, so no saga available.
callback.done(false);
-}));
+}
} else {
coordinator.complete().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
setCurrentSagaCoordinator(exchange, previousCoordinator);
[camel] branch camel-3.21.x updated: CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new 4ca84f0da14 CAMEL-19996 avoid NPE when handling exception without
coordinator (#11733)
4ca84f0da14 is described below
commit 4ca84f0da14f96683c888985980dce9b897e8e47
Author: Johannes Boßle
AuthorDate: Mon Oct 16 17:14:16 2023 +0200
CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
Co-authored-by: Johannes Boßle
---
.../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index 2e0354de516..a9acf56b73f 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -76,10 +76,15 @@ public abstract class SagaProcessor extends
DelegateAsyncProcessor implements Tr
AsyncCallback callback) {
if (this.completionMode == SagaCompletionMode.AUTO) {
if (exchange.getException() != null) {
-coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
-setCurrentSagaCoordinator(exchange, previousCoordinator);
+if (coordinator != null) {
+coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
+setCurrentSagaCoordinator(exchange,
previousCoordinator);
+callback.done(false);
+}));
+} else {
+// No coordinator available, so no saga available.
callback.done(false);
-}));
+}
} else {
coordinator.complete().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
setCurrentSagaCoordinator(exchange, previousCoordinator);
[camel] branch camel-3.x updated: CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new bc61bc87ee5 CAMEL-19996 avoid NPE when handling exception without
coordinator (#11733)
bc61bc87ee5 is described below
commit bc61bc87ee55190796c62252c3e2e9c98b4be0bb
Author: Johannes Boßle
AuthorDate: Mon Oct 16 17:14:16 2023 +0200
CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
Co-authored-by: Johannes Boßle
---
.../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index 2e0354de516..a9acf56b73f 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -76,10 +76,15 @@ public abstract class SagaProcessor extends
DelegateAsyncProcessor implements Tr
AsyncCallback callback) {
if (this.completionMode == SagaCompletionMode.AUTO) {
if (exchange.getException() != null) {
-coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
-setCurrentSagaCoordinator(exchange, previousCoordinator);
+if (coordinator != null) {
+coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
+setCurrentSagaCoordinator(exchange,
previousCoordinator);
+callback.done(false);
+}));
+} else {
+// No coordinator available, so no saga available.
callback.done(false);
-}));
+}
} else {
coordinator.complete().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
setCurrentSagaCoordinator(exchange, previousCoordinator);
Re: [PR] CAMEL-19996 avoid NPE when handling exception without coordinator [camel]
davsclaus merged PR #11733: URL: https://github.com/apache/camel/pull/11733 -- 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 camel-4.0.x updated: CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 2adca9dc36d CAMEL-19996 avoid NPE when handling exception without
coordinator (#11733)
2adca9dc36d is described below
commit 2adca9dc36dee748dc9ca9d4a60f8de3928f9a9b
Author: Johannes Boßle
AuthorDate: Mon Oct 16 17:14:16 2023 +0200
CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
Co-authored-by: Johannes Boßle
---
.../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index 73f17d35173..d7108dd95cc 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -76,10 +76,15 @@ public abstract class SagaProcessor extends
DelegateAsyncProcessor implements Tr
AsyncCallback callback) {
if (this.completionMode == SagaCompletionMode.AUTO) {
if (exchange.getException() != null) {
-coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
-setCurrentSagaCoordinator(exchange, previousCoordinator);
+if (coordinator != null) {
+coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
+setCurrentSagaCoordinator(exchange,
previousCoordinator);
+callback.done(false);
+}));
+} else {
+// No coordinator available, so no saga available.
callback.done(false);
-}));
+}
} else {
coordinator.complete().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
setCurrentSagaCoordinator(exchange, previousCoordinator);
[camel] branch main updated: CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6dfd3ed7ac2 CAMEL-19996 avoid NPE when handling exception without
coordinator (#11733)
6dfd3ed7ac2 is described below
commit 6dfd3ed7ac2d62b04eaa39bddf657913da35afb2
Author: Johannes Boßle
AuthorDate: Mon Oct 16 17:14:16 2023 +0200
CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
Co-authored-by: Johannes Boßle
---
.../java/org/apache/camel/processor/saga/SagaProcessor.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index 73f17d35173..d7108dd95cc 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -76,10 +76,15 @@ public abstract class SagaProcessor extends
DelegateAsyncProcessor implements Tr
AsyncCallback callback) {
if (this.completionMode == SagaCompletionMode.AUTO) {
if (exchange.getException() != null) {
-coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
-setCurrentSagaCoordinator(exchange, previousCoordinator);
+if (coordinator != null) {
+coordinator.compensate().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
+setCurrentSagaCoordinator(exchange,
previousCoordinator);
+callback.done(false);
+}));
+} else {
+// No coordinator available, so no saga available.
callback.done(false);
-}));
+}
} else {
coordinator.complete().whenComplete((done, ex) ->
ifNotException(ex, exchange, callback, () -> {
setCurrentSagaCoordinator(exchange, previousCoordinator);
[camel-k] branch release-2.1.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.1.x by this push: new 0882d175f [maven-release-plugin] prepare for next development iteration 0882d175f is described below commit 0882d175f87f0e96a4939316e8aae7f52ac82827 Author: Pasquale Congiusti AuthorDate: Mon Oct 16 17:08:56 2023 +0200 [maven-release-plugin] prepare for next development iteration --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 4968796b6..8369e36bb 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.apache.camel.k camel-k-crds - 2.1.0 + 2.1.1-SNAPSHOT jar @@ -61,7 +61,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-k.git scm:git:https://gitbox.apache.org/repos/asf/camel-k.git https://gitbox.apache.org/repos/asf?p=camel-k.git;a=summary -camel-k-crds-2.1.0 +camel-k-project-1.10.0
[camel-k] annotated tag camel-k-crds-2.1.0 created (now 47312600a)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to annotated tag camel-k-crds-2.1.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 47312600a (tag) tagging f33372ae6c7eb4f8f7fa1757973d77d129b41b94 (commit) replaces camel-k-crds-1.12.0 by Pasquale Congiusti on Mon Oct 16 17:08:52 2023 +0200 - Log - [maven-release-plugin] copy for tag camel-k-crds-2.1.0 --- No new revisions were added by this update.
[camel-k] branch release-2.1.x updated: [maven-release-plugin] prepare release camel-k-crds-2.1.0
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.1.x by this push: new f33372ae6 [maven-release-plugin] prepare release camel-k-crds-2.1.0 f33372ae6 is described below commit f33372ae6c7eb4f8f7fa1757973d77d129b41b94 Author: Pasquale Congiusti AuthorDate: Mon Oct 16 17:08:48 2023 +0200 [maven-release-plugin] prepare release camel-k-crds-2.1.0 --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 7e008d7ac..4968796b6 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.apache.camel.k camel-k-crds - 2.1.0-SNAPSHOT + 2.1.0 jar @@ -61,7 +61,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-k.git scm:git:https://gitbox.apache.org/repos/asf/camel-k.git https://gitbox.apache.org/repos/asf?p=camel-k.git;a=summary -camel-k-project-1.10.0 +camel-k-crds-2.1.0
[camel-k] branch release-2.1.x updated: fix(ci): fabric8 deps update
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.1.x by this push: new 0bab3b096 fix(ci): fabric8 deps update 0bab3b096 is described below commit 0bab3b09619856142194ac8ca7747bd07203ff0f Author: Pasquale Congiusti AuthorDate: Mon Oct 16 17:06:33 2023 +0200 fix(ci): fabric8 deps update --- java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/pom.xml b/java/pom.xml index 8cc419432..7e008d7ac 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -35,7 +35,7 @@ 11 11 -6.4.1 +6.9.0 3.0.0-M8
Re: [PR] CAMEL-19996 avoid NPE when handling exception without coordinator [camel]
oscerd commented on PR #11733: URL: https://github.com/apache/camel/pull/11733#issuecomment-1764670741 To be backported to 4.0.x too -- 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
Re: [PR] CAMEL-19996 avoid NPE when handling exception without coordinator [camel]
github-actions[bot] commented on PR #11733: URL: https://github.com/apache/camel/pull/11733#issuecomment-1764666382 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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
[PR] CAMEL-19996 avoid NPE when handling exception without coordinator [camel]
johbossle opened a new pull request, #11733: URL: https://github.com/apache/camel/pull/11733 # Description This PR is about to avoid a NullPointerException during the errorHandling of creating a new saga. # 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 - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [CAMEL-19996](https://issues.apache.org/jira/browse/CAMEL-19996) filed for the change. # 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 have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes Maybe we also need to check, if there is a backport needed -- 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
Re: [PR] CAMEL-8306: Add support for wildcards to match on prefix [camel]
davsclaus commented on code in PR #11638:
URL: https://github.com/apache/camel/pull/11638#discussion_r1360779337
##
core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java:
##
@@ -83,19 +83,38 @@ public void testRestConsumerContextPathMatcherSuccess() {
@Test
public void testRestConsumerContextPathMatcherWithWildcard() {
List>
consumerPaths = new ArrayList<>();
-consumerPaths.add(new MockConsumerPath("GET", "/camel/*"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/info"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/{id}"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/order/*"));
RestConsumerContextPathMatcher.ConsumerPath path1 =
RestConsumerContextPathMatcher.matchBestPath("GET",
-"/camel", consumerPaths);
+"/camel/myapp/info", consumerPaths);
RestConsumerContextPathMatcher.ConsumerPath path2 =
RestConsumerContextPathMatcher.matchBestPath("GET",
-"/camel/foo", consumerPaths);
+"/camel/myapp/1", consumerPaths);
RestConsumerContextPathMatcher.ConsumerPath path3 =
RestConsumerContextPathMatcher.matchBestPath("GET",
+"/camel/myapp/order/foo", consumerPaths);
+
+assertEquals(path1.getConsumerPath(), "/camel/myapp/info");
+assertEquals(path2.getConsumerPath(), "/camel/myapp/{id}");
+assertEquals(path3.getConsumerPath(), "/camel/myapp/order/*");
+}
+
+@Test
+public void testRestConsumerContextPathMatcherOrder() {
+List>
consumerPaths = new ArrayList<>();
+consumerPaths.add(new MockConsumerPath("GET", "/camel/*"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/foo"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/foo/{id}"));
+
+RestConsumerContextPathMatcher.ConsumerPath path1 =
RestConsumerContextPathMatcher.matchBestPath("GET",
+"/camel/foo", consumerPaths);
+
+RestConsumerContextPathMatcher.ConsumerPath path2 =
RestConsumerContextPathMatcher.matchBestPath("GET",
"/camel/foo/bar", consumerPaths);
-assertEquals(path1.getConsumerPath(), "/camel/*");
+assertEquals(path1.getConsumerPath(), "/camel/foo");
assertEquals(path2.getConsumerPath(), "/camel/*");
Review Comment:
Correct. Wildcard should be last priority.
--
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
Re: [PR] CAMEL-8306: Add support for wildcards to match on prefix [camel]
TUCJVXCB commented on code in PR #11638:
URL: https://github.com/apache/camel/pull/11638#discussion_r1360775906
##
core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java:
##
@@ -83,19 +83,38 @@ public void testRestConsumerContextPathMatcherSuccess() {
@Test
public void testRestConsumerContextPathMatcherWithWildcard() {
List>
consumerPaths = new ArrayList<>();
-consumerPaths.add(new MockConsumerPath("GET", "/camel/*"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/info"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/{id}"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/order/*"));
RestConsumerContextPathMatcher.ConsumerPath path1 =
RestConsumerContextPathMatcher.matchBestPath("GET",
-"/camel", consumerPaths);
+"/camel/myapp/info", consumerPaths);
RestConsumerContextPathMatcher.ConsumerPath path2 =
RestConsumerContextPathMatcher.matchBestPath("GET",
-"/camel/foo", consumerPaths);
+"/camel/myapp/1", consumerPaths);
RestConsumerContextPathMatcher.ConsumerPath path3 =
RestConsumerContextPathMatcher.matchBestPath("GET",
+"/camel/myapp/order/foo", consumerPaths);
+
+assertEquals(path1.getConsumerPath(), "/camel/myapp/info");
+assertEquals(path2.getConsumerPath(), "/camel/myapp/{id}");
+assertEquals(path3.getConsumerPath(), "/camel/myapp/order/*");
+}
+
+@Test
+public void testRestConsumerContextPathMatcherOrder() {
+List>
consumerPaths = new ArrayList<>();
+consumerPaths.add(new MockConsumerPath("GET", "/camel/*"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/foo"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/foo/{id}"));
+
+RestConsumerContextPathMatcher.ConsumerPath path1 =
RestConsumerContextPathMatcher.matchBestPath("GET",
+"/camel/foo", consumerPaths);
+
+RestConsumerContextPathMatcher.ConsumerPath path2 =
RestConsumerContextPathMatcher.matchBestPath("GET",
"/camel/foo/bar", consumerPaths);
-assertEquals(path1.getConsumerPath(), "/camel/*");
+assertEquals(path1.getConsumerPath(), "/camel/foo");
assertEquals(path2.getConsumerPath(), "/camel/*");
Review Comment:
The priority of wildcard is now higher than uri template . The correct order
of priority is direct > URI template > wildcard, right?"
--
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
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360702639
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
+
+
+2023-10-11 08:12:46,561 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Redelivering message after rollback to ActiveMQ:
Hello rollback
+2023-10-11 08:12:46,567 INFO [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction commit (0xea2b886)
redelivered(true) for (MessageId:
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165: URL: https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360733267 ## message-bridge/src/test/java/org/acme/message/bridge/MessageBridgeITCase.java: ## @@ -0,0 +1,101 @@ +/* + * 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.acme.message.bridge; + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.concurrent.TimeUnit; + +import io.quarkus.artemis.test.ArtemisTestResource; +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusIntegrationTest; +import io.restassured.RestAssured; +import org.acme.message.bridge.resource.IBMMQTestResource; +import org.apache.commons.lang3.RandomStringUtils; +import org.awaitility.Awaitility; +import org.eclipse.microprofile.config.ConfigProvider; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +import static org.assertj.core.api.Assertions.assertThat; + +@QuarkusIntegrationTest +@QuarkusTestResource(ArtemisTestResource.class) +@QuarkusTestResource(IBMMQTestResource.class) +@EnabledIfSystemProperty(named = "ibm.mq.container.license", matches = "accept") +// The crash test will kill the app, so it must be executed last as there is no way to restart the application Review Comment: Nice comment, really helpful :+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
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360726390
##
message-bridge/src/main/java/org/acme/message/bridge/Producers.java:
##
@@ -0,0 +1,99 @@
+/*
+ * 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.acme.message.bridge;
+
+import com.ibm.mq.jakarta.jms.MQXAConnectionFactory;
+import com.ibm.msg.client.jakarta.wmq.WMQConstants;
+import io.quarkiverse.messaginghub.pooled.jms.PooledJmsWrapper;
+import io.smallrye.common.annotation.Identifier;
+import jakarta.inject.Singleton;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.transaction.TransactionManager;
+import org.apache.camel.component.jms.JmsComponent;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.springframework.transaction.jta.JtaTransactionManager;
+
+public class Producers {
+/**
+ * Create a connection factory for IBM MQ.
+ *
+ * Since there is no IBM MQ extension for quarkus, we need to create the
connection factory manually
+ *
+ * @param wrapper wrapper that is used to add pooling capabilities to the
connection facory
Review Comment:
nitpick typo: `factory`
--
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
Re: [I] JMS: Using IBM MQ client doesn't build to native [camel-quarkus]
aldettinger commented on issue #4924: URL: https://github.com/apache/camel-quarkus/issues/4924#issuecomment-1764546552 When working, it might be great to add native section to the camel-quarkus message bridge example. -- 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
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360710394
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
Review Comment:
nitpick, would rephrase `it is returned` into `it stays in the input broker`
--
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
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360708046
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
+
+
+2023-10-11 08:12:46,561 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Redelivering message after rollback to ActiveMQ:
Hello rollback
+2023-10-11 08:12:46,567 INFO [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction commit (0xea2b886)
redelivered(true) for (MessageId:
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360703688
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
+
+
+2023-10-11 08:12:46,561 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Redelivering message after rollback to ActiveMQ:
Hello rollback
+2023-10-11 08:12:46,567 INFO [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction commit (0xea2b886)
redelivered(true) for (MessageId:
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360705615
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
+
+
+2023-10-11 08:12:46,561 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Redelivering message after rollback to ActiveMQ:
Hello rollback
+2023-10-11 08:12:46,567 INFO [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction commit (0xea2b886)
redelivered(true) for (MessageId:
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
aldettinger commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360702639
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
+
+
+2023-10-11 08:12:46,561 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Redelivering message after rollback to ActiveMQ:
Hello rollback
+2023-10-11 08:12:46,567 INFO [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction commit (0xea2b886)
redelivered(true) for (MessageId:
[camel-k] branch main updated (167d6afb2 -> 13c5d3723)
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 167d6afb2 feat(trait): partition kamelets add 13c5d3723 chore: starting release branch for release-2.1.x No new revisions were added by this update. Summary of changes: .github/workflows/nightly-automatic-updates.yml | 2 +- .github/workflows/nightly-native-test.yml | 2 +- .github/workflows/nightly-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[camel-k] branch release-2.1.x created (now 13c5d3723)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git at 13c5d3723 chore: starting release branch for release-2.1.x No new revisions were added by this update.
[camel-quarkus] branch main updated: Add gRPC codegen protoc support for ppc64le architecture
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 51461900c9 Add gRPC codegen protoc support for ppc64le architecture
51461900c9 is described below
commit 51461900c930fb5ed27b83b52ecd68eaaf1953bc
Author: James Netherton
AuthorDate: Mon Oct 16 11:17:05 2023 +0100
Add gRPC codegen protoc support for ppc64le architecture
Fixes #5430
---
extensions/grpc/codegen/pom.xml| 12
poms/bom/pom.xml | 18 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 14 ++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 14 ++
.../main/generated/flattened-reduced-verbose-pom.xml | 14 ++
5 files changed, 72 insertions(+)
diff --git a/extensions/grpc/codegen/pom.xml b/extensions/grpc/codegen/pom.xml
index f710536366..a2bed05653 100644
--- a/extensions/grpc/codegen/pom.xml
+++ b/extensions/grpc/codegen/pom.xml
@@ -70,6 +70,12 @@
linux-x86_64
exe
+
+com.google.protobuf
+protoc
+linux-ppcle_64
+exe
+
com.google.protobuf
protoc
@@ -112,6 +118,12 @@
linux-x86_64
exe
+
+io.grpc
+protoc-gen-grpc-java
+linux-ppcle_64
+exe
+
io.grpc
protoc-gen-grpc-java
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 266e9b0348..31172494ec 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6156,6 +6156,14 @@
+
+
+com.google.protobuf
+protoc
+${protobuf.version}
+linux-ppcle_64
+exe
+
com.ibm.icu
icu4j
@@ -6248,6 +6256,14 @@
metrics-jmx
${dropwizard-metrics.version}
+
+
+io.grpc
+protoc-gen-grpc-java
+${grpc.version}
+linux-ppcle_64
+exe
+
io.minio
minio
@@ -6921,6 +6937,8 @@
com.ibm.mq:com.ibm.mq.jakarta.client
com.ibm.icu:icu4j
org.mapstruct:mapstruct-processor
+
io.grpc:protoc-gen-grpc-java:*
+
com.google.protobuf:protoc:*
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index d91f0d3ebc..adc48bbfdc 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6079,6 +6079,13 @@
+
+com.google.protobuf
+protoc
+3.22.0
+exe
+linux-ppcle_64
+
com.ibm.icu
icu4j
@@ -6171,6 +6178,13 @@
metrics-jmx
4.2.19
+
+io.grpc
+protoc-gen-grpc-java
+1.57.2
+exe
+linux-ppcle_64
+
io.minio
minio
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 258bd66edd..7d48b4dcd6 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6079,6 +6079,13 @@
+
+com.google.protobuf
+protoc
+3.22.0
+exe
+linux-ppcle_64
+
com.ibm.icu
icu4j
@@ -6161,6 +6168,13 @@
commons-lang
2.6
+
+io.grpc
+protoc-gen-grpc-java
+1.57.2
+exe
+linux-ppcle_64
+
io.minio
minio
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 37c064447f..fba3468384 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6079,6 +6079,13 @@
+
+com.google.protobuf
+protoc
+3.22.0
+exe
+linux-ppcle_64
+
com.ibm.icu
icu4j
@@ -6161,6 +6168,13 @@
commons-lang
2.6
+
+io.grpc
+
Re: [I] Add support for `protoc` `ppcle_64` architecture in gRPC codegen [camel-quarkus]
jamesnetherton closed issue #5430: Add support for `protoc` `ppcle_64` architecture in gRPC codegen URL: https://github.com/apache/camel-quarkus/issues/5430 -- 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
Re: [PR] Add gRPC codegen protoc support for ppc64le architecture [camel-quarkus]
jamesnetherton merged PR #5431: URL: https://github.com/apache/camel-quarkus/pull/5431 -- 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
Re: [PR] [Messaging] Add IBMMQ-AMQ example [camel-quarkus-examples]
avano commented on code in PR #165:
URL:
https://github.com/apache/camel-quarkus-examples/pull/165#discussion_r1360671391
##
message-bridge/README.adoc:
##
@@ -0,0 +1,206 @@
+= Message Bridge: A Camel Quarkus example
+:cq-example-description: An example that shows how to configure AMQ and IBM MQ
clients to use the connection pooling and XA transactions.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Overview
+
+In this example, a basic REST endpoint is provided for users to dispatch a
message to the IBM MQ queue. Subsequently, all messages from the IBM MQ are
relayed to an ActiveMQ queue within an XA transaction. To showcase the
transaction functionality, a message containing the keyword "rollback" will
initiate a transaction rollback. To demonstrate the process of a transaction
recovery after a crash, send a message with they keyword "crash".
+
+Details regarding client configurations can be located in the
`src/main/resources/application.properties` file.
+
+== Prerequisites
+
+First start the ActiveMQ broker:
+
+docker run \
+ -d \
+ -e AMQ_USER=admin \
+ -e AMQ_PASSWORD=admin \
+ -p 61616:61616 \
+ quay.io/artemiscloud/activemq-artemis-broker
+
+
+Then start the IBM MQ broker:
+
+docker run \
+ -d \
+ -e LICENSE=accept \
+ -e MQ_QMGR_NAME=QM1 \
+ -e MQ_APP_PASSWORD=passw0rd \
+ -p 1414:1414 \
+ icr.io/ibm-messaging/mq:9.3.2.1-r1
+
+
+== Start in the Development mode
+
+[source,shell]
+
+$ mvn clean compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+After the application is started, you can send messages to the IBMMQ queue
using the rest endpoint `/message`:
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello World'
+
+
+In the application logs you will see:
+
+
+2023-10-11 08:10:52,782 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello World
+2023-10-11 08:10:52,903 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello World
+2023-10-11 08:10:52,927 INFO [amq] (Camel (camel-4) thread #8 -
JmsConsumer[in]) ActiveMQ received: Hello World
+
+
+The message is initially dispatched to an IBMMQ queue, then relayed to an
ActiveMQ queue, and ultimately retrieved from the ActiveMQ queue and printed to
the log without any issues.
+
+=== Transaction rollback
+
+If you wish to illustrate a rollback, simply send a message containing the
`rollback` keyword.
+
+
+curl -X POST -H "Content-Type: text/plain" http://localhost:8080/message -d
'Hello rollback'
+
+The log could be divided into two segments. In this demonstration, the IBMMQ
to ActiveMQ route is configured to simulate a transaction rollback following
the dispatch of a message to the ActiveMQ queue. Due to the rollback, you'll
notice that the message isn't fetched from the ActiveMQ queue and isn't logged:
+
+
+2023-10-11 08:12:46,314 INFO [ibmmq] (executor-thread-1) Sending message to
IBMMQ: Hello rollback
+2023-10-11 08:12:46,453 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Sending message from IBMMQ to ActiveMQ: Hello rollback
+2023-10-11 08:12:46,457 WARN [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction rollback
(0xea2b886) redelivered(false) for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003) caught: Simulated rollback
+2023-10-11 08:12:46,458 ERROR [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Failed delivery for (MessageId:
ID:414d5120514d312020202020202020206437266503e30040 on ExchangeId:
01C264F444F3A96-0003). Exhausted after delivery attempt: 1 caught:
java.lang.RuntimeException: Simulated rollback
+...
+
+
+
+Because the transaction was rolled back, the message wasn't successfully
processed and it is returned to the IBMMQ queue and subsequently redelivered.
In this instance, the delivery is successful and logged accordingly:
+
+
+2023-10-11 08:12:46,561 INFO [ibmmq-amq] (Camel (camel-4) thread #7 -
JmsConsumer[DEV.QUEUE.1]) Redelivering message after rollback to ActiveMQ:
Hello rollback
+2023-10-11 08:12:46,567 INFO [org.apa.cam.jta.TransactionErrorHandler] (Camel
(camel-4) thread #7 - JmsConsumer[DEV.QUEUE.1]) Transaction commit (0xea2b886)
redelivered(true) for (MessageId:
Re: [PR] feat(api): Kamelet as static resource [camel-k]
github-actions[bot] commented on PR #4808: URL: https://github.com/apache/camel-k/pull/4808#issuecomment-1764474777 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- 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
Re: [PR] Ftp fails in the FIPS because of the not supported key. [camel-quarkus]
osmman commented on PR #5433: URL: https://github.com/apache/camel-quarkus/pull/5433#issuecomment-1764457736 Hello, I think that we should not use JKS in FIPS environment, because it is not standartized and is deprecated. Plus it is not certified by FIPS. We should use PKCS12 keystore. -- 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
Re: [PR] feat(api): Kamelet as static resource [camel-k]
github-actions[bot] commented on PR #4808: URL: https://github.com/apache/camel-k/pull/4808#issuecomment-1764445426 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- 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
Re: [PR] CAMEL-8306: Add support for wildcards to match on prefix [camel]
davsclaus commented on code in PR #11638:
URL: https://github.com/apache/camel/pull/11638#discussion_r1360632296
##
core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java:
##
@@ -83,19 +83,38 @@ public void testRestConsumerContextPathMatcherSuccess() {
@Test
public void testRestConsumerContextPathMatcherWithWildcard() {
List>
consumerPaths = new ArrayList<>();
-consumerPaths.add(new MockConsumerPath("GET", "/camel/*"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/info"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/{id}"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/myapp/order/*"));
RestConsumerContextPathMatcher.ConsumerPath path1 =
RestConsumerContextPathMatcher.matchBestPath("GET",
-"/camel", consumerPaths);
+"/camel/myapp/info", consumerPaths);
RestConsumerContextPathMatcher.ConsumerPath path2 =
RestConsumerContextPathMatcher.matchBestPath("GET",
-"/camel/foo", consumerPaths);
+"/camel/myapp/1", consumerPaths);
RestConsumerContextPathMatcher.ConsumerPath path3 =
RestConsumerContextPathMatcher.matchBestPath("GET",
+"/camel/myapp/order/foo", consumerPaths);
+
+assertEquals(path1.getConsumerPath(), "/camel/myapp/info");
+assertEquals(path2.getConsumerPath(), "/camel/myapp/{id}");
+assertEquals(path3.getConsumerPath(), "/camel/myapp/order/*");
+}
+
+@Test
+public void testRestConsumerContextPathMatcherOrder() {
+List>
consumerPaths = new ArrayList<>();
+consumerPaths.add(new MockConsumerPath("GET", "/camel/*"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/foo"));
+consumerPaths.add(new MockConsumerPath("GET", "/camel/foo/{id}"));
+
+RestConsumerContextPathMatcher.ConsumerPath path1 =
RestConsumerContextPathMatcher.matchBestPath("GET",
+"/camel/foo", consumerPaths);
+
+RestConsumerContextPathMatcher.ConsumerPath path2 =
RestConsumerContextPathMatcher.matchBestPath("GET",
"/camel/foo/bar", consumerPaths);
-assertEquals(path1.getConsumerPath(), "/camel/*");
+assertEquals(path1.getConsumerPath(), "/camel/foo");
assertEquals(path2.getConsumerPath(), "/camel/*");
Review Comment:
Should path2 not select /camel/foo/{id} because its the best candidate.
--
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 (8fb46f02bfe -> 3663571daef)
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 8fb46f02bfe CAMEL-19973 - Camel-AWS components: Revisit description - Athena Component (#11731) add 3663571daef CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch component (#11732) No new revisions were added by this update. Summary of changes: components/camel-aws/camel-aws2-cw/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[PR] Sql: Test SqlTest#testDefaultErrorCode fails with mssql [camel-quarkus]
JiriOndrusek opened a new pull request, #5435: URL: https://github.com/apache/camel-quarkus/pull/5435 Upstream PR: https://github.com/apache/camel-quarkus/pull/5416 Cherry-picked: 216f7b0892c34c564eda1e64817fe0e6d31029e5 -- 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 aws-CAMEL-19973-cloudwatch deleted (was ca12f87280a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch aws-CAMEL-19973-cloudwatch in repository https://gitbox.apache.org/repos/asf/camel.git was ca12f87280a CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch component 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-19973 - Camel-AWS components: Revisit description - Cloudwatch component (#11732)
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 3663571daef CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch component (#11732) 3663571daef is described below commit 3663571daefefb7103e94f8ec738e6febe19ba5c Author: Andrea Cosentino AuthorDate: Mon Oct 16 14:32:18 2023 +0200 CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch component (#11732) Signed-off-by: Andrea Cosentino --- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml index eafb03d7d13..d0dc27aaedc 100644 --- a/components/camel-aws/camel-aws2-cw/pom.xml +++ b/components/camel-aws/camel-aws2-cw/pom.xml @@ -30,7 +30,7 @@ jar Camel :: AWS2 CW -A Camel Amazon CW Web Service Component Version 2 +Send metrics to Amazon Cloud Watch service diff --git a/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 9bfdf891679..48532e40d8f 100644 --- a/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -4,4 +4,4 @@ groupId=org.apache.camel artifactId=camel-aws2-cw version=4.2.0-SNAPSHOT projectName=Camel :: AWS2 CW -projectDescription=A Camel Amazon CW Web Service Component Version 2 +projectDescription=Send metrics to Amazon Cloud Watch service
Re: [PR] CAMEL-19973 - Camel-AWS components: Revisit description - Cloudwatch … [camel]
oscerd merged PR #11732: URL: https://github.com/apache/camel/pull/11732 -- 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/06: chore(doc): kamelets deployment explained
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 e1a4dbbce8cb7f809272970b8b12bee6a27f6628 Author: Pasquale Congiusti AuthorDate: Thu Oct 5 12:33:13 2023 +0200 chore(doc): kamelets deployment explained --- .../images/architecture/kamelets_deployment.png| Bin 0 -> 35011 bytes docs/modules/ROOT/nav-end.adoc | 1 + docs/modules/ROOT/pages/architecture/kamelets.adoc | 19 ++ .../ROOT/pages/kamelets/kamelets-distribution.adoc | 11 +++- .../modules/ROOT/pages/kamelets/kamelets-user.adoc | 29 - pkg/apis/camel/v1/common_types_support.go | 15 ++- pkg/apis/camel/v1/integration_types_support.go | 13 - 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/modules/ROOT/images/architecture/kamelets_deployment.png b/docs/modules/ROOT/images/architecture/kamelets_deployment.png new file mode 100644 index 0..dbb184f07 Binary files /dev/null and b/docs/modules/ROOT/images/architecture/kamelets_deployment.png differ diff --git a/docs/modules/ROOT/nav-end.adoc b/docs/modules/ROOT/nav-end.adoc index 69cf0c052..3f57cc06f 100644 --- a/docs/modules/ROOT/nav-end.adoc +++ b/docs/modules/ROOT/nav-end.adoc @@ -83,6 +83,7 @@ *** xref:architecture/cr/camel-catalog.adoc[CamelCatalog] ** xref:architecture/runtime.adoc[Runtime] ** xref:architecture/traits.adoc[Traits] +** xref:architecture/kamelets.adoc[Kamelets] ** xref:architecture/incremental-image.adoc[Incremental Image] * API ** xref:apis/camel-k.adoc[Camel K API] diff --git a/docs/modules/ROOT/pages/architecture/kamelets.adoc b/docs/modules/ROOT/pages/architecture/kamelets.adoc new file mode 100644 index 0..d4006e072 --- /dev/null +++ b/docs/modules/ROOT/pages/architecture/kamelets.adoc @@ -0,0 +1,19 @@ += Kamelets architecture in Camel K + +xref:kamelets/kamelets.adoc[Kamelets] are a technology which were originally developed as a Camel K side resource but moved into Camel framework as Kamelet component. From an design point of view, a Kamelet is a specification that is provided into the cluster and which can be used at any point by an Integration or a Pipe, in order to reuse the connector style approach. + +In Camel framework, a Kamelet is nothing than a component which can be used as any other component with the `kamelet` uri scheme. This is translated to one or more Route Templates. What's important for Camel runtime is to have the Kamelet spec available somewhere when running the application making reference to it. + +[[deployment-model]] +== Deployment model + +In Camel K, it is worth to explain how the Kamelets are deployed in order to make Camel runtime application to correctly use the Kamelet referenced in the Integration. First of all, the operator uses a xref:traits:kamelets.adoc[Camel K trait] which is in charge to discover the Kamelets used in your route. This is due to get all the specification and dependencies required. + +image::architecture/kamelets_deployment.png[Kamelets deployment model] + +The operator creates a ConfigMap in order to bundle all the Kamelets which are eventually required by the application runtime. The Kamelets spec has to be available and in ready phase status. Once the application is created and ready to start, the operator mounts such a ConfigMap in a known location (default `/etc/camel/kamelets`) so that the Camel application will be able to read the definition from such location and run them according the logic expected in the same Camel framework. + +[[kamelet-parsing]] +=== Parsing capabilities defined in a Kamelet + +The operator is in charge to perform one important hidden operation. The Kamelet specification may contains Camel components and capabilities which the user should be in charge to define explicitly. However, the operator extract the Kamelet source and parses its content as a generated Integration source. In this way you will be able to get all the Kubernetes resources which are required to run your Integration (ie, a Kamelet using rest or exposing http services). diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-distribution.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-distribution.adoc index 617039bc3..77e5a99fb 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-distribution.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-distribution.adoc @@ -18,4 +18,13 @@ kamel kamelet add-repo :/[/path_to_kamelets_folder][@ ``` Mind that `` is the repository of your choice, for instance `github` and `[@version]` is the tag to use (by default it will use `main` branch). -With this approach you can dynamically include any repository where your Kamelets are hosted. They will be lazily initialized as soon as they are required by any of the Integration or Pipes which will make use of them. \ No newline at end of file
[camel-k] branch main updated (782b75ec6 -> 167d6afb2)
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 782b75ec6 chore: change deprecated yaml statements
new f83f39b59 feat(trait): mount kamelets for runtime
new 1cf62ec45 chore(e2e): kamelet trait test
new e1a4dbbce chore(doc): kamelets deployment explained
new 571928270 fix(trait): configmap identifier
new 5f64ec6c9 chore(trait): keep kamelet default location
new 167d6afb2 feat(trait): partition kamelets
The 6 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:
config/crd/bases/camel.apache.org_builds.yaml | 8 ++
.../bases/camel.apache.org_integrationkits.yaml| 3 +
.../camel.apache.org_integrationplatforms.yaml | 8 ++
.../crd/bases/camel.apache.org_integrations.yaml | 10 ++
.../bases/camel.apache.org_kameletbindings.yaml| 7 ++
config/crd/bases/camel.apache.org_kamelets.yaml| 6 ++
config/crd/bases/camel.apache.org_pipes.yaml | 7 ++
.../images/architecture/kamelets_deployment.png| Bin 0 -> 35011 bytes
docs/modules/ROOT/nav-end.adoc | 1 +
docs/modules/ROOT/pages/architecture/kamelets.adoc | 21
.../ROOT/pages/kamelets/kamelets-distribution.adoc | 11 +-
.../modules/ROOT/pages/kamelets/kamelets-user.adoc | 29 -
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 14 +++
docs/modules/traits/pages/kamelets.adoc| 4 +
.../common/traits/files/webhook.yaml | 7 +-
.../traits/{camel_test.go => kamelet_test.go} | 40 ---
e2e/support/test_support.go| 10 ++
helm/camel-k/crds/crd-build.yaml | 8 ++
helm/camel-k/crds/crd-integration-kit.yaml | 3 +
helm/camel-k/crds/crd-integration-platform.yaml| 8 ++
helm/camel-k/crds/crd-integration.yaml | 10 ++
helm/camel-k/crds/crd-kamelet-binding.yaml | 7 ++
helm/camel-k/crds/crd-kamelet.yaml | 6 ++
helm/camel-k/crds/crd-pipe.yaml| 7 ++
pkg/apis/camel/v1/common_types.go | 2 +
pkg/apis/camel/v1/common_types_support.go | 18
pkg/apis/camel/v1/integration_types_support.go | 13 ---
pkg/apis/camel/v1/trait/kamelets.go| 2 +
.../applyconfiguration/camel/v1/sourcespec.go | 9 ++
pkg/trait/camel.go | 7 +-
pkg/trait/camel_test.go| 2 +-
pkg/trait/kamelets.go | 109 ++-
pkg/trait/kamelets_support.go | 91
pkg/trait/kamelets_support_test.go | 117 +
pkg/trait/kamelets_test.go | 6 +-
pkg/trait/trait_types.go | 74 +++--
pkg/util/kubernetes/factory.go | 3 +
resources/traits.yaml | 4 +
38 files changed, 536 insertions(+), 156 deletions(-)
create mode 100644
docs/modules/ROOT/images/architecture/kamelets_deployment.png
create mode 100644 docs/modules/ROOT/pages/architecture/kamelets.adoc
copy config/rbac/patch-role-to-clusterrole.yaml =>
e2e/common/traits/files/webhook.yaml (91%)
copy e2e/common/traits/{camel_test.go => kamelet_test.go} (60%)
create mode 100644 pkg/trait/kamelets_support.go
create mode 100644 pkg/trait/kamelets_support_test.go
[camel-k] 01/06: feat(trait): mount kamelets for runtime
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 f83f39b59df2095ab00ae8c691819a1502e9b5a1 Author: Pasquale Congiusti AuthorDate: Tue Oct 10 10:54:20 2023 +0200 feat(trait): mount kamelets for runtime * Add a configmap as a bundle for all kamelets used by the Integration * Mount the bundle in /etc/camel/kamelets * Let the runtime use the Kamelets instead of trasforming into RouteTemplates * Let the operator use the Kamelet template for capability parsing Closes #4618 --- config/crd/bases/camel.apache.org_builds.yaml | 8 ++ .../bases/camel.apache.org_integrationkits.yaml| 3 + .../camel.apache.org_integrationplatforms.yaml | 8 ++ .../crd/bases/camel.apache.org_integrations.yaml | 10 ++ .../bases/camel.apache.org_kameletbindings.yaml| 7 ++ config/crd/bases/camel.apache.org_kamelets.yaml| 6 ++ config/crd/bases/camel.apache.org_pipes.yaml | 7 ++ docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 14 +++ docs/modules/traits/pages/kamelets.adoc| 4 + helm/camel-k/crds/crd-build.yaml | 8 ++ helm/camel-k/crds/crd-integration-kit.yaml | 3 + helm/camel-k/crds/crd-integration-platform.yaml| 8 ++ helm/camel-k/crds/crd-integration.yaml | 10 ++ helm/camel-k/crds/crd-kamelet-binding.yaml | 7 ++ helm/camel-k/crds/crd-kamelet.yaml | 6 ++ helm/camel-k/crds/crd-pipe.yaml| 7 ++ pkg/apis/camel/v1/common_types.go | 2 + pkg/apis/camel/v1/common_types_support.go | 5 + pkg/apis/camel/v1/trait/kamelets.go| 2 + .../applyconfiguration/camel/v1/sourcespec.go | 9 ++ pkg/trait/camel.go | 1 + pkg/trait/kamelets.go | 117 +++-- pkg/trait/kamelets_test.go | 6 +- pkg/trait/trait_types.go | 74 +++-- pkg/util/kubernetes/factory.go | 3 + resources/traits.yaml | 4 + 26 files changed, 251 insertions(+), 88 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index 08a6cc213..caacc731d 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -686,6 +686,10 @@ spec: contentType: description: the content type (tipically text or binary) type: string + from-kamelet: +description: True if the spec is generated from a + Kamelet +type: boolean interceptors: description: Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader uses to pre/post @@ -1424,6 +1428,10 @@ spec: contentType: description: the content type (tipically text or binary) type: string + from-kamelet: +description: True if the spec is generated from a + Kamelet +type: boolean interceptors: description: Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader uses to pre/post diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index 3d56b6ab8..d3e061b62 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -143,6 +143,9 @@ spec: contentType: description: the content type (tipically text or binary) type: string +from-kamelet: + description: True if the spec is generated from a Kamelet + type: boolean interceptors: description: Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader uses to pre/post process sources diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index d34c2f432..011141207 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1190,6 +1190,10 @@ spec:
[camel-k] 05/06: chore(trait): keep kamelet default location
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 5f64ec6c927df7e74c2f2d5315ee838071a5643d
Author: Pasquale Congiusti
AuthorDate: Fri Oct 13 12:03:43 2023 +0200
chore(trait): keep kamelet default location
To maintain backward compatibility
---
pkg/trait/kamelets.go| 2 +-
pkg/trait/trait_types.go | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 705026397..574a8b327 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -200,7 +200,7 @@ func (t *kameletsTrait) addKamelets(e *Environment) error {
if e.ApplicationProperties == nil {
e.ApplicationProperties = map[string]string{}
}
- e.ApplicationProperties[KameletLocationProperty] =
fmt.Sprintf("file:%s", t.MountPoint)
+ e.ApplicationProperties[KameletLocationProperty] =
fmt.Sprintf("file:%s,classpath:/kamelets", t.MountPoint)
e.Resources.Add()
// resort dependencies
sort.Strings(e.Integration.Status.Dependencies)
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index 05ee587ce..fca860d74 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -538,6 +538,8 @@ func (e *Environment) configureVolumesAndMounts(vols
*[]corev1.Volume, mnts *[]c
} else if
configMap.Labels[kubernetes.ConfigMapTypeLabel] == "kamelets-bundle" {
// Kamelets bundle configmap
kameletMountPoint :=
strings.ReplaceAll(e.ApplicationProperties[KameletLocationProperty], "file:",
"")
+ // We need also to remove the default location
provided
+ kameletMountPoint =
strings.ReplaceAll(kameletMountPoint, ",classpath:/kamelets", "")
refName := "kamelets-bundle"
vol := getVolume(refName, "configmap",
configMap.Name, "", "")
mnt := getMount(refName, kameletMountPoint, "",
true)
[camel-k] 04/06: fix(trait): configmap identifier
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 571928270d5311767ac8d2684df02a060c3ebed7
Author: Pasquale Congiusti
AuthorDate: Tue Oct 10 16:36:10 2023 +0200
fix(trait): configmap identifier
---
pkg/trait/camel.go | 6 --
pkg/trait/camel_test.go | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index e96dd6fcb..36e3d74b4 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -229,8 +229,9 @@ func (t *camelTrait) computeConfigMaps(e *Environment)
[]ctrl.Object {
)
}
- for i, s := range sources {
- if s.ContentRef != "" || e.isEmbedded(s) {
+ i := 0
+ for _, s := range sources {
+ if s.ContentRef != "" || e.isEmbedded(s) ||
s.IsGeneratedFromKamelet() {
continue
}
@@ -258,6 +259,7 @@ func (t *camelTrait) computeConfigMaps(e *Environment)
[]ctrl.Object {
}
maps = append(maps, )
+ i++
}
return maps
diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go
index f6edf5eaa..692c5df21 100644
--- a/pkg/trait/camel_test.go
+++ b/pkg/trait/camel_test.go
@@ -195,7 +195,7 @@ func TestApplyCamelTraitWithSources(t *testing.T) {
assert.Equal(t, 1, environment.Resources.Size())
sourceCm := environment.Resources.GetConfigMap(func(cm
*corev1.ConfigMap) bool {
- return cm.Name == "some-integration-source-001" &&
cm.Annotations["camel.apache.org/source.language"] == "xml" &&
cm.Annotations["camel.apache.org/source.name"] == "source2.xml"
+ return cm.Name == "some-integration-source-000" &&
cm.Annotations["camel.apache.org/source.language"] == "xml" &&
cm.Annotations["camel.apache.org/source.name"] == "source2.xml"
})
assert.NotNil(t, sourceCm)
assert.Equal(t, map[string]string{
[camel-k] 06/06: feat(trait): partition kamelets
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 167d6afb27fac407160695189790da3a5e9f331a
Author: Pasquale Congiusti
AuthorDate: Fri Oct 13 15:21:04 2023 +0200
feat(trait): partition kamelets
Configmap limit is 1 MB. We partition into more configmaps if the bundle
exceed such limit.
---
docs/modules/ROOT/pages/architecture/kamelets.adoc | 2 +
pkg/trait/kamelets.go | 56 --
pkg/trait/kamelets_support.go | 91
pkg/trait/kamelets_support_test.go | 117 +
pkg/trait/kamelets_test.go | 4 +-
pkg/trait/trait_types.go | 4 +-
6 files changed, 235 insertions(+), 39 deletions(-)
diff --git a/docs/modules/ROOT/pages/architecture/kamelets.adoc
b/docs/modules/ROOT/pages/architecture/kamelets.adoc
index d4006e072..6efa7cd8d 100644
--- a/docs/modules/ROOT/pages/architecture/kamelets.adoc
+++ b/docs/modules/ROOT/pages/architecture/kamelets.adoc
@@ -13,6 +13,8 @@ image::architecture/kamelets_deployment.png[Kamelets
deployment model]
The operator creates a ConfigMap in order to bundle all the Kamelets which are
eventually required by the application runtime. The Kamelets spec has to be
available and in ready phase status. Once the application is created and ready
to start, the operator mounts such a ConfigMap in a known location (default
`/etc/camel/kamelets`) so that the Camel application will be able to read the
definition from such location and run them according the logic expected in the
same Camel framework.
+NOTE: as the Configmap resource is limited to 1 MiB, the operator may split
into more than a single Configmap bundle.
+
[[kamelet-parsing]]
=== Parsing capabilities defined in a Kamelet
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 574a8b327..46629b24f 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -40,14 +40,14 @@ import (
"github.com/apache/camel-k/v2/pkg/util/digest"
"github.com/apache/camel-k/v2/pkg/util/dsl"
"github.com/apache/camel-k/v2/pkg/util/kamelets"
- "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const (
- contentKey= "content"
- KameletLocationProperty = "camel.component.kamelet.location"
- kameletLabel = "camel.apache.org/kamelet"
- kameletConfigurationLabel = "camel.apache.org/kamelet.configuration"
+ contentKey = "content"
+ KameletLocationProperty = "camel.component.kamelet.location"
+ kameletLabel= "camel.apache.org/kamelet"
+ kameletConfigurationLabel = "camel.apache.org/kamelet.configuration"
+ kameletMountPointAnnotation = "camel.apache.org/kamelet.mount-point"
)
type configurationKey struct {
@@ -177,7 +177,7 @@ func (t *kameletsTrait) addKamelets(e *Environment) error {
if err != nil {
return err
}
- kameletsBundleConfigmap :=
initializeConfigmapBundle(e.Integration.Name, e.Integration.Namespace)
+ kb := newKameletBundle()
for _, key := range t.getKameletKeys() {
kamelet := kamelets[key]
if kamelet.Status.Phase != v1.KameletPhaseReady {
@@ -190,45 +190,33 @@ func (t *kameletsTrait) addKamelets(e *Environment) error
{
// Adding explicit dependencies from Kamelets
util.StringSliceUniqueConcat(,
kamelet.Spec.Dependencies)
// Add to Kamelet bundle configmap
- serialized, err :=
kubernetes.ToYAMLNoManagedFields(kamelet)
- if err != nil {
- return err
- }
-
kameletsBundleConfigmap.Data[fmt.Sprintf("%s.kamelet.yaml", kamelet.Name)] =
string(serialized)
+ kb.add(kamelet)
+ }
+ bundleConfigmaps, err := kb.toConfigmaps(e.Integration.Name,
e.Integration.Namespace)
+ if err != nil {
+ return err
}
// set kamelets runtime location
if e.ApplicationProperties == nil {
e.ApplicationProperties = map[string]string{}
}
- e.ApplicationProperties[KameletLocationProperty] =
fmt.Sprintf("file:%s,classpath:/kamelets", t.MountPoint)
- e.Resources.Add()
+ for _, cm := range bundleConfigmaps {
+ kameletMountPoint := fmt.Sprintf("%s/%s", t.MountPoint,
cm.Name)
+ cm.Annotations[kameletMountPointAnnotation] =
kameletMountPoint
+ e.Resources.Add(cm)
+
[camel-k] 02/06: chore(e2e): kamelet trait test
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 1cf62ec451405fcb7ad21a5bccf479976ebc6b3f
Author: Pasquale Congiusti
AuthorDate: Tue Oct 10 11:38:27 2023 +0200
chore(e2e): kamelet trait test
---
e2e/common/traits/files/webhook.yaml | 21 +++
e2e/common/traits/kamelet_test.go| 67
e2e/support/test_support.go | 10 ++
3 files changed, 98 insertions(+)
diff --git a/e2e/common/traits/files/webhook.yaml
b/e2e/common/traits/files/webhook.yaml
new file mode 100644
index 0..c6deb4c8b
--- /dev/null
+++ b/e2e/common/traits/files/webhook.yaml
@@ -0,0 +1,21 @@
+# ---
+# 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.
+# ---
+
+- from:
+uri: "kamelet:capabilities-webhook-source"
+steps:
+ - log: "${body}"
diff --git a/e2e/common/traits/kamelet_test.go
b/e2e/common/traits/kamelet_test.go
new file mode 100644
index 0..bd6ec96af
--- /dev/null
+++ b/e2e/common/traits/kamelet_test.go
@@ -0,0 +1,67 @@
+//go:build integration
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+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 traits
+
+import (
+ "testing"
+
+ . "github.com/onsi/gomega"
+
+ corev1 "k8s.io/api/core/v1"
+
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+)
+
+func TestKameletTrait(t *testing.T) {
+ RegisterTestingT(t)
+
+ t.Run("discover kamelet capabilities", func(t *testing.T) {
+ template := map[string]interface{}{
+ "from": map[string]interface{}{
+ "uri": "platform-http:///webhook;,
+ "steps": []map[string]interface{}{
+ {
+ "to": "kamelet:sink",
+ },
+ },
+ },
+ }
+ Expect(CreateKamelet(ns, "capabilities-webhook-source",
template, nil, nil)()).To(Succeed())
+
+ name := "webhook"
+ Expect(KamelRunWithID(operatorID, ns, "files/webhook.yaml",
"--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("Started
capabilities-webhook-source-1 (platform-http:///webhook)"))
+ // Verify Integration capabilities
+ Eventually(IntegrationStatusCapabilities(ns, name),
TestTimeoutShort).Should(ContainElements("platform-http"))
+ // Verify expected resources from Kamelet (Service in this case)
+ service := Service(ns, name)
+ Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ })
+
+ // Clean-up
+ Expect(DeleteKamelet(ns,
Re: [I] Kamelet: `template.id` and/or `template.route.id` causes a failure to be resolved [camel-k]
squakez closed issue #4546: Kamelet: `template.id` and/or `template.route.id` causes a failure to be resolved URL: https://github.com/apache/camel-k/issues/4546 -- 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
Re: [I] kamelets: architecture documentation [camel-k]
squakez closed issue #1573: kamelets: architecture documentation URL: https://github.com/apache/camel-k/issues/1573 -- 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
