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-2001231602 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8304592627-1423-b0e6faa7-e48b-4639-bb2c-d9525756145c * Camel Quarkus Commit: dea3282d1a6b63f722e12341929f376d269c0a82 * Quarkus Main Commit: 2228dcd62db27332c97693b92a284261212a447b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8304592627 -- 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
[I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
jamesnetherton opened a new issue, #2926: URL: https://github.com/apache/camel-quarkus/issues/2926 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/quarkus-master-cron.yaml) for the [`quarkus-main`](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
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-200094 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8303740563-1319-f8637055-22ea-4795-b0a7-2071de61d38e * Camel Quarkus Commit: 5db67f453ff1dd0727eaab2f0c35f1ae7a17167f * Camel Main Commit: 2228dcd62db27332c97693b92a284261212a447b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8303740563 -- 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.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 0117cd894 chore: changelog automatic update 0117cd894 is described below commit 0117cd894a7194438d70753da3eb438d0b34c99e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 16 01:07:46 2024 + chore: changelog automatic update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df5af3190..b142f287e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) - Running integrations fail when the used registry has a port other than default 80 [\#5141](https://github.com/apache/camel-k/issues/5141) - camel-jackson configure configure "autoDiscoverObjectMapper" property for non-spring boot application [\#5140](https://github.com/apache/camel-k/issues/5140) +- Update github actions to a version that use node 20 [\#5130](https://github.com/apache/camel-k/issues/5130) - Integrations remain in Initialization loop when referenced config map has owner references [\#5114](https://github.com/apache/camel-k/issues/5114) - Externally built Integrations are deployed without a command in Camel-K 2.2.0 [\#5112](https://github.com/apache/camel-k/issues/5112) - Coverage report wrong percentage [\#5108](https://github.com/apache/camel-k/issues/5108) @@ -45,6 +46,7 @@ - Data type Kamelet hardcoded [\#5014](https://github.com/apache/camel-k/issues/5014) - Quarkus buildMode should sort JVM before Native execution [\#5001](https://github.com/apache/camel-k/issues/5001) - Failing to build native integration [\#5000](https://github.com/apache/camel-k/issues/5000) +- Azure Key Vault Trait: Support Azure Identity as authentication method [\#4983](https://github.com/apache/camel-k/issues/4983) - Use generated trait [\#4811](https://github.com/apache/camel-k/issues/4811) - Upgrade to Go 1.21 [\#4795](https://github.com/apache/camel-k/issues/4795) - Pointer to an external schema/CRD [\#4788](https://github.com/apache/camel-k/issues/4788) @@ -52,6 +54,7 @@ - 1st Integration after Camel K runtime version update failing [\#4776](https://github.com/apache/camel-k/issues/4776) - Provide alternative publishing strategy via pipeline [\#4747](https://github.com/apache/camel-k/issues/4747) - Quarkus native checks failure [\#4723](https://github.com/apache/camel-k/issues/4723) +- Build waiting condition [\#4542](https://github.com/apache/camel-k/issues/4542) - Add DataTypeRegistry as bean in Camel context [\#3845](https://github.com/apache/camel-k/issues/3845) - Remove duplication of the default platform creation [\#3433](https://github.com/apache/camel-k/issues/3433) - Use `go:embed` instead of vfsgen for embedded resources handling [\#3384](https://github.com/apache/camel-k/issues/3384)
(camel-k) branch release-2.1.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-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 8aa2015d8 chore: changelog automatic update 8aa2015d8 is described below commit 8aa2015d865ffe81f9f2c740b1a62a4a95475ad9 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 16 00:24:47 2024 + chore: changelog automatic update --- CHANGELOG.md | 4 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a8a5777e..b142f287e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- XSD might be wrong [\#5250](https://github.com/apache/camel-k/issues/5250) - Update buil/Dokerfile to use go 1.21 [\#5231](https://github.com/apache/camel-k/issues/5231) - Error java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [\#5225](https://github.com/apache/camel-k/issues/5225) - Deployment Trait maxUnavailable and maxSurge default values differ from documentation and do not support % values [\#5223](https://github.com/apache/camel-k/issues/5223) @@ -20,6 +21,7 @@ - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) - Running integrations fail when the used registry has a port other than default 80 [\#5141](https://github.com/apache/camel-k/issues/5141) - camel-jackson configure configure "autoDiscoverObjectMapper" property for non-spring boot application [\#5140](https://github.com/apache/camel-k/issues/5140) +- Update github actions to a version that use node 20 [\#5130](https://github.com/apache/camel-k/issues/5130) - Integrations remain in Initialization loop when referenced config map has owner references [\#5114](https://github.com/apache/camel-k/issues/5114) - Externally built Integrations are deployed without a command in Camel-K 2.2.0 [\#5112](https://github.com/apache/camel-k/issues/5112) - Coverage report wrong percentage [\#5108](https://github.com/apache/camel-k/issues/5108) @@ -44,6 +46,7 @@ - Data type Kamelet hardcoded [\#5014](https://github.com/apache/camel-k/issues/5014) - Quarkus buildMode should sort JVM before Native execution [\#5001](https://github.com/apache/camel-k/issues/5001) - Failing to build native integration [\#5000](https://github.com/apache/camel-k/issues/5000) +- Azure Key Vault Trait: Support Azure Identity as authentication method [\#4983](https://github.com/apache/camel-k/issues/4983) - Use generated trait [\#4811](https://github.com/apache/camel-k/issues/4811) - Upgrade to Go 1.21 [\#4795](https://github.com/apache/camel-k/issues/4795) - Pointer to an external schema/CRD [\#4788](https://github.com/apache/camel-k/issues/4788) @@ -51,6 +54,7 @@ - 1st Integration after Camel K runtime version update failing [\#4776](https://github.com/apache/camel-k/issues/4776) - Provide alternative publishing strategy via pipeline [\#4747](https://github.com/apache/camel-k/issues/4747) - Quarkus native checks failure [\#4723](https://github.com/apache/camel-k/issues/4723) +- Build waiting condition [\#4542](https://github.com/apache/camel-k/issues/4542) - Add DataTypeRegistry as bean in Camel context [\#3845](https://github.com/apache/camel-k/issues/3845) - Remove duplication of the default platform creation [\#3433](https://github.com/apache/camel-k/issues/3433) - Use `go:embed` instead of vfsgen for embedded resources handling [\#3384](https://github.com/apache/camel-k/issues/3384)
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1109: URL: https://github.com/apache/camel-spring-boot/pull/1109 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore: nightly automatic updates
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 The following commit(s) were added to refs/heads/main by this push: new ea186ed3a chore: nightly automatic updates ea186ed3a is described below commit ea186ed3a212ef2132c0c232273d0fd637db135b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 15 23:45:26 2024 + chore: nightly automatic updates --- CHANGELOG.md | 6 ++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e5bb036a..351c695da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- XSD might be wrong [\#5250](https://github.com/apache/camel-k/issues/5250) - Update buil/Dokerfile to use go 1.21 [\#5231](https://github.com/apache/camel-k/issues/5231) - Error java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [\#5225](https://github.com/apache/camel-k/issues/5225) - Deployment Trait maxUnavailable and maxSurge default values differ from documentation and do not support % values [\#5223](https://github.com/apache/camel-k/issues/5223) @@ -20,6 +21,7 @@ - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) - Running integrations fail when the used registry has a port other than default 80 [\#5141](https://github.com/apache/camel-k/issues/5141) - camel-jackson configure configure "autoDiscoverObjectMapper" property for non-spring boot application [\#5140](https://github.com/apache/camel-k/issues/5140) +- Update github actions to a version that use node 20 [\#5130](https://github.com/apache/camel-k/issues/5130) - Integrations remain in Initialization loop when referenced config map has owner references [\#5114](https://github.com/apache/camel-k/issues/5114) - Externally built Integrations are deployed without a command in Camel-K 2.2.0 [\#5112](https://github.com/apache/camel-k/issues/5112) - Coverage report wrong percentage [\#5108](https://github.com/apache/camel-k/issues/5108) @@ -44,6 +46,7 @@ - Data type Kamelet hardcoded [\#5014](https://github.com/apache/camel-k/issues/5014) - Quarkus buildMode should sort JVM before Native execution [\#5001](https://github.com/apache/camel-k/issues/5001) - Failing to build native integration [\#5000](https://github.com/apache/camel-k/issues/5000) +- Azure Key Vault Trait: Support Azure Identity as authentication method [\#4983](https://github.com/apache/camel-k/issues/4983) - Use generated trait [\#4811](https://github.com/apache/camel-k/issues/4811) - Upgrade to Go 1.21 [\#4795](https://github.com/apache/camel-k/issues/4795) - Pointer to an external schema/CRD [\#4788](https://github.com/apache/camel-k/issues/4788) @@ -51,6 +54,7 @@ - 1st Integration after Camel K runtime version update failing [\#4776](https://github.com/apache/camel-k/issues/4776) - Provide alternative publishing strategy via pipeline [\#4747](https://github.com/apache/camel-k/issues/4747) - Quarkus native checks failure [\#4723](https://github.com/apache/camel-k/issues/4723) +- Build waiting condition [\#4542](https://github.com/apache/camel-k/issues/4542) - Add DataTypeRegistry as bean in Camel context [\#3845](https://github.com/apache/camel-k/issues/3845) - Remove duplication of the default platform creation [\#3433](https://github.com/apache/camel-k/issues/3433) - Use `go:embed` instead of vfsgen for embedded resources handling [\#3384](https://github.com/apache/camel-k/issues/3384) @@ -59,6 +63,8 @@ **Merged pull requests:** +- Add Kamelet v1alpha1 sample [\#5254](https://github.com/apache/camel-k/pull/5254) ([claudio4j](https://github.com/claudio4j)) +- chore\(ci\): Upgrade kind action to 2.0.4 [\#5249](https://github.com/apache/camel-k/pull/5249) ([gansheer](https://github.com/gansheer)) - chore: propagate capabilities to Kit [\#5247](https://github.com/apache/camel-k/pull/5247) ([squakez](https://github.com/squakez)) - Azure Key Vault Trait: Support Azure Identity as authentication method [\#5244](https://github.com/apache/camel-k/pull/5244) ([oscerd](https://github.com/oscerd)) - chore\(ci\): Upgrade setup-kubectl action [\#5243](https://github.com/apache/camel-k/pull/5243) ([gansheer](https://github.com/gansheer))
[I] Karavan and Azure Devops/CR [camel-karavan]
Groumph opened a new issue, #1181:
URL: https://github.com/apache/camel-karavan/issues/1181
I am attempting to use Azure DevOps Git and Azure Container Registry.
When I push in Karavan, it is working fine. The files show up in Azure
DevOps.
Whenever I try to do anything with containers, I get the following:
`2024-03-15 22:07:38,227 INFO [org.apa.cam.kar.doc.DockerForKaravan]
(executor-thread-5) DevMode starting for testtest with JBANG_OPTIONS=
2024-03-15 22:07:42,774 ERROR [com.git.doc.api.asy.ResultCallbackTemplate]
(docker-java-stream--873483501) Error during callback:
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
at
com.github.dockerjava.core.DefaultInvocationBuilder.execute(DefaultInvocationBuilder.java:247)
at
com.github.dockerjava.core.DefaultInvocationBuilder.lambda$executeAndStream$1(DefaultInvocationBuilder.java:269)
at java.base/java.lang.Thread.run(Thread.java:840)
2024-03-15 22:07:42,775 ERROR [org.apa.cam.kar.api.DevModeResource]
(executor-thread-5)
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
2024-03-15 22:08:28,720 INFO [org.apa.cam.kar.doc.DockerForKaravan]
(executor-thread-4) DevMode starting for testtest with JBANG_OPTIONS=--verbose
2024-03-15 22:08:29,635 ERROR [com.git.doc.api.asy.ResultCallbackTemplate]
(docker-java-stream--873483501) Error during callback:
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
at
com.github.dockerjava.core.DefaultInvocationBuilder.execute(DefaultInvocationBuilder.java:247)
at
com.github.dockerjava.core.DefaultInvocationBuilder.lambda$executeAndStream$1(DefaultInvocationBuilder.java:269)
at java.base/java.lang.Thread.run(Thread.java:840)
2024-03-15 22:08:29,635 ERROR [org.apa.cam.kar.api.DevModeResource]
(executor-thread-4)
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
2024-03-15 22:08:46,802 INFO [org.apa.cam.kar.doc.DockerForKaravan]
(executor-thread-2) DevMode starting for testtest with JBANG_OPTIONS=
2024-03-15 22:08:47,757 ERROR [com.git.doc.api.asy.ResultCallbackTemplate]
(docker-java-stream--873483501) Error during callback:
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
at
com.github.dockerjava.core.DefaultInvocationBuilder.execute(DefaultInvocationBuilder.java:247)
at
com.github.dockerjava.core.DefaultInvocationBuilder.lambda$executeAndStream$1(DefaultInvocationBuilder.java:269)
at java.base/java.lang.Thread.run(Thread.java:840)
2024-03-15 22:08:47,757 ERROR [org.apa.cam.kar.api.DevModeResource]
(executor-thread-2)
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
2024-03-15 22:10:05,742 INFO [org.apa.cam.kar.doc.DockerForKaravan]
(executor-thread-2) Starting Build Container
2024-03-15 22:10:06,666 ERROR [com.git.doc.api.asy.ResultCallbackTemplate]
(docker-java-stream--873483501) Error during callback:
com.github.dockerjava.api.exception.InternalServerErrorException: Status 500:
{"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
at
com.github.dockerjava.core.DefaultInvocationBuilder.execute(DefaultInvocationBuilder.java:247)
at
com.github.dockerjava.core.DefaultInvocationBuilder.lambda$executeAndStream$1(DefaultInvocationBuilder.java:269)
at java.base/java.lang.Thread.run(Thread.java:840)
2024-03-15 22:10:06,666 ERROR [org.apa.cam.kar.api.ProjectResource]
(executor-thread-2) Status 500: {"message":"Head
\"https://ghcr.io/v2/apache/camel-karavan-devmode/manifests/4.4.0\": denied:
denied"}
`
Is this that there is an issue accessing Azure Container Registry? Or an
issue accessing that manifest?
Thank you.
--
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
(camel-karavan) branch main updated: Fix #1180
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 5e889e62 Fix #1180
5e889e62 is described below
commit 5e889e6290662aa1a8acd92dcb7e288b093689b0
Author: Marat Gubaidullin
AuthorDate: Fri Mar 15 18:14:44 2024 -0400
Fix #1180
---
.../main/webui/src/designer/KaravanDesigner.tsx| 62 +-
.../main/webui/src/designer/selector/DslCard.tsx | 71 +++
.../webui/src/designer/selector/DslFastCard.tsx| 58 +
.../webui/src/designer/selector/DslPreferences.tsx | 13 +++
.../webui/src/designer/selector/DslSelector.css| 40 ++-
.../webui/src/designer/selector/DslSelector.tsx| 130 -
karavan-designer/public/example/demo.camel.yaml| 2 -
karavan-designer/src/designer/selector/DslCard.tsx | 71 +++
.../src/designer/selector/DslFastCard.tsx | 58 +
.../src/designer/selector/DslPreferences.tsx | 13 +++
.../src/designer/selector/DslSelector.css | 40 ++-
.../src/designer/selector/DslSelector.tsx | 130 -
karavan-space/src/designer/selector/DslCard.tsx| 71 +++
.../src/designer/selector/DslFastCard.tsx | 58 +
.../src/designer/selector/DslPreferences.tsx | 13 +++
.../src/designer/selector/DslSelector.css | 40 ++-
.../src/designer/selector/DslSelector.tsx | 130 -
17 files changed, 708 insertions(+), 292 deletions(-)
diff --git a/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx
b/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx
index 8e49e054..36b65118 100644
--- a/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx
+++ b/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx
@@ -73,30 +73,35 @@ export function KaravanDesigner(props: Props) {
useEffect(() => {
const sub = EventBus.onIntegrationUpdate()?.subscribe((update:
IntegrationUpdate) =>
save(update.integration, update.propertyOnly));
-InfrastructureAPI.setOnSaveCustomCode(props.onSaveCustomCode);
-InfrastructureAPI.setOnGetCustomCode(props.onGetCustomCode);
-InfrastructureAPI.setOnSave(props.onSave);
-
InfrastructureAPI.setOnSavePropertyPlaceholder(props.onSavePropertyPlaceholder);
-
InfrastructureAPI.setOnInternalConsumerClick(props.onInternalConsumerClick);
+try {
+InfrastructureAPI.setOnSaveCustomCode(props.onSaveCustomCode);
+InfrastructureAPI.setOnGetCustomCode(props.onGetCustomCode);
+InfrastructureAPI.setOnSave(props.onSave);
+
InfrastructureAPI.setOnSavePropertyPlaceholder(props.onSavePropertyPlaceholder);
+
InfrastructureAPI.setOnInternalConsumerClick(props.onInternalConsumerClick);
-setSelectedStep(undefined);
-const i = makeIntegration(props.yaml, props.filename);
-setIntegration(i, false);
-let designerTab = i.kind === 'Kamelet' ? 'kamelet' : props.tab;
-if (designerTab === undefined) {
-const counts = CamelUi.getFlowCounts(i);
-designerTab = (counts.get('routes') || 0) > 0 ? 'routes' :
designerTab;
-designerTab = (counts.get('rest') || 0) > 0 ? 'rest' : designerTab;
-designerTab = (counts.get('beans') || 0) > 0 ? 'beans' :
designerTab;
+setSelectedStep(undefined);
+const i = makeIntegration(props.yaml, props.filename);
+setIntegration(i, false);
+let designerTab = i.kind === 'Kamelet' ? 'kamelet' : props.tab;
+if (designerTab === undefined) {
+const counts = CamelUi.getFlowCounts(i);
+designerTab = (counts.get('routes') || 0) > 0 ? 'routes' :
designerTab;
+designerTab = (counts.get('rest') || 0) > 0 ? 'rest' :
designerTab;
+designerTab = (counts.get('beans') || 0) > 0 ? 'beans' :
designerTab;
+}
+setTab(designerTab || 'routes')
+reset();
+setDark(props.dark);
+setPropertyPlaceholders(props.propertyPlaceholders)
+setVariables(VariableUtil.findVariables(props.files))
+setBeans(props.beans)
+resetFiles(props.files)
+setHideLogDSL(props.hideLogDSL === true);
+} catch (e: any) {
+console.log(e)
+EventBus.sendAlert(' ' + e?.name, '' + e?.message, 'danger');
}
-setTab(designerTab || 'routes')
-reset();
-setDark(props.dark);
-setPropertyPlaceholders(props.propertyPlaceholders)
-setVariables(VariableUtil.findVariables(props.files))
-setBeans(props.beans)
-resetFiles(props.files)
-setHideLogDSL(props.hideLogDSL === true);
return
Re: [I] User should be able to remove preferred element [camel-karavan]
mgubaidullin closed issue #1180: User should be able to remove preferred element URL: https://github.com/apache/camel-karavan/issues/1180 -- 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: r67969 [2/5] - /dev/camel/camel-quarkus/3.8.1/
Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json
==
--- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json (added)
+++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json Fri Mar
15 21:48:11 2024
@@ -0,0 +1,228665 @@
+{
+ "bomFormat" : "CycloneDX",
+ "specVersion" : "1.4",
+ "serialNumber" : "urn:uuid:d51b7f80-11ae-36eb-aaae-018973936506",
+ "version" : 1,
+ "metadata" : {
+"tools" : [
+ {
+"vendor" : "OWASP Foundation",
+"name" : "CycloneDX Maven plugin",
+"version" : "2.7.11",
+"hashes" : [
+ {
+"alg" : "MD5",
+"content" : "a70e8b649ab4a2bb7922d360173c8237"
+ },
+ {
+"alg" : "SHA-1",
+"content" : "4c3c0878c15561639076e5be7a48ffcd6111c5ee"
+ },
+ {
+"alg" : "SHA-256",
+"content" :
"70997d52dbffd4e797c467b2062c6ba9b8b5a7380ff2884779f2743b6172ebb5"
+ },
+ {
+"alg" : "SHA-512",
+"content" :
"bc1ce91190c642f68fd3571939d7668def3b879ec8e5a87a213a9710a106e0290f60f9e0414593d19cca958c4fcb5d4450bd2793bcd609948419c8a2a6a7f5c8"
+ },
+ {
+"alg" : "SHA-384",
+"content" :
"3c8421bdafd1754fb424f16dccc83bfe0827648c1cadfffc98bdf1c7da65475dfe48d2f4b16d233bb8819e155ba6a4f3"
+ },
+ {
+"alg" : "SHA3-384",
+"content" :
"ad88cf6a0e0a5d51df49a4dab5530a28de9df7eec8460c045dff3e1f9316b82a244a125d52b937fe9d4ee72e44f5d01a"
+ },
+ {
+"alg" : "SHA3-256",
+"content" :
"b4d9c3ef07c34517fd9f33178ba95ffc9618eb84a3671e71b0c82991ec3717e5"
+ },
+ {
+"alg" : "SHA3-512",
+"content" :
"935b43aba8999dc7d95d93288a251c97b6b32852841b7bef31516c27c8d65c8de7f8411f1829f765ee760f25930c766db6a49df68e5994e18721c0a71f606f1e"
+ }
+]
+ }
+],
+"component" : {
+ "publisher" : "The Apache Software Foundation",
+ "group" : "org.apache.camel.quarkus",
+ "name" : "camel-quarkus",
+ "version" : "3.8.1",
+ "description" : "Apache Camel extensions for Quarkus",
+ "licenses" : [
+{
+ "license" : {
+"id" : "Apache-2.0",
+"url" : "https://www.apache.org/licenses/LICENSE-2.0;
+ }
+}
+ ],
+ "purl" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.8.1?type=pom",
+ "externalReferences" : [
+{
+ "type" : "website",
+ "url" : "http://camel.apache.org;
+},
+{
+ "type" : "distribution",
+ "url" :
"https://repository.apache.org/service/local/staging/deploy/maven2;
+},
+{
+ "type" : "issue-tracker",
+ "url" : "https://github.com/apache/camel-quarkus/issues;
+},
+{
+ "type" : "mailing-list",
+ "url" : "dev-subscr...@camel.apache.org"
+},
+{
+ "type" : "vcs",
+ "url" : "https://github.com/apache/camel-quarkus;
+}
+ ],
+ "type" : "library",
+ "bom-ref" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.8.1?type=pom"
+},
+"properties" : [
+ {
+"name" : "maven.goal",
+"value" : "makeAggregateBom"
+ },
+ {
+"name" : "maven.scopes",
+"value" : "compile,provided,runtime,system"
+ },
+ {
+"name" : "cdx:reproducible",
+"value" : "enabled"
+ }
+]
+ },
+ "components" : [
+{
+ "publisher" : "The Apache Software Foundation",
+ "group" : "org.apache.camel.quarkus",
+ "name" : "camel-quarkus-poms",
+ "version" : "3.8.1",
+ "description" : "Apache Camel extensions for Quarkus",
+ "licenses" : [
+{
+ "license" : {
+"id" : "Apache-2.0",
+"url" : "https://www.apache.org/licenses/LICENSE-2.0;
+ }
+}
+ ],
+ "purl" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.8.1?type=pom",
+ "externalReferences" : [
+{
+ "type" : "website",
+ "url" : "http://camel.apache.org/camel-quarkus-poms;
+},
+{
+ "type" : "distribution",
+ "url" :
"https://repository.apache.org/service/local/staging/deploy/maven2;
+},
+{
+ "type" : "issue-tracker",
+ "url" : "https://github.com/apache/camel-quarkus/issues;
+},
+{
+ "type" : "mailing-list",
+ "url" : "dev-subscr...@camel.apache.org"
+},
+{
+ "type" : "vcs",
+ "url" : "https://github.com/apache/camel-quarkus/camel-quarkus-poms;
+}
+ ],
+ "type" : "library",
+ "bom-ref" :
"pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.8.1?type=pom"
+},
+{
+
svn commit: r67969 [5/5] - /dev/camel/camel-quarkus/3.8.1/
Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.asc == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.asc (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.asc Fri Mar 15 21:48:11 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE6yNzJrQjDCjWD461r1rK8KHocpIFAmX0whEACgkQr1rK8KHo +cpJVKggAyRWlWO4gmekfbxihUbeG2zLxuvzue1x6LF33Pll/NnvyL9okr8TSbsHr +jsrrcrrq68GWAjLCIvJYh10Ef0mZsZDI1it2FYvS52IGNQbO0KKYR1ROgFWyREoZ +ASyMLRzaVUJt6QvuxflMxtWbi1Gi0OP5fUPT3d7e1KDgy/L4PMmdJLkwfApfatkV +DW9QP5YUZy6MeRKBaF2AxGW7zH8bEM014buqD85pL1qL4BSsWiD8E3XgXOMC1LZd +6rB7p8J5YmtXdMalprwfJ0mN8UmHvlrh3O/oi1KO8yXGcKf9BQfo7Uo8CkwWWPwZ +0MF+Etbr1mz/GsGpzpRBT+EiMU39yQ== +=X+r8 +-END PGP SIGNATURE- Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.sha512 == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.sha512 (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.sha512 Fri Mar 15 21:48:11 2024 @@ -0,0 +1 @@ +7d19bbcf4f435e06e01942f8062a1668da8573378a2634ffdc481cf40b17b5f0618e2a21a90d0768c86b524c5a4e14107a47d63256d3d9a5335cc7129fd91a67 *apache-camel-quarkus-3.8.1-sbom.xml Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip -- svn:mime-type = application/octet-stream Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.asc == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.asc (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.asc Fri Mar 15 21:48:11 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE6yNzJrQjDCjWD461r1rK8KHocpIFAmX0whEACgkQr1rK8KHo +cpK4Hgf/dxsZ/rfzxnevP8Z+CjAv+BPsTXuI/wHke/FT2ehQpOf1lVzXdwSvVnar +b+QNadPS9tesNFp1ilsVw8PTkzXAPVIcjMcjcRmxUQPlaDiHOT4dNlLrpZwNYLmd +9Jt64fSky757bIohAPmOhWlcaEsNOZKPRR7debr/8RrBceCyYZd7+F84XOE9yFNE +My1FI2BuA/Qr4r+XWEGbwyIX1o3Tc0bHzbhuw+VGx26Rp4OkyUd/oB9xQrRFOo/L +ytgRoDGsiQue9r34OcOOauLn/VvaXeRPFXVD4dPy5ISQRpk03T3oYeVPYQ4ykgxT +4emYLu6aWYF/Qe+5+03eRQJJTn0M/g== +=jCJr +-END PGP SIGNATURE- Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.sha512 == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.sha512 (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.sha512 Fri Mar 15 21:48:11 2024 @@ -0,0 +1 @@ +8330603f1c8badd5fed3437d1d6292469042a7c687187f092ab13bf51df369ce946be9f76fa438972899a8a1275ed0e6dbbf965fdc978e1a003e2e4e1b3b815c *apache-camel-quarkus-3.8.1-src.zip
svn commit: r67969 [4/5] - /dev/camel/camel-quarkus/3.8.1/
Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml Fri Mar 15 21:48:11 2024 @@ -0,0 +1,92082 @@ + +http://cyclonedx.org/schema/bom/1.4;> + + + +OWASP Foundation +CycloneDX Maven plugin +2.7.11 + + a70e8b649ab4a2bb7922d360173c8237 + 4c3c0878c15561639076e5be7a48ffcd6111c5ee + 70997d52dbffd4e797c467b2062c6ba9b8b5a7380ff2884779f2743b6172ebb5 + bc1ce91190c642f68fd3571939d7668def3b879ec8e5a87a213a9710a106e0290f60f9e0414593d19cca958c4fcb5d4450bd2793bcd609948419c8a2a6a7f5c8 + 3c8421bdafd1754fb424f16dccc83bfe0827648c1cadfffc98bdf1c7da65475dfe48d2f4b16d233bb8819e155ba6a4f3 + ad88cf6a0e0a5d51df49a4dab5530a28de9df7eec8460c045dff3e1f9316b82a244a125d52b937fe9d4ee72e44f5d01a + b4d9c3ef07c34517fd9f33178ba95ffc9618eb84a3671e71b0c82991ec3717e5 + 935b43aba8999dc7d95d93288a251c97b6b32852841b7bef31516c27c8d65c8de7f8411f1829f765ee760f25930c766db6a49df68e5994e18721c0a71f606f1e + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus + 3.8.1 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus@3.8.1?type=pom + http://camel.apache.orghttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus + + + makeAggregateBom + compile,provided,runtime,system + enabled + + + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-poms + 3.8.1 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-poms@3.8.1?type=pom + http://camel.apache.org/camel-quarkus-pomshttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom + 3.8.1 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom@3.8.1?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bomhttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-bom-test + 3.8.1 + Apache Camel extensions for Quarkus + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-bom-test@3.8.1?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-bom-testhttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-bom-test + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent + 3.8.1 + Maven plugins configuration + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent@3.8.1?type=pom + http://camel.apache.org/camel-quarkus-poms/camel-quarkus-build-parenthttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-quarkus/issuesdev-subscr...@camel.apache.orghttps://github.com/apache/camel-quarkus/camel-quarkus-poms/camel-quarkus-build-parent + + + The Apache Software Foundation + org.apache.camel.quarkus + camel-quarkus-build-parent-it + 3.8.1 + Maven plugins configuration for Integration Tests + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.quarkus/camel-quarkus-build-parent-it@3.8.1?type=pom +
svn commit: r67969 [1/5] - /dev/camel/camel-quarkus/3.8.1/
Author: jamesnetherton Date: Fri Mar 15 21:48:11 2024 New Revision: 67969 Log: Import camel-quarkus release Added: dev/camel/camel-quarkus/3.8.1/ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.asc dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.sha512 dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.asc dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.xml.sha512 dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip (with props) dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.asc dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-src.zip.sha512
svn commit: r67969 [3/5] - /dev/camel/camel-quarkus/3.8.1/
Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.asc == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.asc (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.asc Fri Mar 15 21:48:11 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE6yNzJrQjDCjWD461r1rK8KHocpIFAmX0whAACgkQr1rK8KHo +cpJrpwf9FPCUAn6EO0Njhsr2aOerhhmIa3RcxcjabIo/jbYyIDUt1Hh1HGrQjCOm +cwas35eI7ICwkMCKlqD9SYQM+DveHJHIEIY+qwNjjNURPg0ZtBEYFbJhAOrYLBa2 +wni1DoBZFBymIcvLWZyWBU+fC7sKvoysKnUaTqMcbuIPEzPKQRv8o8oWBjTVuOc8 +dARztN92jEjJ5IiSugCoGzClyS2GQA8wuxd8sw2VyQXsq9xIWLCeJZwmCrOlDys/ +iage/awzKm8FPGNL6dsZb+peTBuNsxE3WKXQHltjYeccgXcZDr9Gm2EST6EDmYjW +PDOYj5qMl7I/u5IIOs514v/kqsrRqw== +=in33 +-END PGP SIGNATURE- Added: dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.sha512 == --- dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.sha512 (added) +++ dev/camel/camel-quarkus/3.8.1/apache-camel-quarkus-3.8.1-sbom.json.sha512 Fri Mar 15 21:48:11 2024 @@ -0,0 +1 @@ +b3b8315ae685ebb3aeb69ce810d6e72c7e6c829049785b12f0d3dfd6909767f697380a04e0ba7ba1158f05c3f50b72a04b4ad4b981a3613000f4d908733953c6 *apache-camel-quarkus-3.8.1-sbom.json
(camel-quarkus) annotated tag 3.8.1 created (now 53ab687415)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to annotated tag 3.8.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 53ab687415 (tag) tagging 900169f932afd59b4ef7a86b9f5a6310ebac8578 (commit) replaces 3.8.0 by James Netherton on Fri Mar 15 20:27:34 2024 + - Log - [maven-release-plugin] copy for tag 3.8.1 --- No new revisions were added by this update.
(camel-quarkus) 01/02: Upgrade Quarkus to 3.8.3
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit db2edc6f36d395a0ed79a28b2219286b0613cf5c
Author: James Netherton
AuthorDate: Fri Mar 15 18:36:23 2024 +
Upgrade Quarkus to 3.8.3
---
docs/antora.yml | 4 ++--
extensions/js-dsl/runtime/pom.xml | 14 --
pom.xml | 4 ++--
poms/bom/pom.xml| 8 +++-
poms/bom/src/main/generated/flattened-full-pom.xml | 17 ++---
poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 --
.../main/generated/flattened-reduced-verbose-pom.xml| 10 --
7 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 8332a4affe..0aa353fa86 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -28,8 +28,8 @@ asciidoc:
camel-version: 4.4.1 # replace ${camel.version}
camel-docs-version: 4.4.x
camel-quarkus-version: 3.8.1 # replace ${camel-quarkus.version}
-quarkus-version: 3.8.2 # replace ${quarkus.version}
-graalvm-version: 23.0.1 # replace ${graalvm.version}
+quarkus-version: 3.8.3 # replace ${quarkus.version}
+graalvm-version: 23.1.2 # replace ${graalvm.version}
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/extensions/js-dsl/runtime/pom.xml
b/extensions/js-dsl/runtime/pom.xml
index 9744f73c78..d26badad9b 100644
--- a/extensions/js-dsl/runtime/pom.xml
+++ b/extensions/js-dsl/runtime/pom.xml
@@ -46,6 +46,10 @@
org.apache.camel
camel-js-dsl
+
+org.graalvm.js
+js-language
+
@@ -53,16 +57,6 @@
io.quarkus
quarkus-extension-maven-plugin
-
-
-
org.graalvm.sdk:graal-sdk
-
org.graalvm.nativeimage:svm
-
org.graalvm.truffle:truffle-api
-
org.graalvm.js:js
-
org.graalvm.regex:regex
-
com.ibm.icu:icu4j
-
-
org.apache.maven.plugins
diff --git a/pom.xml b/pom.xml
index cb3bd3fb16..d5db42bc6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
2.2.1
2.3.0
2.0.2
-3.8.2
+3.8.3
4.0.0
2.6.0
@@ -100,7 +100,7 @@
0.212.0
1.126.2
1.126.2
-23.0.1
+23.1.2
jdk21
4.0.18
1.59.1
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 4139d85e60..e0bbc0afee 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1611,6 +1611,12 @@
org.apache.camel
camel-js-dsl
${camel.version}
+
+
+org.graalvm.js
+js
+
+
org.apache.camel
@@ -6768,7 +6774,7 @@
org.graalvm.js
-js
+js-language
${graalvm.version}
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 48f3bada5e..784627e966 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1549,6 +1549,12 @@
org.apache.camel
camel-js-dsl
4.4.1
+
+
+org.graalvm.js
+js
+
+
org.apache.camel
@@ -6691,13 +6697,13 @@
org.graalvm.js
-js
-23.0.1
+js-language
+23.1.2
org.graalvm.js
js-scriptengine
-23.0.1
+23.1.2
org.influxdb
@@ -19852,6 +19858,11 @@
txw2
4.0.4
+
+org.graalvm.js
+js
+23.0.1
+
org.graalvm.sdk
graal-sdk
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 891c513a39..f35be6dfcc 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1549,6 +1549,12 @@
org.apache.camel
camel-js-dsl
4.4.1
+
+
+org.graalvm.js
+js
+
+
(camel-quarkus) branch 3.8.x updated (f63c707b36 -> 9d6c0f23a0)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from f63c707b36 jt400: extend test coverage new db2edc6f36 Upgrade Quarkus to 3.8.3 new 9d6c0f23a0 Switch from org.graalvm.sdk:graal-sdk to org.graalvm.sdk:nativeimage 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: docs/antora.yml | 4 ++-- extensions-core/core/runtime/pom.xml| 2 +- extensions-support/aws2/runtime/pom.xml | 2 +- extensions-support/azure-core/runtime/pom.xml | 2 +- extensions-support/consul-client/runtime/pom.xml| 2 +- extensions-support/debezium/runtime/pom.xml | 2 +- extensions-support/google-cloud/runtime/pom.xml | 2 +- extensions-support/httpclient/runtime/pom.xml | 2 +- extensions-support/retrofit/runtime/pom.xml | 2 +- extensions-support/spring/runtime/pom.xml | 2 +- extensions-support/swagger/runtime/pom.xml | 2 +- extensions-support/xalan/runtime/pom.xml| 2 +- extensions/activemq/runtime/pom.xml | 2 +- extensions/bean-validator/runtime/pom.xml | 2 +- extensions/bean/runtime/pom.xml | 2 +- extensions/disruptor/runtime/pom.xml| 2 +- extensions/fhir/runtime/pom.xml | 2 +- extensions/file-watch/runtime/pom.xml | 2 +- extensions/fop/runtime/pom.xml | 2 +- extensions/google-pubsub/runtime/pom.xml| 2 +- extensions/grpc/runtime/pom.xml | 2 +- extensions/hazelcast/runtime/pom.xml| 2 +- extensions/ical/runtime/pom.xml | 2 +- extensions/jasypt/runtime/pom.xml | 2 +- extensions/java-joor-dsl/runtime/pom.xml| 2 +- extensions/jolt/runtime/pom.xml | 2 +- extensions/jpa/runtime/pom.xml | 2 +- extensions/js-dsl/runtime/pom.xml | 14 -- extensions/jsh-dsl/runtime/pom.xml | 2 +- extensions/json-validator/runtime/pom.xml | 2 +- extensions/jsonpath/runtime/pom.xml | 2 +- extensions/jt400/runtime/pom.xml| 2 +- extensions/kotlin-dsl/runtime/pom.xml | 2 +- extensions/kudu/runtime/pom.xml | 2 +- extensions/nats/runtime/pom.xml | 2 +- extensions/netty/runtime/pom.xml| 2 +- extensions/nitrite/runtime/pom.xml | 2 +- extensions/olingo4/runtime/pom.xml | 2 +- extensions/openstack/runtime/pom.xml| 2 +- extensions/paho/runtime/pom.xml | 2 +- extensions/quartz/runtime/pom.xml | 2 +- extensions/rest-openapi/runtime/pom.xml | 2 +- extensions/rest/runtime/pom.xml | 2 +- extensions/servicenow/runtime/pom.xml | 2 +- extensions/shiro/runtime/pom.xml| 2 +- extensions/slack/runtime/pom.xml| 2 +- extensions/spring-rabbitmq/runtime/pom.xml | 2 +- extensions/ssh/runtime/pom.xml | 2 +- extensions/xchange/runtime/pom.xml | 2 +- extensions/xslt/deployment/pom.xml | 2 +- pom.xml | 4 ++-- poms/bom/pom.xml| 8 +++- poms/bom/src/main/generated/flattened-full-pom.xml | 17 ++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 -- .../main/generated/flattened-reduced-verbose-pom.xml| 10 -- 55 files changed, 93 insertions(+), 70 deletions(-)
(camel-quarkus) 02/02: Switch from org.graalvm.sdk:graal-sdk to org.graalvm.sdk:nativeimage
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9d6c0f23a0e7c51b50d8bd50d7df307d72f1ead9 Author: James Netherton AuthorDate: Fri Mar 15 18:36:56 2024 + Switch from org.graalvm.sdk:graal-sdk to org.graalvm.sdk:nativeimage --- extensions-core/core/runtime/pom.xml | 2 +- extensions-support/aws2/runtime/pom.xml | 2 +- extensions-support/azure-core/runtime/pom.xml| 2 +- extensions-support/consul-client/runtime/pom.xml | 2 +- extensions-support/debezium/runtime/pom.xml | 2 +- extensions-support/google-cloud/runtime/pom.xml | 2 +- extensions-support/httpclient/runtime/pom.xml| 2 +- extensions-support/retrofit/runtime/pom.xml | 2 +- extensions-support/spring/runtime/pom.xml| 2 +- extensions-support/swagger/runtime/pom.xml | 2 +- extensions-support/xalan/runtime/pom.xml | 2 +- extensions/activemq/runtime/pom.xml | 2 +- extensions/bean-validator/runtime/pom.xml| 2 +- extensions/bean/runtime/pom.xml | 2 +- extensions/disruptor/runtime/pom.xml | 2 +- extensions/fhir/runtime/pom.xml | 2 +- extensions/file-watch/runtime/pom.xml| 2 +- extensions/fop/runtime/pom.xml | 2 +- extensions/google-pubsub/runtime/pom.xml | 2 +- extensions/grpc/runtime/pom.xml | 2 +- extensions/hazelcast/runtime/pom.xml | 2 +- extensions/ical/runtime/pom.xml | 2 +- extensions/jasypt/runtime/pom.xml| 2 +- extensions/java-joor-dsl/runtime/pom.xml | 2 +- extensions/jolt/runtime/pom.xml | 2 +- extensions/jpa/runtime/pom.xml | 2 +- extensions/jsh-dsl/runtime/pom.xml | 2 +- extensions/json-validator/runtime/pom.xml| 2 +- extensions/jsonpath/runtime/pom.xml | 2 +- extensions/jt400/runtime/pom.xml | 2 +- extensions/kotlin-dsl/runtime/pom.xml| 2 +- extensions/kudu/runtime/pom.xml | 2 +- extensions/nats/runtime/pom.xml | 2 +- extensions/netty/runtime/pom.xml | 2 +- extensions/nitrite/runtime/pom.xml | 2 +- extensions/olingo4/runtime/pom.xml | 2 +- extensions/openstack/runtime/pom.xml | 2 +- extensions/paho/runtime/pom.xml | 2 +- extensions/quartz/runtime/pom.xml| 2 +- extensions/rest-openapi/runtime/pom.xml | 2 +- extensions/rest/runtime/pom.xml | 2 +- extensions/servicenow/runtime/pom.xml| 2 +- extensions/shiro/runtime/pom.xml | 2 +- extensions/slack/runtime/pom.xml | 2 +- extensions/spring-rabbitmq/runtime/pom.xml | 2 +- extensions/ssh/runtime/pom.xml | 2 +- extensions/xchange/runtime/pom.xml | 2 +- extensions/xslt/deployment/pom.xml | 2 +- pom.xml | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/extensions-core/core/runtime/pom.xml b/extensions-core/core/runtime/pom.xml index d55aa94d00..4b5a4bd438 100644 --- a/extensions-core/core/runtime/pom.xml +++ b/extensions-core/core/runtime/pom.xml @@ -91,7 +91,7 @@ org.graalvm.sdk -graal-sdk +nativeimage provided diff --git a/extensions-support/aws2/runtime/pom.xml b/extensions-support/aws2/runtime/pom.xml index 041c6a73bc..7defbe27c5 100644 --- a/extensions-support/aws2/runtime/pom.xml +++ b/extensions-support/aws2/runtime/pom.xml @@ -66,7 +66,7 @@ org.graalvm.sdk -graal-sdk +nativeimage provided diff --git a/extensions-support/azure-core/runtime/pom.xml b/extensions-support/azure-core/runtime/pom.xml index 2ff07da563..849d4d2b8c 100644 --- a/extensions-support/azure-core/runtime/pom.xml +++ b/extensions-support/azure-core/runtime/pom.xml @@ -75,7 +75,7 @@ org.graalvm.sdk -graal-sdk +nativeimage provided diff --git a/extensions-support/consul-client/runtime/pom.xml b/extensions-support/consul-client/runtime/pom.xml index 0918b31935..8535f4d8d3 100644 --- a/extensions-support/consul-client/runtime/pom.xml +++ b/extensions-support/consul-client/runtime/pom.xml @@ -43,7 +43,7 @@ org.graalvm.sdk -graal-sdk +nativeimage provided diff --git a/extensions-support/debezium/runtime/pom.xml b/extensions-support/debezium/runtime/pom.xml index 6fe7cc11de..ffd60cd872 100644 --- a/extensions-support/debezium/runtime/pom.xml +++
Re: [PR] [3.8.x] Upgrade Quarkus to 3.8.3 [camel-quarkus]
jamesnetherton merged PR #5885: URL: https://github.com/apache/camel-quarkus/pull/5885 -- 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] [3.8.x] Upgrade Quarkus to 3.8.3 [camel-quarkus]
jamesnetherton opened a new pull request, #5885: URL: https://github.com/apache/camel-quarkus/pull/5885 (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-k) 01/01: Fix wrong Kamelet sample content
This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch claudio4j-patch-2 in repository https://gitbox.apache.org/repos/asf/camel-k.git commit bc4267d1986abc1b63d1af8c98f294ca3f69b946 Author: Claudio Miranda AuthorDate: Fri Mar 15 15:31:32 2024 -0300 Fix wrong Kamelet sample content --- .../samples/bases/camel_v1alpha1_kamelet.yaml | 37 ++ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml b/pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml index 83cc20975..b44a4ea45 100644 --- a/pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml +++ b/pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml @@ -18,18 +18,29 @@ apiVersion: camel.apache.org/v1alpha1 kind: Kamelet metadata: - name: timer-to-log-example + name: example-source spec: - source: -ref: - apiVersion: camel.apache.org/v1alpha1 - kind: Kamelet - name: timer-source + definition: +description: Produces periodic events with a custom payload properties: - period: 2000 - message: Hello world - sink: -ref: - apiVersion: camel.apache.org/v1alpha1 - kind: Kamelet - name: log-sink + message: +description: The message to generate +title: Message +type: string + period: +default: 1000 +description: The time interval between two events +title: Period +type: integer +required: +- message +title: Example Timer + template: +from: + uri: timer:tick + parameters: +period: "#property:period" + steps: + - setBody: + constant: "#property:message" + - to: kamelet:sink
[PR] Fix wrong Kamelet sample content [camel-k]
claudio4j opened a new pull request, #5255: URL: https://github.com/apache/camel-k/pull/5255 **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
(camel-k) branch claudio4j-patch-2 created (now bc4267d19)
This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a change to branch claudio4j-patch-2 in repository https://gitbox.apache.org/repos/asf/camel-k.git at bc4267d19 Fix wrong Kamelet sample content This branch includes the following new commits: new bc4267d19 Fix wrong Kamelet sample content The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Re: [PR] Avoid rest routes dupes [camel]
github-actions[bot] commented on PR #13509: URL: https://github.com/apache/camel/pull/13509#issuecomment-289925 :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] Avoid rest routes dupes [camel]
Croway opened a new pull request, #13509: URL: https://github.com/apache/camel/pull/13509 In the case of a Camel Spring Boot application that defines rest routes in camel-xml-io-dsl, rest routes in java dsl, and rest routes spring beans xml, the rest routes are loaded twice in the context and the application cannot start. I noticed that rests defined in camel-xml-io-dsl and java route configuration are loaded first, together, without issues, but when the rests defined in the spring beans xml are loaded into the camel context, the getContext().getRestDefinitions() contains both the rests defined in the spring beans xml and the rests defined via java or camel-xml, this is why they are loaded twice, getRests() contains only rests defined in the beans xml dsl. I'm opening the PR in draft, I'd like to execute more tests. -- 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-20565 - Azure servicebus dead-lettering [camel]
oscerd commented on PR #13507: URL: https://github.com/apache/camel/pull/13507#issuecomment-237557 It is not looping, it is just that you need to run a full build to regenerate the metadata of Azure Service bus component. So you should run mvn clean install -DskipTests from the root folder of the project and update the PR with a new commit. -- 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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on PR #13507: URL: https://github.com/apache/camel/pull/13507#issuecomment-234760 just a question, it seams that the PR build is looping, is it normal -- 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(trait): move runtime logic into trait catalog [camel-k]
claudio4j commented on PR #5251: URL: https://github.com/apache/camel-k/pull/5251#issuecomment-230671 This is an interesting approach as it offloads the properties to the catalog provider. -- 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(trait): move runtime logic into trait catalog [camel-k]
claudio4j commented on code in PR #5251:
URL: https://github.com/apache/camel-k/pull/5251#discussion_r1526542556
##
pkg/trait/logging.go:
##
@@ -61,7 +61,15 @@ func (l loggingTrait) Configure(e *Environment) (bool,
*TraitCondition, error) {
}
func (l loggingTrait) Apply(e *Environment) error {
- envvar.SetVal(, envVarQuarkusLogLevel, l.Level)
+ if loggingCap, ok := e.CamelCatalog.Runtime.Capabilities["logging"]; ok
{
+ if e.ApplicationProperties == nil {
+ e.ApplicationProperties = make(map[string]string)
+ }
+ e.ApplicationProperties[loggingCap.Properties["level"]] =
l.Level
Review Comment:
the properties in capabilities may be an array, so in the trait code it just
iterates over the key/values. So, there is no need to set individual property
keys.
--
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-20512] Add full path for camel jbang process if using Windows [camel]
ammachado commented on PR #13494: URL: https://github.com/apache/camel/pull/13494#issuecomment-154808 `camel log` and `camel trace` are not starting processes, they're reading output files from running processes. -- 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: Add Kamelet v1alpha1 sample (#5254)
This is an automated email from the ASF dual-hosted git repository. claudio4j 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 546efa566 Add Kamelet v1alpha1 sample (#5254) 546efa566 is described below commit 546efa56610ef892046dab76b5a60d2246004363 Author: Claudio Miranda AuthorDate: Fri Mar 15 12:48:39 2024 -0300 Add Kamelet v1alpha1 sample (#5254) --- .../camel_v1alpha1_kamelet.yaml} | 36 +++--- pkg/resources/config/samples/kustomization.yaml| 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pkg/resources/config/samples/kustomization.yaml b/pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml similarity index 63% copy from pkg/resources/config/samples/kustomization.yaml copy to pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml index e973532e2..83cc20975 100644 --- a/pkg/resources/config/samples/kustomization.yaml +++ b/pkg/resources/config/samples/bases/camel_v1alpha1_kamelet.yaml @@ -15,21 +15,21 @@ # limitations under the License. # --- -# -# * patches/integration-platform-patch.yaml -# customizes the integration platform custom resource -# Edit the patch manually to add required configuration -# -resources: -- bases/camel_v1_integrationplatform.yaml -- bases/camel_v1_integrationprofile.yaml -- bases/camel_v1_integration.yaml -- bases/camel_v1_integrationkit.yaml -- bases/camel_v1_camelcatalog.yaml -- bases/camel_v1_build.yaml -- bases/camel_v1_kamelet.yaml -- bases/camel_v1_pipe.yaml -- bases/camel_v1alpha1_kameletbinding.yaml - -patchesStrategicMerge: -- patch-integration-platform.yaml +apiVersion: camel.apache.org/v1alpha1 +kind: Kamelet +metadata: + name: timer-to-log-example +spec: + source: +ref: + apiVersion: camel.apache.org/v1alpha1 + kind: Kamelet + name: timer-source +properties: + period: 2000 + message: Hello world + sink: +ref: + apiVersion: camel.apache.org/v1alpha1 + kind: Kamelet + name: log-sink diff --git a/pkg/resources/config/samples/kustomization.yaml b/pkg/resources/config/samples/kustomization.yaml index e973532e2..cda69fdad 100644 --- a/pkg/resources/config/samples/kustomization.yaml +++ b/pkg/resources/config/samples/kustomization.yaml @@ -29,6 +29,7 @@ resources: - bases/camel_v1_build.yaml - bases/camel_v1_kamelet.yaml - bases/camel_v1_pipe.yaml +- bases/camel_v1alpha1_kamelet.yaml - bases/camel_v1alpha1_kameletbinding.yaml patchesStrategicMerge:
Re: [PR] Add Kamelet v1alpha1 sample [camel-k]
claudio4j merged PR #5254: URL: https://github.com/apache/camel-k/pull/5254 -- 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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526486276
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
it's pushed
--
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] jt400: extend test coverage [camel-quarkus]
jamesnetherton merged PR #5884: URL: https://github.com/apache/camel-quarkus/pull/5884 -- 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.8.x updated: jt400: extend test coverage
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new f63c707b36 jt400: extend test coverage
f63c707b36 is described below
commit f63c707b36c2dfc77e78683da073cfc01c031f24
Author: JiriOndrusek
AuthorDate: Wed Mar 13 13:54:41 2024 +0100
jt400: extend test coverage
---
integration-tests/jt400/README.adoc| 104 +++
.../quarkus/component/jt400/it/Jt400Resource.java | 194 -
.../Jt400MockProducers.java} | 4 +-
.../Jt400MockResource.java}| 8 +-
.../it/{ => mock}/MockAS400ConnectionPool.java | 2 +-
.../src/main/resources/application.properties | 14 +-
.../quarkus/component/jt400/it/Jt400MockTest.java | 57 +++---
.../quarkus/component/jt400/it/Jt400Test.java | 135 ++
8 files changed, 400 insertions(+), 118 deletions(-)
diff --git a/integration-tests/jt400/README.adoc
b/integration-tests/jt400/README.adoc
new file mode 100644
index 00..b515bd9699
--- /dev/null
+++ b/integration-tests/jt400/README.adoc
@@ -0,0 +1,104 @@
+=== External IBM i
+
+
+To execute the tests against an external IBM i server, provide the connection
information by setting environment variables
+
+```
+export JT400_URL=#jdbc_url
+export JT400_USERNAME=#username
+export JT400_PASSWORD=#password
+```
+
+or for Windows:
+
+```
+$Env:JT400_URL = "#jdbc_url"
+$Env:JT400_USERNAME="#username"
+$Env:JT400_PASSWORD="#password"
+```
+
+Tests using an external server are disabled until environmental property
`JT400_URL` is present.
+
+=== Mocked test
+
+Mocked tests are enabled by default.
+Unfortunately in case that mocked tests are enabled, the flat class path is
forced for the Quarkus, which may influence
+the tests.
+
+Execution of mocked tests can be skipped by activating profile
`skip-mock-tests`.
+
+=== How to configure an external server
+
+Several objects (queues, user spaces, ..) have to be created in the external
server to make testing successful.
+
+The suggested approach is to create a test library. In the following text, the
test library's name is `REDHAT5`
+
+Download i-access client solutions from this
https://www.ibm.com/support/pages/ibm-i-access-client-solutions[page].
+Use the 5250 emulator option from the client and run the following command for
library creation:
+
+```
+CRTLIB REDHAT5
+```
+
+ Program call testing
+
+Program call test reads the content of user space.
+
+```
+//interface for multiline commands
+CALL QCMD
+
+//creation of PROGCALL user space
+CALL PGM(QSYS/QUSCRTUS) PARM(('PROGCALL REDHAT5 ' (*CHAR 20))
+('TEST ' (*CHAR 10)) (16 (*INT 4))
+(' ' (*CHAR 1)) ('*ALL ' (*CHAR 10))
+('' (*CHAR 16)))
+
+//value is set to hello camel
+CALL PGM(QSYS/QUSCHGUS) PARM(('PROGCALL REDHAT5 ' (*CHAR 20))
+(1 (*INT 4)) (16 (*INT 4))
+('hello camel ' (*CHAR 16))
+('1' (*CHAR 1)) )
+```
+
+ Message queue testing
+
+Message queue can be created by following the command
+
+```
+CRTMSGQ REDHAT5/TESTMSGQ
+```
+
+ Data queue testing
+
+Two data-queues are required for the testing. One created as `keyed=true` and
one as `LIFO`.
+
+```
+//keyed data queue
+CRTDTAQ DTAQ(REDHAT5/TESTKEYED) SEQ(*KEYED) KEYLEN(20) MAXLEN(100)
+
+//LIFO data queue
+CRTDTAQ DTAQ(REDHAT5/TESTLIFO) SEQ(*LIFO) MAXLEN(100)
+```
+
+ Using different object names
+
+If your test object names are different from the default ones, you can
override default values via environmental variable
+
+```
+export JT400_LIBRARY=#library_if_not_REDHA5
+export JT400_LIFO_QUEUE=#lifoqueue_if_not_TESTLIFO.DTAQ
+export JT400_KEYED_QUEUE=#lkeyedqueue_if_not_TESTKEYED.DTAQ
+export JT400_MESSAGE_QUEUE=#messagequeue_if_not_TESTMSGQ.MSGQ
+export JT400_USER_SPACE=#userspace_if_not_PROGCALL
+```
+
+or for Windows:
+
+```
+$Env:JT400_LIBRARY = "#library_if_not_REDHA5"
+$Env:JT400_LIFO_QUEUE="#lifoqueue_if_not_TESTLIFO.DTAQe"
+$Env:JT400_KEYED_QUEUE="#lkeyedqueue_if_not_TESTKEYED.DTAQ"
+$Env:JT400_MESSAGE_QUEUE="#messagequeue_if_not_TESTMSGQ.MSGQe"
+$Env:JT400_USER_SPACE="#userspace_if_not_PROGCALL"
+```
\ No newline at end of file
diff --git
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
index fd65e7950a..b861f8a78f 100644
---
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
+++
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
@@ -16,48 +16,54 @@
*/
package org.apache.camel.quarkus.component.jt400.it;
+import java.nio.charset.Charset;
+import java.util.HashMap;
import
(camel-quarkus) branch main updated: jt400: extend test coverage
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 2228dcd62d jt400: extend test coverage
2228dcd62d is described below
commit 2228dcd62db27332c97693b92a284261212a447b
Author: JiriOndrusek
AuthorDate: Wed Mar 13 13:54:41 2024 +0100
jt400: extend test coverage
---
integration-tests/jt400/README.adoc| 104 +++
.../quarkus/component/jt400/it/Jt400Resource.java | 194 -
.../Jt400MockProducers.java} | 4 +-
.../Jt400MockResource.java}| 8 +-
.../it/{ => mock}/MockAS400ConnectionPool.java | 2 +-
.../src/main/resources/application.properties | 14 +-
.../quarkus/component/jt400/it/Jt400MockTest.java | 57 +++---
.../quarkus/component/jt400/it/Jt400Test.java | 135 ++
8 files changed, 400 insertions(+), 118 deletions(-)
diff --git a/integration-tests/jt400/README.adoc
b/integration-tests/jt400/README.adoc
new file mode 100644
index 00..b515bd9699
--- /dev/null
+++ b/integration-tests/jt400/README.adoc
@@ -0,0 +1,104 @@
+=== External IBM i
+
+
+To execute the tests against an external IBM i server, provide the connection
information by setting environment variables
+
+```
+export JT400_URL=#jdbc_url
+export JT400_USERNAME=#username
+export JT400_PASSWORD=#password
+```
+
+or for Windows:
+
+```
+$Env:JT400_URL = "#jdbc_url"
+$Env:JT400_USERNAME="#username"
+$Env:JT400_PASSWORD="#password"
+```
+
+Tests using an external server are disabled until environmental property
`JT400_URL` is present.
+
+=== Mocked test
+
+Mocked tests are enabled by default.
+Unfortunately in case that mocked tests are enabled, the flat class path is
forced for the Quarkus, which may influence
+the tests.
+
+Execution of mocked tests can be skipped by activating profile
`skip-mock-tests`.
+
+=== How to configure an external server
+
+Several objects (queues, user spaces, ..) have to be created in the external
server to make testing successful.
+
+The suggested approach is to create a test library. In the following text, the
test library's name is `REDHAT5`
+
+Download i-access client solutions from this
https://www.ibm.com/support/pages/ibm-i-access-client-solutions[page].
+Use the 5250 emulator option from the client and run the following command for
library creation:
+
+```
+CRTLIB REDHAT5
+```
+
+ Program call testing
+
+Program call test reads the content of user space.
+
+```
+//interface for multiline commands
+CALL QCMD
+
+//creation of PROGCALL user space
+CALL PGM(QSYS/QUSCRTUS) PARM(('PROGCALL REDHAT5 ' (*CHAR 20))
+('TEST ' (*CHAR 10)) (16 (*INT 4))
+(' ' (*CHAR 1)) ('*ALL ' (*CHAR 10))
+('' (*CHAR 16)))
+
+//value is set to hello camel
+CALL PGM(QSYS/QUSCHGUS) PARM(('PROGCALL REDHAT5 ' (*CHAR 20))
+(1 (*INT 4)) (16 (*INT 4))
+('hello camel ' (*CHAR 16))
+('1' (*CHAR 1)) )
+```
+
+ Message queue testing
+
+Message queue can be created by following the command
+
+```
+CRTMSGQ REDHAT5/TESTMSGQ
+```
+
+ Data queue testing
+
+Two data-queues are required for the testing. One created as `keyed=true` and
one as `LIFO`.
+
+```
+//keyed data queue
+CRTDTAQ DTAQ(REDHAT5/TESTKEYED) SEQ(*KEYED) KEYLEN(20) MAXLEN(100)
+
+//LIFO data queue
+CRTDTAQ DTAQ(REDHAT5/TESTLIFO) SEQ(*LIFO) MAXLEN(100)
+```
+
+ Using different object names
+
+If your test object names are different from the default ones, you can
override default values via environmental variable
+
+```
+export JT400_LIBRARY=#library_if_not_REDHA5
+export JT400_LIFO_QUEUE=#lifoqueue_if_not_TESTLIFO.DTAQ
+export JT400_KEYED_QUEUE=#lkeyedqueue_if_not_TESTKEYED.DTAQ
+export JT400_MESSAGE_QUEUE=#messagequeue_if_not_TESTMSGQ.MSGQ
+export JT400_USER_SPACE=#userspace_if_not_PROGCALL
+```
+
+or for Windows:
+
+```
+$Env:JT400_LIBRARY = "#library_if_not_REDHA5"
+$Env:JT400_LIFO_QUEUE="#lifoqueue_if_not_TESTLIFO.DTAQe"
+$Env:JT400_KEYED_QUEUE="#lkeyedqueue_if_not_TESTKEYED.DTAQ"
+$Env:JT400_MESSAGE_QUEUE="#messagequeue_if_not_TESTMSGQ.MSGQe"
+$Env:JT400_USER_SPACE="#userspace_if_not_PROGCALL"
+```
\ No newline at end of file
diff --git
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
index fd65e7950a..b861f8a78f 100644
---
a/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
+++
b/integration-tests/jt400/src/main/java/org/apache/camel/quarkus/component/jt400/it/Jt400Resource.java
@@ -16,48 +16,54 @@
*/
package org.apache.camel.quarkus.component.jt400.it;
+import java.nio.charset.Charset;
+import java.util.HashMap;
import
Re: [I] jt400: extend test coverage [camel-quarkus]
jamesnetherton closed issue #5859: jt400: extend test coverage URL: https://github.com/apache/camel-quarkus/issues/5859 -- 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] jt400: extend test coverage [camel-quarkus]
jamesnetherton merged PR #5883: URL: https://github.com/apache/camel-quarkus/pull/5883 -- 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-karavan) branch main updated: trace issue
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 0bc9c920 trace issue
0bc9c920 is described below
commit 0bc9c9203ae9ba39d4d1fb98da09d36d79580958
Author: Marat Gubaidullin
AuthorDate: Fri Mar 15 10:57:46 2024 -0400
trace issue
---
.../src/project/trace/RunnerInfoTraceMessage.tsx | 42 ++
.../src/main/webui/src/project/trace/trace.css | 1 +
2 files changed, 11 insertions(+), 32 deletions(-)
diff --git
a/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
b/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
index 1ddabfdc..1e699374 100644
--- a/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
+++ b/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
@@ -46,11 +46,12 @@ export function RunnerInfoTraceMessage (props: Props) {
const [tab, setTab] = useState('variables');
const [variableName, setVariableName] = useState();
-const type = props.trace?.message?.body?.type;
-const headers: any[] = [...props.trace?.message?.headers];
-const properties: any[] = [...props.trace?.message?.exchangeProperties];
-const variables: any[] = props.trace?.message?.exchangeVariables ?
[...props.trace?.message?.exchangeVariables] : [];
-const body = props.trace?.message?.body?.value;
+const message = props.trace?.message;
+const type = message?.body?.type;
+const headers: any[] = message?.headers ? [...message?.headers] : [];
+const properties: any[] = message?.exchangeProperties ?
[...message?.exchangeProperties] : [];
+const variables: any[] = message?.exchangeVariables ?
[...message?.exchangeVariables] : [];
+const body = message?.body?.value;
const variable = variables.filter(v => v.key === variableName)?.at(0);
function getBody() {
@@ -146,10 +147,10 @@ export function RunnerInfoTraceMessage (props: Props) {
{tab === 'variables' && variables.length > 0 &&
<>
- setVariableName(eventKey)}>
-{variables.map(v => ({v.key}}/>))}
-
-{getVariableType()}
+ setVariableName(eventKey)}>
+{variables.map(v => ({v.key}}/>))}
+
+{getVariableType()}
}
@@ -159,28 +160,5 @@ export function RunnerInfoTraceMessage (props: Props) {
{tab === 'properties' && getProperties()}
-//
-//
-//
-//
-//
-//
Headers
-//
-
-//
-//
Body
-//
-// {type}
-//
-//
-//
-//
-//
-//
-// {body}
-//
-//
-//
-//
);
}
diff --git a/karavan-app/src/main/webui/src/project/trace/trace.css
b/karavan-app/src/main/webui/src/project/trace/trace.css
index 401585ee..00ab2295 100644
--- a/karavan-app/src/main/webui/src/project/trace/trace.css
+++ b/karavan-app/src/main/webui/src/project/trace/trace.css
@@ -16,6 +16,7 @@
.trace-modal .container {
display: flex;
+flex-direction: row;
padding: 0;
flex: 1;
}
Re: [I] Operator is stuck in a "deploying" phase loop when internal deployment fails indefinitely [camel-k]
squakez commented on issue #5084: URL: https://github.com/apache/camel-k/issues/5084#issuecomment-1999841698 @realMartinez are you actively working on this? -- 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-karavan) branch main updated: Open Incorrect camel yaml
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 2dba88fb Open Incorrect camel yaml
2dba88fb is described below
commit 2dba88fb29ba364abaa58c091d0735d6140dd9dc
Author: Marat Gubaidullin
AuthorDate: Fri Mar 15 10:52:39 2024 -0400
Open Incorrect camel yaml
---
.../src/main/webui/src/editor/FileEditor.tsx | 17 +-
karavan-designer/public/example/demo.camel.yaml| 2 +
karavan-designer/src/designer/KaravanDesigner.tsx | 62 ++
karavan-space/src/designer/KaravanDesigner.tsx | 62 ++
4 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/karavan-app/src/main/webui/src/editor/FileEditor.tsx
b/karavan-app/src/main/webui/src/editor/FileEditor.tsx
index 2812d005..6dd240c3 100644
--- a/karavan-app/src/main/webui/src/editor/FileEditor.tsx
+++ b/karavan-app/src/main/webui/src/editor/FileEditor.tsx
@@ -21,6 +21,7 @@ import {shallow} from "zustand/shallow";
import {CamelDefinitionYaml} from "karavan-core/lib/api/CamelDefinitionYaml";
import {DesignerEditor} from "./DesignerEditor";
import {CodeEditor} from "./CodeEditor";
+import {EventBus} from "../designer/utils/EventBus";
interface Props {
projectId: string
@@ -36,7 +37,21 @@ export function FileEditor(props: Props) {
const [file] = useFileStore((s) => [s.file], shallow)
-const isCamelYaml = file !== undefined &&
file.name.endsWith(".camel.yaml");
+function yamlIsCamel(): boolean {
+if (file && file.name.endsWith(".camel.yaml")) {
+try {
+const i = CamelDefinitionYaml.yamlToIntegration(file.name,
file?.code);
+} catch (e: any) {
+console.log(e)
+EventBus.sendAlert(' ' + e?.name, '' + e?.message, 'danger');
+return false;
+}
+return true;
+}
+return false;
+}
+
+const isCamelYaml = yamlIsCamel();
const isKameletYaml = file !== undefined &&
file.name.endsWith(".kamelet.yaml");
const isIntegration = isCamelYaml && file?.code &&
CamelDefinitionYaml.yamlIsIntegration(file.code);
const showDesigner = (isCamelYaml && isIntegration) || isKameletYaml;
diff --git a/karavan-designer/public/example/demo.camel.yaml
b/karavan-designer/public/example/demo.camel.yaml
index b751e86b..facfc3d1 100644
--- a/karavan-designer/public/example/demo.camel.yaml
+++ b/karavan-designer/public/example/demo.camel.yaml
@@ -59,3 +59,5 @@
Beer battle: ${jq(variable:beer1,.name)}
(${variable.alc1}%) is weaker than
${jq(variable:beer2,.name)} (${variable.alc2}%)
+otherwise:
+ id: otherwise-03ac
\ No newline at end of file
diff --git a/karavan-designer/src/designer/KaravanDesigner.tsx
b/karavan-designer/src/designer/KaravanDesigner.tsx
index 8e49e054..36b65118 100644
--- a/karavan-designer/src/designer/KaravanDesigner.tsx
+++ b/karavan-designer/src/designer/KaravanDesigner.tsx
@@ -73,30 +73,35 @@ export function KaravanDesigner(props: Props) {
useEffect(() => {
const sub = EventBus.onIntegrationUpdate()?.subscribe((update:
IntegrationUpdate) =>
save(update.integration, update.propertyOnly));
-InfrastructureAPI.setOnSaveCustomCode(props.onSaveCustomCode);
-InfrastructureAPI.setOnGetCustomCode(props.onGetCustomCode);
-InfrastructureAPI.setOnSave(props.onSave);
-
InfrastructureAPI.setOnSavePropertyPlaceholder(props.onSavePropertyPlaceholder);
-
InfrastructureAPI.setOnInternalConsumerClick(props.onInternalConsumerClick);
+try {
+InfrastructureAPI.setOnSaveCustomCode(props.onSaveCustomCode);
+InfrastructureAPI.setOnGetCustomCode(props.onGetCustomCode);
+InfrastructureAPI.setOnSave(props.onSave);
+
InfrastructureAPI.setOnSavePropertyPlaceholder(props.onSavePropertyPlaceholder);
+
InfrastructureAPI.setOnInternalConsumerClick(props.onInternalConsumerClick);
-setSelectedStep(undefined);
-const i = makeIntegration(props.yaml, props.filename);
-setIntegration(i, false);
-let designerTab = i.kind === 'Kamelet' ? 'kamelet' : props.tab;
-if (designerTab === undefined) {
-const counts = CamelUi.getFlowCounts(i);
-designerTab = (counts.get('routes') || 0) > 0 ? 'routes' :
designerTab;
-designerTab = (counts.get('rest') || 0) > 0 ? 'rest' : designerTab;
-designerTab = (counts.get('beans') || 0) > 0 ? 'beans' :
designerTab;
+setSelectedStep(undefined);
+const i = makeIntegration(props.yaml, props.filename);
+setIntegration(i, false);
+let designerTab = i.kind === 'Kamelet' ? 'kamelet' :
Re: [I] Azure Key Vault Trait: Support Azure Identity as authentication method [camel-k]
squakez closed issue #4983: Azure Key Vault Trait: Support Azure Identity as authentication method URL: https://github.com/apache/camel-k/issues/4983 -- 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] Azure Key Vault Trait: Support Azure Identity as authentication method [camel-k]
squakez commented on issue #4983: URL: https://github.com/apache/camel-k/issues/4983#issuecomment-1999836255 Completed by #5244 -- 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] Build waiting condition [camel-k]
squakez closed issue #4542: Build waiting condition URL: https://github.com/apache/camel-k/issues/4542 -- 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] Integration builds fail with arm64 base image [camel-k]
squakez commented on PR #5246: URL: https://github.com/apache/camel-k/pull/5246#issuecomment-1999829551 Ref #4149 -- 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] [#5252] release-nightly does not build/push multiarch manifest [camel-k]
squakez commented on code in PR #5253: URL: https://github.com/apache/camel-k/pull/5253#discussion_r1526386217 ## script/Makefile: ## @@ -456,6 +456,18 @@ images-all: make IMAGE_ARCH=arm64 images make IMAGE_ARCH=amd64 images +images-push: + docker push $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-amd64 + docker push $(CUSTOM_IMAGE):$(CUSTOM_VERSION) + @if docker inspect $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-arm64 &> /dev/null; then \ + echo "Image $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-arm64 exists, building the multiarch manifest"; \ + docker push $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-arm64; \ + docker manifest create $(CUSTOM_IMAGE):$(CUSTOM_VERSION) --amend $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-amd64 --amend $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-arm64; \ + docker manifest push --purge $(CUSTOM_IMAGE):$(CUSTOM_VERSION); \ + else \ + echo "Image $(CUSTOM_IMAGE):$(CUSTOM_VERSION)-arm64 does not exist"; \ + fi + images-push-staging: Review Comment: We need to remove this, then. -- 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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on PR #13507: URL: https://github.com/apache/camel/pull/13507#issuecomment-1999795369 Ok, I see. I'll create a receiver route based on my previous message. and another which is consuming the subqueue to test the feature -- 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-20565 - Azure servicebus dead-lettering [camel]
oscerd commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526379481
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +233,23 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering() &&
(Objects.isNull(getConfiguration().getSubQueue()) ||
Review Comment:
Yes, something like that.
--
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) 04/27: Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8f8fcaa85b61c3b0afeccf7e8833e6abef044d12
Author: JiriOndrusek
AuthorDate: Fri Mar 8 13:24:50 2024 +0100
Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466
---
.../groovy-dsl/src/main/resources/routes/routes-with-rest.groovy| 2 --
.../test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java| 2 +-
.../java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java | 1 -
.../java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java| 2 +-
.../kotlin-dsl/src/main/resources/routes/routes-with-rest.kts | 2 --
.../test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java| 2 +-
6 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
index ab12f3f457..b09e06b0bd 100644
---
a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
+++
b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
@@ -21,14 +21,12 @@ rest {
path("/my/path") {
get("/get") {
-id("routes-with-rest-get")
produces("text/plain")
to("direct:get")
}
}
post {
-id("routes-with-rest-post")
path("/post")
consumes("text/plain")
produces("text/plain")
diff --git
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
index 6f41d92bba..5d366194af 100644
---
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
+++
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
@@ -54,7 +54,7 @@ class GroovyDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post,routes-with-rest-get,routes-with-rest-post"));
+
"my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post"));
RestAssured.given()
.get("/groovy-dsl/main/successful/routes")
.then()
diff --git
a/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
b/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
index c5997b823b..28120a1b29 100644
---
a/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
+++
b/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
@@ -23,7 +23,6 @@ public class MyRoutesWithModel extends RouteBuilder {
public void configure() throws Exception {
rest("/say")
.get("/emp/{id}")
-.id("routes-with-rest-get")
.produces("application/json")
.outType(MyUser.class)
.to("direct:routes-with-rest");
diff --git
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
index 767196aeaf..335c29df34 100644
---
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
+++
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
@@ -76,7 +76,7 @@ class JavaJoorDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"inner-classes-route,my-java-route,reflection-route,routes-with-bean,routes-with-inner-bean,routes-with-nested-class,routes-with-rest,routes-with-rest-get,routes-with-template"));
+
"inner-classes-route,my-java-route,reflection-route,routes-with-bean,routes-with-inner-bean,routes-with-nested-class,routes-with-rest,routes-with-template"));
RestAssured.given()
(camel-quarkus) 27/27: Fixed micrometer in native because of CAMEL-20525
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9366f605c4c67197b0f02cdbd4037e9042226e2e
Author: JiriOndrusek
AuthorDate: Fri Mar 15 15:29:17 2024 +0100
Fixed micrometer in native because of CAMEL-20525
---
.../quarkus/component/micrometer/it/MicrometerResource.java | 2 --
.../quarkus/component/micrometer/it/MicrometerTest.java | 13 +
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 4ea2d11460..a4dcff44e5 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -42,11 +42,9 @@ import
org.apache.camel.component.micrometer.MicrometerComponent;
import org.apache.camel.component.micrometer.MicrometerConstants;
import
org.apache.camel.component.micrometer.eventnotifier.MicrometerEventNotifierService;
import
org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryService;
-import org.jboss.logging.Logger;
@Path("/micrometer")
public class MicrometerResource {
-private static final Logger LOG =
Logger.getLogger(MicrometerResource.class);
@Inject
ProducerTemplate producerTemplate;
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index e5f978d2c7..ec18e5aa14 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -34,7 +34,6 @@ import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
import org.awaitility.Awaitility;
import org.hamcrest.Matchers;
-import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -45,7 +44,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
class MicrometerTest extends AbstractMicrometerTest {
-private static final Logger LOG = Logger.getLogger(MicrometerTest.class);
@Test
public void testMicrometerMetricsCounter() throws Exception {
@@ -200,16 +198,15 @@ class MicrometerTest extends AbstractMicrometerTest {
//convert to simpler map
Map filteredResult = result.entrySet().stream()
.collect(Collectors.toMap(e -> e.getKey().toString(), e2
-> e2.getValue()));
-//remove prometheus tags
-filteredResult.keySet().removeIf(k ->
k.contains("customTag=prometheus"));
-//keep only dumpAsJson routeId
-filteredResult.keySet().removeIf(k ->
!k.contains("routeId=dumpAsJson"));
-//keep only `ExchangeCompletedEvent`
-filteredResult.keySet().removeIf(k ->
!k.contains("eventType=ExchangeCompletedEvent"));
+//remove non-prometheus tags, keep only dumpAsJson routeId for
status ExchangeCompletedEvent
+filteredResult.keySet().removeIf(k ->
!k.contains("customTag=prometheus")
+|| !k.contains("routeId=dumpAsJson")
+|| k.contains("eventType=ExchangeCompletedEvent"));
//assert results
return
filteredResult.values().stream().map(String::valueOf).collect(Collectors.joining());
},
+//1 exchange with completed status should be caught
Matchers.is("1"));
}
(camel-quarkus) 24/27: Fixed micrometer in JVM because of CAMEL-20525
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8527cc0020be4602d5e7a53216da8186c420aa79
Author: JiriOndrusek
AuthorDate: Wed Mar 13 17:47:03 2024 +0100
Fixed micrometer in JVM because of CAMEL-20525
---
integration-tests/micrometer/pom.xml | 5 +++
.../micrometer/it/MicrometerResource.java | 33 ---
.../component/micrometer/it/MicrometerRoutes.java | 3 ++
.../component/micrometer/it/MicrometerTest.java| 48 ++
4 files changed, 47 insertions(+), 42 deletions(-)
diff --git a/integration-tests/micrometer/pom.xml
b/integration-tests/micrometer/pom.xml
index fa4c4e6f00..b7a972ad81 100644
--- a/integration-tests/micrometer/pom.xml
+++ b/integration-tests/micrometer/pom.xml
@@ -82,6 +82,11 @@
rest-assured
test
+
+org.awaitility
+awaitility
+test
+
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 4eafe512bf..4ea2d11460 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -20,14 +20,11 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.Optional;
import java.util.concurrent.TimeUnit;
-import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Tags;
-import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.search.Search;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import jakarta.inject.Inject;
@@ -177,29 +174,6 @@ public class MicrometerResource {
public Response statistics() {
MicrometerEventNotifierService service =
camelContext.hasService(MicrometerEventNotifierService.class);
String json = service.dumpStatisticsAsJson();
-
-//todo debug logging
-LOG.info("json is " + json);
-LOG.info("Service.started(): " + service.isStarted());
-LOG.info("meter registry is " + service.getMeterRegistry());
-if (service.getMeterRegistry() instanceof CompositeMeterRegistry) {
-LOG.info("composite registry from " + ((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries());
-}
-LOG.info("Searching for the `camel.routes.added` in single
registries.");
-((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries().forEach(mr -> {
-Optional o = mr.getMeters().stream().filter(m ->
m.getId().getName().equals("camel.routes.added")).findAny();
-LOG.info("`camel.routes.added` present in " + mr + ": " +
o.isPresent());
-if (o.isPresent()) {
-LOG.info(" with value " +
o.get().measure().iterator().next());
-}
-});
-
-Optional om = service.getMeterRegistry().getMeters().stream()
-.filter(m ->
m.getId().getName().contains("camel.routes.added")).findFirst();
-LOG.info("meter `camel.routes.added` " + om.get());
-if (om.isPresent()) {
-LOG.info("value is " +
om.get().measure().iterator().next().getValue());
-}
return Response.ok().entity(json).build();
}
@@ -250,4 +224,11 @@ public class MicrometerResource {
}
return Response.ok().build();
}
+
+@Path("/sendDumpAsJson")
+@GET
+public Response sendDumpAsJson() {
+producerTemplate.sendBody("direct:dumpAsJson", "hello");
+return Response.ok().build();
+}
}
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
index 64d50941e3..611527f714 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
@@ -55,5 +55,8 @@ public class MicrometerRoutes extends RouteBuilder {
.id("jmxHistory")
.log("log: ${body}");
+from("direct:dumpAsJson")
+.id("dumpAsJson")
+.log("log: ${body}");
}
}
diff --git
(camel-quarkus) 18/27: Micrometer logging for CI debugging purposes
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8af9f4baf949dc7566d183f61b96169eb921bb96
Author: JiriOndrusek
AuthorDate: Tue Mar 12 12:58:12 2024 +0100
Micrometer logging for CI debugging purposes
---
.../apache/camel/quarkus/component/micrometer/it/MicrometerTest.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index af1b4f42a9..66320eb929 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -29,6 +29,7 @@ import io.quarkus.test.junit.DisabledOnIntegrationTest;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
+import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -39,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
class MicrometerTest extends AbstractMicrometerTest {
-
+private static final Logger LOG = Logger.getLogger(MicrometerTest.class);
@Test
public void testMicrometerMetricsCounter() throws Exception {
RestAssured.get("/micrometer/counter/0")
@@ -183,6 +184,8 @@ class MicrometerTest extends AbstractMicrometerTest {
//extract required values
Map result = jsonPath.getMap(
"gauges.findAll { it.id.name =~ /routes/ && it.id.tags.find {
it.customTag } }.collectEntries { [it.id.name, it.value] }");
+//todo remove for debugging purposes
+LOG.info("Dumped json is " + result);
assertEquals(result.size(), 3);
assertTrue(result.containsKey("camel.routes.running"));
(camel-quarkus) 14/27: Fixed micrometer because of CAMEL-20461
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ee3e02467cf0df4d7fc16d379dbcd5781cfc85b7
Author: JiriOndrusek
AuthorDate: Tue Mar 12 10:42:11 2024 +0100
Fixed micrometer because of CAMEL-20461
---
.../camel/quarkus/component/micrometer/CamelMicrometerRecorder.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java
b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java
index ddc5584c37..d7e7f2a9bc 100644
---
a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java
+++
b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java
@@ -59,7 +59,9 @@ public class CamelMicrometerRecorder {
@Override
public void configure(CamelContext camelContext) {
if (config.enableRoutePolicy) {
-camelContext.addRoutePolicyFactory(new
MicrometerRoutePolicyFactory());
+MicrometerRoutePolicyFactory mrpf = new
MicrometerRoutePolicyFactory();
+mrpf.setCamelContext(camelContext);
+camelContext.addRoutePolicyFactory(mrpf);
}
ManagementStrategy managementStrategy =
camelContext.getManagementStrategy();
(camel-quarkus) 10/27: Include dev-consoles into camel-catalog
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 623e27d2d06b6b9932d472866b9e47e5e723
Author: James Netherton
AuthorDate: Sun Mar 10 09:35:19 2024 +
Include dev-consoles into camel-catalog
---
.../catalog/quarkus/QuarkusRuntimeProvider.java| 21 +
.../quarkus/QuarkusRuntimeProviderTest.java| 12
.../ROOT/pages/reference/extensions/core.adoc | 8 +
.../core/deployment/CamelNativeImageProcessor.java | 5 +++
.../catalog/BuildTimeJsonSchemaResolver.java | 5 +++
.../org/apache/camel/quarkus/core/CamelConfig.java | 11 +++
.../camel/quarkus/core/FastCamelContext.java | 20
.../org/apache/camel/quarkus/maven/CqCatalog.java | 36 +++---
.../org/apache/camel/quarkus/maven/CqUtils.java| 4 +++
.../quarkus/maven/PrepareCatalogQuarkusMojo.java | 7 +++--
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 2 ++
11 files changed, 125 insertions(+), 6 deletions(-)
diff --git
a/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
b/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
index ab9f6fabdb..4760cda6e2 100644
---
a/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
+++
b/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
@@ -34,10 +34,12 @@ public class QuarkusRuntimeProvider implements
RuntimeProvider {
private static final String COMPONENT_DIR =
"org/apache/camel/catalog/quarkus/components";
private static final String DATAFORMAT_DIR =
"org/apache/camel/catalog/quarkus/dataformats";
+private static final String DEV_CONSOLE_DIR =
"org/apache/camel/catalog/quarkus/consoles";
private static final String LANGUAGE_DIR =
"org/apache/camel/catalog/quarkus/languages";
private static final String TRANSFORMER_DIR =
"org/apache/camel/catalog/quarkus/transformers";
private static final String OTHER_DIR =
"org/apache/camel/catalog/quarkus/others";
private static final String COMPONENTS_CATALOG =
"org/apache/camel/catalog/quarkus/components.properties";
+private static final String DEV_CONSOLE_CATALOG =
"org/apache/camel/catalog/quarkus/consoles.properties";
private static final String DATA_FORMATS_CATALOG =
"org/apache/camel/catalog/quarkus/dataformats.properties";
private static final String LANGUAGE_CATALOG =
"org/apache/camel/catalog/quarkus/languages.properties";
private static final String TRANSFORMER_CATALOG =
"org/apache/camel/catalog/quarkus/transformers.properties";
@@ -80,6 +82,11 @@ public class QuarkusRuntimeProvider implements
RuntimeProvider {
return DATAFORMAT_DIR;
}
+@Override
+public String getDevConsoleJSonSchemaDirectory() {
+return DEV_CONSOLE_DIR;
+}
+
@Override
public String getLanguageJSonSchemaDirectory() {
return LANGUAGE_DIR;
@@ -123,6 +130,20 @@ public class QuarkusRuntimeProvider implements
RuntimeProvider {
return names;
}
+@Override
+public List findDevConsoleNames() {
+List names = new ArrayList<>();
+InputStream is =
camelCatalog.getVersionManager().getResourceAsStream(DEV_CONSOLE_CATALOG);
+if (is != null) {
+try {
+CatalogHelper.loadLines(is, names);
+} catch (IOException e) {
+// ignore
+}
+}
+return names;
+}
+
@Override
public List findLanguageNames() {
List names = new ArrayList<>();
diff --git
a/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
b/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
index e3adf83bc6..c508552b4b 100644
---
a/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
+++
b/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
@@ -152,6 +152,18 @@ public class QuarkusRuntimeProviderTest {
assertTrue(names.contains("zipFile"));
}
+@Test
+public void testFindDevConsoleNames() throws Exception {
+List names = catalog.findDevConsoleNames();
+
+assertNotNull(names);
+assertFalse(names.isEmpty());
+
+assertTrue(names.contains("context"));
+assertTrue(names.contains("endpoint"));
+assertTrue(names.contains("jvm"));
+}
+
@Test
public void testFindLanguageNames() throws Exception {
List names = catalog.findLanguageNames();
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc
b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index 4ca4a1b84c..3523c7b170 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++
(camel-quarkus) 03/27: fixed slack because of CAMEL-20464
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 07c72f8af5084321db790348eec7a16c92761a64 Author: JiriOndrusek AuthorDate: Fri Mar 8 10:26:05 2024 +0100 fixed slack because of CAMEL-20464 --- extensions/slack/deployment/pom.xml | 5 + extensions/slack/runtime/pom.xml| 5 + 2 files changed, 10 insertions(+) diff --git a/extensions/slack/deployment/pom.xml b/extensions/slack/deployment/pom.xml index b91e6a2471..72b26e9625 100644 --- a/extensions/slack/deployment/pom.xml +++ b/extensions/slack/deployment/pom.xml @@ -38,6 +38,11 @@ org.apache.camel.quarkus camel-quarkus-slack + + +org.apache.camel.quarkus +camel-quarkus-cloudevents-deployment + diff --git a/extensions/slack/runtime/pom.xml b/extensions/slack/runtime/pom.xml index a03fec7e57..e5085fa868 100644 --- a/extensions/slack/runtime/pom.xml +++ b/extensions/slack/runtime/pom.xml @@ -43,6 +43,11 @@ org.apache.camel camel-slack + + +org.apache.camel.quarkus +camel-quarkus-cloudevents + org.graalvm.sdk nativeimage
(camel-quarkus) 12/27: generated files
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit cc049a2a0cbd48315c12bee2422e4300cd9b Author: JiriOndrusek AuthorDate: Mon Mar 11 13:20:43 2024 +0100 generated files --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b17115394e..6da3aed63d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6948,7 +6948,7 @@ redis.clients jedis -5.1.0 +5.1.2 software.amazon.awssdk diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 8b9ef08897..27be49caeb 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6848,7 +6848,7 @@ redis.clients jedis -5.1.0 +5.1.2 software.amazon.awssdk 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 b30a00280a..55f561ad86 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6848,7 +6848,7 @@ redis.clients jedis -5.1.0 +5.1.2 software.amazon.awssdk
(camel-quarkus) 09/27: Fixed latform http - inlining requires unique routes, partialy fixed openapi-java
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7e5afeae40c98e581d9d257f7209f997e06423c9
Author: JiriOndrusek
AuthorDate: Fri Mar 8 15:34:15 2024 +0100
Fixed latform http - inlining requires unique routes, partialy fixed
openapi-java
---
integration-tests/openapi-java/pom.xml | 4
.../component/openapijava/it/OpenApiRoutes.java| 28 +++---
integration-tests/platform-http/pom.xml| 4
.../platform/http/it/PlatformHttpRouteBuilder.java | 6 ++---
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/integration-tests/openapi-java/pom.xml
b/integration-tests/openapi-java/pom.xml
index e646f823c4..494797bcea 100644
--- a/integration-tests/openapi-java/pom.xml
+++ b/integration-tests/openapi-java/pom.xml
@@ -55,6 +55,10 @@
org.apache.camel.quarkus
camel-quarkus-rest
+
+org.apache.camel.quarkus
+camel-quarkus-seda
+
io.quarkus
quarkus-resteasy
diff --git
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
index 9b93b29959..e89d8554df 100644
---
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
+++
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
@@ -102,14 +102,14 @@ public class OpenApiRoutes extends RouteBuilder {
.code("error")
.message("Response Error")
.endResponseMessage()
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.get("/security/scopes")
.security("OAuth2", "scope1,scope2,scope3")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.get("/security/api/key")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.apiKey("X-API-Key", "The API key")
.withHeader("X-API-KEY")
@@ -117,13 +117,13 @@ public class OpenApiRoutes extends RouteBuilder {
.end()
.get("/security/basic/auth")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.basicAuth("basicAuth", "Basic Authentication")
.end()
.get("/security/oauth2")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.oauth2("oauth2", "OAuth2 Authentication")
.flow("implicit")
@@ -137,19 +137,19 @@ public class OpenApiRoutes extends RouteBuilder {
if (openApiVersion.startsWith("3")) {
rest()
.get("/security/bearer/token")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.bearerToken("bearerAuth", "Bearer Token Authentication")
.end()
.get("/security/mutual/tls")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.mutualTLS("mutualTLS")
.end()
.get("/security/openid")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.openIdConnect("openId",
"https://secure.apache.org/fake/openid-configuration;)
.end()
@@ -227,7 +227,7 @@ public class OpenApiRoutes extends RouteBuilder {
.arrayType("password")
.allowableValues("foo", "bar", "cheese")
.endParam()
-.to("direct:echoMethodPath");
+.to("seda:echoMethodPath");
rest("/form")
.post("/oneOf")
@@ -242,7 +242,7 @@ public class OpenApiRoutes extends RouteBuilder {
.code(200).message("Ok")
.endResponseMessage()
-.to("direct:res");
+.to("seda:res");
rest("/form")
.post("/allOf")
@@ -257,7 +257,7 @@ public class OpenApiRoutes extends RouteBuilder {
.code(200).message("Ok")
.endResponseMessage()
-.to("direct:res");
+
(camel-quarkus) 21/27: Micrometer more debug logging
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1476d05a7488c5f787c8d76ccf372c85fbfae778
Author: JiriOndrusek
AuthorDate: Wed Mar 13 09:35:36 2024 +0100
Micrometer more debug logging
---
.../component/micrometer/it/MicrometerResource.java | 19 +++
1 file changed, 19 insertions(+)
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index fd7906e808..4e5cb3067a 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -20,11 +20,14 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Optional;
import java.util.concurrent.TimeUnit;
+import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.search.Search;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import jakarta.inject.Inject;
@@ -42,9 +45,11 @@ import
org.apache.camel.component.micrometer.MicrometerComponent;
import org.apache.camel.component.micrometer.MicrometerConstants;
import
org.apache.camel.component.micrometer.eventnotifier.MicrometerEventNotifierService;
import
org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryService;
+import org.jboss.logging.Logger;
@Path("/micrometer")
public class MicrometerResource {
+private static final Logger LOG =
Logger.getLogger(MicrometerResource.class);
@Inject
ProducerTemplate producerTemplate;
@@ -172,6 +177,20 @@ public class MicrometerResource {
public Response statistics() {
MicrometerEventNotifierService service =
camelContext.hasService(MicrometerEventNotifierService.class);
String json = service.dumpStatisticsAsJson();
+
+//todo debug logging
+LOG.info("json is " + json);
+LOG.info("Service.started(): " + service.isStarted());
+LOG.info("meter registry is " + service.getMeterRegistry());
+if (service.getMeterRegistry() instanceof CompositeMeterRegistry) {
+LOG.info("composite registry from " + ((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries());
+}
+Optional om = service.getMeterRegistry().getMeters().stream()
+.filter(m ->
m.getId().getName().contains("camel.routes.added")).findFirst();
+LOG.info("meter `camel.routes.added` " + om.get());
+if (om.isPresent()) {
+LOG.info("value is " +
om.get().measure().iterator().next().getValue());
+}
return Response.ok().entity(json).build();
}
(camel-quarkus) 22/27: Add Qdrant JVM only extension #5860
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3bb499707ad0fa5e42e476687fa544bfc4f393eb
Author: aldettinger
AuthorDate: Mon Mar 11 17:19:18 2024 +0100
Add Qdrant JVM only extension #5860
---
docs/modules/ROOT/examples/components/qdrant.yml | 13 +++
docs/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/reference/extensions/qdrant.adoc| 41 +
extensions-jvm/pom.xml | 1 +
extensions-jvm/qdrant/deployment/pom.xml | 63 +
.../qdrant/deployment/QdrantProcessor.java | 46 ++
extensions-jvm/qdrant/pom.xml | 39
extensions-jvm/qdrant/runtime/pom.xml | 100 +
.../main/resources/META-INF/quarkus-extension.yaml | 33 +++
integration-tests-jvm/pom.xml | 1 +
integration-tests-jvm/qdrant/pom.xml | 84 +
.../component/qdrant/it/QdrantResource.java| 50 +++
.../quarkus/component/qdrant/it/QdrantTest.java| 34 +++
poms/bom/pom.xml | 39 +++-
poms/bom/src/main/generated/flattened-full-pom.xml | 39 +++-
.../src/main/generated/flattened-reduced-pom.xml | 47 +-
.../generated/flattened-reduced-verbose-pom.xml| 47 +-
17 files changed, 668 insertions(+), 10 deletions(-)
diff --git a/docs/modules/ROOT/examples/components/qdrant.yml
b/docs/modules/ROOT/examples/components/qdrant.yml
new file mode 100644
index 00..baf7abbffe
--- /dev/null
+++ b/docs/modules/ROOT/examples/components/qdrant.yml
@@ -0,0 +1,13 @@
+# Do not edit directly!
+# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+cqArtifactId: camel-quarkus-qdrant
+cqArtifactIdBase: qdrant
+cqNativeSupported: false
+cqStatus: Preview
+cqDeprecated: false
+cqJvmSince: 3.9.0
+cqNativeSince: n/a
+cqCamelPartName: qdrant
+cqCamelPartTitle: Qdrant
+cqCamelPartDescription: Perform operations on the Qdrant Vector Database.
+cqExtensionPageTitle: Qdrant
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 36658c68d6..1fab5d81c5 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -239,6 +239,7 @@
*** xref:reference/extensions/jackson-protobuf.adoc[Protobuf Jackson]
*** xref:reference/extensions/pubnub.adoc[PubNub]
*** xref:reference/extensions/pulsar.adoc[Pulsar]
+*** xref:reference/extensions/qdrant.adoc[Qdrant]
*** xref:reference/extensions/quartz.adoc[Quartz]
*** xref:reference/extensions/quickfix.adoc[QuickFix]
*** xref:reference/extensions/qute.adoc[Qute]
diff --git a/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
new file mode 100644
index 00..79f50e40aa
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
@@ -0,0 +1,41 @@
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+[id="extensions-qdrant"]
+= Qdrant
+:linkattrs:
+:cq-artifact-id: camel-quarkus-qdrant
+:cq-native-supported: false
+:cq-status: Preview
+:cq-status-deprecation: Preview
+:cq-description: Perform operations on the Qdrant Vector Database.
+:cq-deprecated: false
+:cq-jvm-since: 3.9.0
+:cq-native-since: n/a
+
+ifeval::[{doc-show-badges} == true]
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##3.9.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+endif::[]
+
+Perform operations on the Qdrant Vector Database.
+
+[id="extensions-qdrant-whats-inside"]
+== What's inside
+
+* xref:{cq-camel-components}::qdrant-component.adoc[Qdrant component], URI
syntax: `qdrant:collection`
+
+Please refer to the above link for usage and configuration details.
+
+[id="extensions-qdrant-maven-coordinates"]
+== Maven coordinates
+
+[source,xml]
+
+
+org.apache.camel.quarkus
+camel-quarkus-qdrant
+
+
+ifeval::[{doc-show-user-guide-link} == true]
+Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+endif::[]
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index f195f49fa1..8fcdb46adc 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -85,6 +85,7 @@
opensearch
printer
pulsar
+qdrant
quickfix
redis
robotframework
diff --git a/extensions-jvm/qdrant/deployment/pom.xml
b/extensions-jvm/qdrant/deployment/pom.xml
new file mode 100644
index 00..7a45573223
--- /dev/null
+++ b/extensions-jvm/qdrant/deployment/pom.xml
@@ -0,0 +1,63 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
(camel-quarkus) 25/27: Fixed compilation (requires CAMEL-20566) + generated files
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3d200eb70eb44b9a3c8cf9531ff9005587007c91
Author: JiriOndrusek
AuthorDate: Thu Mar 14 14:24:22 2024 +0100
Fixed compilation (requires CAMEL-20566) + generated files
---
.../apache/camel/quarkus/component/micrometer/it/MicrometerTest.java | 2 +-
pom.xml | 1 +
poms/bom/pom.xml | 5 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index 75a78e6a84..e5f978d2c7 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -210,7 +210,7 @@ class MicrometerTest extends AbstractMicrometerTest {
//assert results
return
filteredResult.values().stream().map(String::valueOf).collect(Collectors.joining());
},
-Matchers.is("1"));
+Matchers.is("1"));
}
@ParameterizedTest
diff --git a/pom.xml b/pom.xml
index 7453c3d645..2e6a2faa38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
${json-patch-version}
${jodatime2-version}
1.7.2
+${jaxb-core-version}
1.2.0
${javassist-version}
${jetty-version}
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 78e7bd2c28..8b1f7c4e20 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6390,6 +6390,11 @@
retrofit
${retrofit.version}
+
+com.sun.xml.bind
+jaxb-core
+${jaxb-core.version}
+
commons-beanutils
commons-beanutils
(camel-quarkus) 20/27: Fix path to custom component JSON metadata
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b8a8e2359de41aa15490d3cced9b67f54e268432
Author: James Netherton
AuthorDate: Tue Mar 12 15:52:13 2024 +
Fix path to custom component JSON metadata
---
.../java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
index 4c9e91aed6..625eafdacc 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
@@ -95,7 +95,7 @@ public class PrepareCatalogQuarkusMojo extends
AbstractExtensionListMojo {
final String artifactIdBase = ext.getArtifactIdBase();
final Path schemaFile = ext
.getExtensionDir()
-
.resolve("component/src/generated/resources/org/apache/camel/component/"
+
.resolve("component/src/generated/resources/META-INF/org/apache/camel/component/"
+ artifactIdBase + "/" + artifactIdBase +
".json")
.toAbsolutePath().normalize();
if (Files.isRegularFile(schemaFile)) {
(camel-quarkus) 05/27: generated files
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 320eab7418305d5f95593bbad852da2c0391825f Author: JiriOndrusek AuthorDate: Fri Mar 8 14:06:49 2024 +0100 generated files --- poms/bom/src/main/generated/flattened-full-pom.xml | 336 ++--- .../src/main/generated/flattened-reduced-pom.xml | 28 +- .../generated/flattened-reduced-verbose-pom.xml| 84 +++--- 3 files changed, 224 insertions(+), 224 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 44ec6823f1..8b45c969fb 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -21817,284 +21817,284 @@ 2.2 -org.eclipse.jetty -jetty-alpn-client -12.0.6 +org.eclipse.jetty +jetty-alpn-client +12.0.7 -org.eclipse.jetty -jetty-alpn-conscrypt-client -12.0.6 +org.eclipse.jetty +jetty-alpn-conscrypt-client +12.0.7 -org.eclipse.jetty -jetty-alpn-conscrypt-server -12.0.6 +org.eclipse.jetty +jetty-alpn-conscrypt-server +12.0.7 -org.eclipse.jetty -jetty-alpn-java-client -12.0.6 +org.eclipse.jetty +jetty-alpn-java-client +12.0.7 -org.eclipse.jetty -jetty-alpn-java-server -12.0.6 +org.eclipse.jetty +jetty-alpn-java-server +12.0.7 -org.eclipse.jetty -jetty-alpn-server -12.0.6 +org.eclipse.jetty +jetty-alpn-server +12.0.7 -org.eclipse.jetty -jetty-client -12.0.6 +org.eclipse.jetty +jetty-client +12.0.7 -org.eclipse.jetty -jetty-deploy -12.0.6 +org.eclipse.jetty +jetty-deploy +12.0.7 -org.eclipse.jetty -jetty-http -12.0.6 +org.eclipse.jetty +jetty-http +12.0.7 -org.eclipse.jetty -jetty-http-spi -12.0.6 +org.eclipse.jetty +jetty-http-spi +12.0.7 -org.eclipse.jetty -jetty-http-tools -12.0.6 +org.eclipse.jetty +jetty-http-tools +12.0.7 -org.eclipse.jetty -jetty-io -12.0.6 +org.eclipse.jetty +jetty-io +12.0.7 -org.eclipse.jetty -jetty-jmx -12.0.6 +org.eclipse.jetty +jetty-jmx +12.0.7 -org.eclipse.jetty -jetty-jndi -12.0.6 +org.eclipse.jetty +jetty-jndi +12.0.7 -org.eclipse.jetty -jetty-keystore -12.0.6 +org.eclipse.jetty +jetty-keystore +12.0.7 -org.eclipse.jetty -jetty-openid -12.0.6 +org.eclipse.jetty +jetty-openid +12.0.7 -org.eclipse.jetty -jetty-osgi -12.0.6 +org.eclipse.jetty +jetty-osgi +12.0.7 -org.eclipse.jetty -jetty-plus -12.0.6 +org.eclipse.jetty +jetty-plus +12.0.7 -org.eclipse.jetty -jetty-proxy -12.0.6 +org.eclipse.jetty +jetty-proxy +12.0.7 -org.eclipse.jetty -jetty-rewrite -12.0.6 +org.eclipse.jetty +jetty-rewrite +12.0.7 -org.eclipse.jetty -jetty-security -12.0.6 +org.eclipse.jetty +jetty-security +12.0.7 -org.eclipse.jetty -jetty-server -12.0.6 +org.eclipse.jetty +jetty-server +12.0.7 -org.eclipse.jetty -jetty-session -12.0.6 +org.eclipse.jetty +jetty-session +12.0.7 -org.eclipse.jetty -jetty-slf4j-impl -12.0.6 +org.eclipse.jetty +jetty-slf4j-impl +12.0.7 -org.eclipse.jetty -jetty-start -12.0.6 +org.eclipse.jetty +jetty-start +12.0.7 -org.eclipse.jetty -jetty-unixdomain-server -12.0.6 +org.eclipse.jetty +jetty-unixdomain-server +12.0.7 -org.eclipse.jetty -jetty-util -12.0.6 +org.eclipse.jetty +jetty-util +12.0.7 -
(camel-quarkus) 16/27: Fixed main-yaml - inlining requires unique routes, partialy fixed openapi-java
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8858bae3e6175db1c63d9e5dec8f1c58a8954ad2
Author: JiriOndrusek
AuthorDate: Tue Mar 12 11:13:43 2024 +0100
Fixed main-yaml - inlining requires unique routes, partialy fixed
openapi-java
---
integration-tests/main-yaml/pom.xml| 4
.../main-yaml/src/main/resources/routes/my-rests.yaml | 14 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/integration-tests/main-yaml/pom.xml
b/integration-tests/main-yaml/pom.xml
index 642ce85ef2..eafe3ab998 100644
--- a/integration-tests/main-yaml/pom.xml
+++ b/integration-tests/main-yaml/pom.xml
@@ -43,6 +43,10 @@
org.apache.camel.quarkus
camel-quarkus-direct
+
+org.apache.camel.quarkus
+camel-quarkus-seda
+
org.apache.camel.quarkus
camel-quarkus-log
diff --git
a/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
b/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
index 4a0b109589..ea9d766033 100644
--- a/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
+++ b/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml
@@ -18,27 +18,27 @@
- rest:
get:
- path: "/rest"
-to: "direct:echoMethodPath"
+to: "seda:choMethodPath"
post:
- path: "/rest"
-to: "direct:echoMethodPath"
+to: "seda:choMethodPath"
patch:
- path: "/rest"
-to: "direct:echoMethodPath"
+to: "seda:choMethodPath"
put:
- path: "/rest"
-to: "direct:echoMethodPath"
+to: "seda:choMethodPath"
delete:
- path: "/rest"
-to: "direct:echoMethodPath"
+to: "seda:choMethodPath"
head:
- path: "/rest"
-to: "direct:echoMethodPath"
+to: "seda:choMethodPath"
- route:
id: "rest-route"
from:
- uri: "direct:echoMethodPath"
+ uri: "seda:choMethodPath"
steps:
- setBody:
simple: "${header.CamelHttpMethod}: ${header.CamelHttpPath}"
(camel-quarkus) 01/27: Upgrade Camel to 4.5.0
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 364ada0a310ec4eb4229c5f35ec8381af71d56f4
Author: James Netherton
AuthorDate: Wed Mar 6 14:56:22 2024 +
Upgrade Camel to 4.5.0
---
.../catalog/quarkus/QuarkusRuntimeProvider.java| 21 +++
.../quarkus/QuarkusRuntimeProviderTest.java| 10 +++
docs/antora.yml| 2 +-
.../ROOT/examples/components/rest-openapi.yml | 2 +-
.../pages/reference/extensions/rest-openapi.adoc | 4 +--
.../catalog/BuildTimeJsonSchemaResolver.java | 5
.../core/deployment/catalog/SchemaResource.java| 2 +-
.../camel/quarkus/core/CamelContextRecorder.java | 4 ---
.../camel/quarkus/core/FastCamelContext.java | 11 +---
extensions-jvm/azure-cosmosdb/deployment/pom.xml | 4 +++
extensions-jvm/azure-cosmosdb/runtime/pom.xml | 4 +++
.../language/deployment/dm/DryModeMain.java| 2 +-
.../org/apache/camel/component/qute/qute.json | 0
.../camel/quarkus/component/avro/it/AvroRoute.java | 11
.../apache/camel/quarkus/js/JavaScriptDslTest.java | 2 +-
.../camel/quarkus/main/CoreMainXmlJaxbTest.java| 1 -
integration-tests/ssh/pom.xml | 2 ++
.../camel/quarkus/component/ssh/it/SshIT.java | 2 ++
.../camel/quarkus/component/ssh/it/SshTest.java| 2 ++
.../component/velocity/it/VelocityTest.java| 6 ++---
pom.xml| 20 +++---
.../org/apache/camel/quarkus/maven/CqCatalog.java | 31 +-
.../org/apache/camel/quarkus/maven/CqUtils.java| 2 ++
.../quarkus/maven/PrepareCatalogQuarkusMojo.java | 3 +++
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 2 ++
25 files changed, 120 insertions(+), 35 deletions(-)
diff --git
a/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
b/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
index d8a72bfada..ab9f6fabdb 100644
---
a/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
+++
b/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
@@ -35,10 +35,12 @@ public class QuarkusRuntimeProvider implements
RuntimeProvider {
private static final String COMPONENT_DIR =
"org/apache/camel/catalog/quarkus/components";
private static final String DATAFORMAT_DIR =
"org/apache/camel/catalog/quarkus/dataformats";
private static final String LANGUAGE_DIR =
"org/apache/camel/catalog/quarkus/languages";
+private static final String TRANSFORMER_DIR =
"org/apache/camel/catalog/quarkus/transformers";
private static final String OTHER_DIR =
"org/apache/camel/catalog/quarkus/others";
private static final String COMPONENTS_CATALOG =
"org/apache/camel/catalog/quarkus/components.properties";
private static final String DATA_FORMATS_CATALOG =
"org/apache/camel/catalog/quarkus/dataformats.properties";
private static final String LANGUAGE_CATALOG =
"org/apache/camel/catalog/quarkus/languages.properties";
+private static final String TRANSFORMER_CATALOG =
"org/apache/camel/catalog/quarkus/transformers.properties";
private static final String OTHER_CATALOG =
"org/apache/camel/catalog/quarkus/others.properties";
private CamelCatalog camelCatalog;
@@ -83,6 +85,11 @@ public class QuarkusRuntimeProvider implements
RuntimeProvider {
return LANGUAGE_DIR;
}
+@Override
+public String getTransformerJSonSchemaDirectory() {
+return TRANSFORMER_DIR;
+}
+
@Override
public String getOtherJSonSchemaDirectory() {
return OTHER_DIR;
@@ -130,6 +137,20 @@ public class QuarkusRuntimeProvider implements
RuntimeProvider {
return names;
}
+@Override
+public List findTransformerNames() {
+List names = new ArrayList<>();
+InputStream is =
camelCatalog.getVersionManager().getResourceAsStream(TRANSFORMER_CATALOG);
+if (is != null) {
+try {
+CatalogHelper.loadLines(is, names);
+} catch (IOException e) {
+// ignore
+}
+}
+return names;
+}
+
@Override
public List findOtherNames() {
List names = new ArrayList<>();
diff --git
a/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
b/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
index 20c0b3a9de..e3adf83bc6 100644
---
a/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
+++
b/catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
@@ -183,6 +183,16 @@ public class QuarkusRuntimeProviderTest {
(camel-quarkus) 13/27: Fixed shiro after update of dependency
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1008512315273824f84b00cc2f7c01b0ea70f473
Author: JiriOndrusek
AuthorDate: Tue Mar 12 09:54:24 2024 +0100
Fixed shiro after update of dependency
---
.../apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
index 275ed9d76a..e1425d55f9 100644
---
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
+++
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
@@ -101,6 +101,6 @@ class ShiroProcessor {
@BuildStep
IndexDependencyBuildItem registerDependencyForIndex() {
-return new IndexDependencyBuildItem("org.apache.shiro", "shiro-core",
"jakarta");
+return new IndexDependencyBuildItem("org.apache.shiro", "shiro-core");
}
}
(camel-quarkus) 11/27: Fixed shiro copilation issue + generated tests
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit aaf63464d50d5c017d8df5f068ce01b2723164d5
Author: JiriOndrusek
AuthorDate: Mon Mar 11 11:24:21 2024 +0100
Fixed shiro copilation issue + generated tests
---
.../camel/quarkus/component/shiro/deployment/ShiroProcessor.java| 2 +-
.../camel/quarkus/component/shiro/ReflectionBuilderSubstitute.java | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
index 5a980291a3..275ed9d76a 100644
---
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
+++
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
@@ -32,7 +32,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.CamelAuthorizationException;
-import org.apache.shiro.ShiroException;
+import org.apache.shiro.lang.ShiroException;
import org.jboss.jandex.DotName;
class ShiroProcessor {
diff --git
a/extensions/shiro/runtime/src/main/java/org/apache/camel/quarkus/component/shiro/ReflectionBuilderSubstitute.java
b/extensions/shiro/runtime/src/main/java/org/apache/camel/quarkus/component/shiro/ReflectionBuilderSubstitute.java
index 10c7342339..a5c098b943 100644
---
a/extensions/shiro/runtime/src/main/java/org/apache/camel/quarkus/component/shiro/ReflectionBuilderSubstitute.java
+++
b/extensions/shiro/runtime/src/main/java/org/apache/camel/quarkus/component/shiro/ReflectionBuilderSubstitute.java
@@ -18,9 +18,9 @@ package org.apache.camel.quarkus.component.shiro;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;
-import org.apache.shiro.config.DefaultInterpolator;
-import org.apache.shiro.config.Interpolator;
-import org.apache.shiro.config.ReflectionBuilder;
+import org.apache.shiro.config.ogdl.DefaultInterpolator;
+import org.apache.shiro.config.ogdl.Interpolator;
+import org.apache.shiro.config.ogdl.ReflectionBuilder;
@TargetClass(value = ReflectionBuilder.class)
final class ReflectionBuilderSubstitute {
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 8b45c969fb..b17115394e 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6476,7 +6476,7 @@
io.swagger.parser.v3
swagger-parser
-2.1.20
+2.1.21
com.google.code.findbugs
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index c227430f34..8b9ef08897 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6431,7 +6431,7 @@
io.swagger.parser.v3
swagger-parser
-2.1.20
+2.1.21
com.google.code.findbugs
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 568295b63a..b30a00280a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6431,7 +6431,7 @@
io.swagger.parser.v3
swagger-parser
-2.1.20
+2.1.21
com.google.code.findbugs
(camel-quarkus) 17/27: Fixed openapi-kava, get rid of v2, because of CAMEL-20488
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2000903760f769a2f66f69d86db6251dc414e8a7
Author: JiriOndrusek
AuthorDate: Tue Mar 12 12:52:23 2024 +0100
Fixed openapi-kava, get rid of v2, because of CAMEL-20488
---
integration-tests/openapi-java/pom.xml | 12 --
.../component/openapijava/it/v2/OpenApiV2IT.java | 25
.../component/openapijava/it/v2/OpenApiV2Test.java | 154 -
.../openapijava/it/v2/OpenApiV2TestProfile.java| 30
4 files changed, 221 deletions(-)
diff --git a/integration-tests/openapi-java/pom.xml
b/integration-tests/openapi-java/pom.xml
index 494797bcea..a812fdf743 100644
--- a/integration-tests/openapi-java/pom.xml
+++ b/integration-tests/openapi-java/pom.xml
@@ -95,18 +95,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
-
-profile-openapi-v2
-
-integration-test
-verify
-
-
-
-openapi.v2
-
-
-
profile-openapi-v3
diff --git
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java
b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java
deleted file mode 100644
index 5ea4a935b5..00
---
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2IT.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.quarkus.component.openapijava.it.v2;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-@QuarkusIntegrationTest
-@EnabledIfSystemProperty(named = "test.profile", matches = "openapi.v2")
-class OpenApiV2IT extends OpenApiV2Test {
-}
diff --git
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java
b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java
deleted file mode 100644
index 31d73ce417..00
---
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.quarkus.component.openapijava.it.v2;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import org.apache.camel.quarkus.component.openapijava.it.OpenApiContentType;
-import org.apache.camel.quarkus.component.openapijava.it.common.OpenApiTest;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
(camel-quarkus) 15/27: fixed servlet and http - inlining requires unique routes, partialy fixed openapi-java
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d03949f069827aeb66e1e8fac07b7be6f2595606
Author: JiriOndrusek
AuthorDate: Tue Mar 12 11:02:15 2024 +0100
fixed servlet and http - inlining requires unique routes, partialy fixed
openapi-java
---
integration-test-groups/http/netty-http/pom.xml | 4
.../component/http/netty/NettyHttpRoutes.java| 14 +++---
integration-tests/servlet/pom.xml| 2 +-
.../camel/quarkus/component/servlet/CamelRoute.java | 20 ++--
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/integration-test-groups/http/netty-http/pom.xml
b/integration-test-groups/http/netty-http/pom.xml
index 16b66bab47..b12e3add66 100644
--- a/integration-test-groups/http/netty-http/pom.xml
+++ b/integration-test-groups/http/netty-http/pom.xml
@@ -42,6 +42,10 @@
org.apache.camel.quarkus
camel-quarkus-direct
+
+org.apache.camel.quarkus
+camel-quarkus-seda
+
org.apache.camel.quarkus
camel-quarkus-rest
diff --git
a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
index 699275779d..fb670aee36 100644
---
a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
+++
b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
@@ -150,16 +150,16 @@ public class NettyHttpRoutes extends RouteBuilder {
from("netty-http:http://localhost:{{camel.netty-http.port}}/proxy;).setBody().constant("proxy");
rest("/rest")
-.get("/").to("direct:printMethod")
-.post("/").to("direct:printMethod")
-.put("/").to("direct:printMethod")
+.get("/").to("seda:printMethod")
+.post("/").to("seda:printMethod")
+.put("/").to("seda:printMethod")
.post("/json").bindingMode(RestBindingMode.json).consumes("application/json").type(UserPojo.class)
-.to("direct:printBody")
+.to("seda:printBody")
.post("/xml").bindingMode(RestBindingMode.xml).consumes("application/xml").type(UserPojo.class)
-.to("direct:printBody");
+.to("seda:printBody");
-from("direct:printMethod").setBody().header(RestConstants.HTTP_METHOD);
-from("direct:printBody").process(e -> {
+from("seda:printMethod").setBody().header(RestConstants.HTTP_METHOD);
+from("seda:printBody").process(e -> {
e.getIn().setHeader(Exchange.CONTENT_TYPE, "text/plain");
e.getIn().setBody(e.getIn().getBody(UserPojo.class).toString());
});
diff --git a/integration-tests/servlet/pom.xml
b/integration-tests/servlet/pom.xml
index bcee3b9655..97596d3a81 100644
--- a/integration-tests/servlet/pom.xml
+++ b/integration-tests/servlet/pom.xml
@@ -41,7 +41,7 @@
org.apache.camel.quarkus
-camel-quarkus-direct
+camel-quarkus-seda
org.apache.camel.quarkus
diff --git
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
index 2ca381f295..a7ca750adc 100644
---
a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
+++
b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
@@ -41,31 +41,31 @@ public class CamelRoute extends RouteBuilder {
rest()
.get("/rest-get")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.post("/rest-post")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.put("/rest-put")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.patch("/rest-patch")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.delete("/rest-delete")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.head("/rest-head")
-.to("direct:echoMethodPath");
+.to("seda:echoMethodPath");
from("servlet://hello?matchOnUriPrefix=true")
-.to("direct:echoMethodPath");
+
(camel-quarkus) 23/27: Micrometer more debug logging 02
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 77a3680a3c937e170a778d0d04813f9b95185730
Author: JiriOndrusek
AuthorDate: Wed Mar 13 14:30:34 2024 +0100
Micrometer more debug logging 02
---
.../quarkus/component/micrometer/it/MicrometerResource.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 4e5cb3067a..4eafe512bf 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -185,6 +185,15 @@ public class MicrometerResource {
if (service.getMeterRegistry() instanceof CompositeMeterRegistry) {
LOG.info("composite registry from " + ((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries());
}
+LOG.info("Searching for the `camel.routes.added` in single
registries.");
+((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries().forEach(mr -> {
+Optional o = mr.getMeters().stream().filter(m ->
m.getId().getName().equals("camel.routes.added")).findAny();
+LOG.info("`camel.routes.added` present in " + mr + ": " +
o.isPresent());
+if (o.isPresent()) {
+LOG.info(" with value " +
o.get().measure().iterator().next());
+}
+});
+
Optional om = service.getMeterRegistry().getMeters().stream()
.filter(m ->
m.getId().getName().contains("camel.routes.added")).findFirst();
LOG.info("meter `camel.routes.added` " + om.get());
(camel-quarkus) 19/27: Formating fix
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 141d2d869c80ed75ec9e9005f3719608a37485e9
Author: JiriOndrusek
AuthorDate: Tue Mar 12 13:47:01 2024 +0100
Formating fix
---
.../org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index 66320eb929..55cda48300 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -41,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
class MicrometerTest extends AbstractMicrometerTest {
private static final Logger LOG = Logger.getLogger(MicrometerTest.class);
+
@Test
public void testMicrometerMetricsCounter() throws Exception {
RestAssured.get("/micrometer/counter/0")
(camel-quarkus) 07/27: fixed kamelet #5849
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 71d3b812913b9e32d9d344eb9cb5b094a4c116b2
Author: JiriOndrusek
AuthorDate: Fri Mar 8 14:56:55 2024 +0100
fixed kamelet #5849
---
.../camel/quarkus/component/kamelet/deployment/KameletProcessor.java | 5 +
.../org/apache/camel/quarkus/component/kamelet/KameletRecorder.java | 5 +
2 files changed, 10 insertions(+)
diff --git
a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
index 1b9ea1f1c1..1bd217b289 100644
---
a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
+++
b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
@@ -130,6 +130,11 @@ class KameletProcessor {
resource.setLocation(originalResource.getLocation());
resource.setExists(originalResource.exists());
definition.setResource(resource);
+//remove references to camelContext
https://github.com/apache/camel-quarkus/issues/5849
+definition.setCamelContext(null);
+if (definition.getRoute() != null &&
definition.getRoute().getOutputs() != null) {
+definition.getRoute().getOutputs().forEach(o ->
o.setCamelContext(null));
+}
});
return new CamelContextCustomizerBuildItem(
diff --git
a/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
b/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
index 98499932ed..b431298fc0 100644
---
a/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
+++
b/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
@@ -58,6 +58,11 @@ public class KameletRecorder {
}
}
}
+//return references to camelContext
https://github.com/apache/camel-quarkus/issues/5849
+definition.setCamelContext(context);
+if (definition.getRoute() != null &&
definition.getRoute().getOutputs() != null) {
+definition.getRoute().getOutputs().forEach(o ->
o.setCamelContext(context));
+}
}
context.getCamelContextExtension().getContextPlugin(Model.class).addRouteTemplateDefinitions(definitions);
} catch (Exception e) {
(camel-quarkus) 08/27: fixed Rest - inlining requires unique routes
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 41dd865b46591f5fb98f7bd2d6236597312b0581
Author: JiriOndrusek
AuthorDate: Fri Mar 8 15:09:21 2024 +0100
fixed Rest - inlining requires unique routes
---
integration-tests/rest/pom.xml | 4
.../quarkus/component/rest/it/RestRoutes.java | 26 +++---
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/integration-tests/rest/pom.xml b/integration-tests/rest/pom.xml
index a9d407008a..de76b46bbe 100644
--- a/integration-tests/rest/pom.xml
+++ b/integration-tests/rest/pom.xml
@@ -59,6 +59,10 @@
org.apache.camel.quarkus
camel-quarkus-rest
+
+org.apache.camel.quarkus
+camel-quarkus-seda
+
io.quarkus
quarkus-resteasy-jsonb
diff --git
a/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
b/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
index ea6254c9a7..4bd328713c 100644
---
a/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
+++
b/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
@@ -42,29 +42,29 @@ public class RestRoutes extends RouteBuilder {
rest("/rest")
.delete()
.produces("text/plain")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.get()
.produces("text/plain")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.head()
-.to("direct:contentTypeText")
+.to("seda:contentTypeText")
.patch()
.consumes("text/plain")
.produces("text/plain")
-.to("direct:echoBodyPath")
+.to("seda:echoBodyPath")
.post()
.consumes("text/plain")
.produces("text/plain")
-.to("direct:echoBodyPath")
+.to("seda:echoBodyPath")
.put()
.consumes("text/plain")
.produces("text/plain")
-.to("direct:echoBodyPath")
+.to("seda:echoBodyPath")
.post("/validation")
.clientRequestValidation(true)
@@ -81,7 +81,7 @@ public class RestRoutes extends RouteBuilder {
.bindingMode(RestBindingMode.json)
.type(Person.class)
.produces(MediaType.TEXT_PLAIN)
-.to("direct:personString")
+.to("seda:personString")
.get("/binding/json/producer")
.to("direct:personJson")
@@ -90,7 +90,7 @@ public class RestRoutes extends RouteBuilder {
.bindingMode(RestBindingMode.xml)
.type(Person.class)
.produces(MediaType.TEXT_PLAIN)
-.to("direct:personString")
+.to("seda:personString")
.get("/binding/xml/producer")
.to("direct:personXml")
@@ -99,15 +99,15 @@ public class RestRoutes extends RouteBuilder {
.to("direct:hello")
.verb("head", "/custom/verb")
-.to("direct:contentTypeText")
+.to("seda:contentTypeText")
.post("/multipart/upload")
.to("direct:processAttachments");
-from("direct:echoMethodPath")
+from("seda:echoMethodPath")
.setBody().simple("${header.CamelHttpMethod}:
${header.CamelHttpPath}");
-from("direct:echoBodyPath")
+from("seda:echoBodyPath")
.setBody().simple("${body}: ${header.CamelHttpPath}");
from("direct:greetWithBody")
@@ -119,7 +119,7 @@ public class RestRoutes extends RouteBuilder {
from("direct:hello")
.log("Hello ${body}");
-from("direct:personString")
+from("seda:personString")
.setHeader(Exchange.CONTENT_TYPE, constant("text/plain"))
.setBody().simple("Name: ${body.firstName} ${body.lastName},
Age: ${body.age}");
@@ -129,7 +129,7 @@ public class RestRoutes extends RouteBuilder {
from("direct:personXml")
.setBody().constant(PERSON_XML);
-from("direct:contentTypeText")
+from("seda:contentTypeText")
.setHeader(Exchange.CONTENT_TYPE).constant("text/plain");
from("direct:processAttachments")
(camel-quarkus) 02/27: Fix catalog JSON resolution in native mode
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ec8754bddd493c623840042220ed2842d5813191
Author: James Netherton
AuthorDate: Fri Mar 8 08:48:10 2024 +
Fix catalog JSON resolution in native mode
---
docs/modules/ROOT/pages/reference/extensions/core.adoc| 8
.../quarkus/core/deployment/CamelNativeImageProcessor.java| 7 ++-
.../main/java/org/apache/camel/quarkus/core/CamelConfig.java | 11 +++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc
b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index 014d098b7d..4ca4a1b84c 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc
@@ -208,6 +208,14 @@ Setting this to `false` helps to reduce the size of the
native image. In JVM mod
| `boolean`
| `true`
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.runtime-catalog.transformers]]`link:#quarkus.camel.runtime-catalog.transformers[quarkus.camel.runtime-catalog.transformers]`
+
+If `true` the Runtime Camel Catalog embedded in the application will contain
JSON schemas of Camel transformers available in the application; otherwise
transformer JSON schemas will not be available in the Runtime Camel Catalog and
any attempt to access those will result in a RuntimeException.
+
+Setting this to `false` helps to reduce the size of the native image. In JVM
mode, there is no real benefit of setting this flag to `false` except for
making the behavior consistent with native mode.
+| `boolean`
+| `true`
+
|icon:lock[title=Fixed at build time]
[[quarkus.camel.routes-discovery.enabled]]`link:#quarkus.camel.routes-discovery.enabled[quarkus.camel.routes-discovery.enabled]`
Enable automatic discovery of routes during static initialization.
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java
index 3319d86b62..4711587b18 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java
@@ -44,6 +44,7 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.impl.engine.DefaultDataFormatResolver;
import org.apache.camel.impl.engine.DefaultLanguageResolver;
+import org.apache.camel.impl.engine.DefaultTransformerResolver;
import org.apache.camel.quarkus.core.CamelConfig;
import org.apache.camel.quarkus.core.CamelConfig.ReflectionConfig;
import org.apache.camel.quarkus.core.CamelConfigFlags;
@@ -179,7 +180,7 @@ public class CamelNativeImageProcessor {
.forEach(service -> {
String packageName = getPackageName(service.type);
-String jsonPath = String.format("%s/%s.json",
packageName.replace('.', '/'), service.name);
+String jsonPath = String.format("META-INF/%s/%s.json",
packageName.replace('.', '/'), service.name);
if (config.runtimeCatalog.components
&&
service.path.startsWith(DefaultComponentResolver.RESOURCE_PATH)) {
@@ -193,6 +194,10 @@ public class CamelNativeImageProcessor {
&&
service.path.startsWith(DefaultLanguageResolver.LANGUAGE_RESOURCE_PATH)) {
resources.add(new
NativeImageResourceBuildItem(jsonPath));
}
+if (config.runtimeCatalog.transformers
+&&
service.path.startsWith(DefaultTransformerResolver.DATA_TYPE_TRANSFORMER_RESOURCE_PATH))
{
+resources.add(new
NativeImageResourceBuildItem(jsonPath));
+}
});
if (config.runtimeCatalog.models) {
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
index a03ca09958..7ba39b5430 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
@@ -339,6 +339,17 @@ public class CamelConfig {
*/
@ConfigItem(defaultValue = "true")
public boolean models;
+
+/**
+ * If {@code true} the Runtime Camel Catalog embedded in the
application will contain JSON schemas of Camel
+ * transformers available in the application;
(camel-quarkus) 06/27: Fix failing CamelBeansUnremovableTest tests
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2dfe3dc07d86aac982780c23b7d509619ef661a8
Author: James Netherton
AuthorDate: Fri Mar 8 13:33:11 2024 +
Fix failing CamelBeansUnremovableTest tests
---
.../camel/quarkus/core/runtime/CamelBeansUnremovableTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
index 80b6382891..ecd7d2896c 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
@@ -39,15 +39,15 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class CamelBeansUnremovableTest {
-static final String RESSOURCE_PATH =
"org/apache/camel/quarkus/core/runtime/"
+static final String RESOURCE_PATH =
"META-INF/org/apache/camel/quarkus/core/runtime/"
+ CamelBeansUnremovableTest.class.getSimpleName();
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-.addAsResource("custom-component.json", RESSOURCE_PATH +
"/custom-component.json")
-.addAsResource("custom-dataformat.json", RESSOURCE_PATH +
"/custom-dataformat.json")
-.addAsResource("custom-language.json", RESSOURCE_PATH +
"/custom-language.json"));
+.addAsResource("custom-component.json", RESOURCE_PATH +
"/custom-component.json")
+.addAsResource("custom-dataformat.json", RESOURCE_PATH +
"/custom-dataformat.json")
+.addAsResource("custom-language.json", RESOURCE_PATH +
"/custom-language.json"));
@Inject
CamelContext context;
(camel-quarkus) branch camel-main updated (883869c528 -> 9366f605c4)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 883869c528 Fixed compilation (requires CAMEL-20566) + generated files discard 62d4e040d9 Fixed micrometer in JVM because of CAMEL-20525 discard 1de0b99a9c Generated files discard 34a713fcba Micrometer more debug logging 02 discard 55b5404a8b Add Qdrant JVM only extension #5860 discard 53c1d7c000 Micrometer more debug logging discard a72c1b6e89 Fix path to custom component JSON metadata discard 56bbf1f341 Formating fix discard cb7322a9cd Micrometer logging for CI debugging purposes discard 9367f13cdb Fixed openapi-kava, get rid of v2, because of CAMEL-20488 discard a062e3a02b Fixed main-yaml - inlining requires unique routes, partialy fixed openapi-java discard 3896c8a906 fixed servlet and http - inlining requires unique routes, partialy fixed openapi-java discard d03751423f Fixed micrometer because of CAMEL-20461 discard 1b152651f1 Fixed shiro after update of dependency discard 496ef62d9b generated files discard 9752499d3d Fixed shiro copilation issue + generated tests discard 8d4badf609 Include dev-consoles into camel-catalog discard f91f81c544 Fixed latform http - inlining requires unique routes, partialy fixed openapi-java discard 98b8646abf fixed Rest - inlining requires unique routes discard bc2eb8f3ce fixed kamelet #5849 discard d59d68b992 Fix failing CamelBeansUnremovableTest tests discard 9f8dd7decb generated files discard 4b93044006 Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466 discard 11bbb3f619 fixed slack because of CAMEL-20464 discard 86544d1ea5 Fix catalog JSON resolution in native mode discard 365997ddce Upgrade Camel to 4.5.0 add bf83bbac89 Upgrade to Quarkus CXF 3.8.1 (#5877) add ca946ac6e4 Upgrade Camel to 4.4.1 add ba2beaa507 Upgrade quarkus-jgit to 3.1.0 add 87b7a8a33d Upgrade Quarkus to 3.9.0.CR2 add 0c557ca73f Switch from org.graalvm.sdk:graal-sdk to org.graalvm.sdk:nativeimage add ea602f92cb Revert "Disable java-joor-dsl tests on Windows due to #5872" add 8dc7b7444d Revert "Disable jsh-dsl tests on Windows due to #5873" new 364ada0a31 Upgrade Camel to 4.5.0 new ec8754bddd Fix catalog JSON resolution in native mode new 07c72f8af5 fixed slack because of CAMEL-20464 new 8f8fcaa85b Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466 new 320eab7418 generated files new 2dfe3dc07d Fix failing CamelBeansUnremovableTest tests new 71d3b81291 fixed kamelet #5849 new 41dd865b46 fixed Rest - inlining requires unique routes new 7e5afeae40 Fixed latform http - inlining requires unique routes, partialy fixed openapi-java new 623e27d2d0 Include dev-consoles into camel-catalog new aaf63464d5 Fixed shiro copilation issue + generated tests new cc049a2a0c generated files new 1008512315 Fixed shiro after update of dependency new ee3e02467c Fixed micrometer because of CAMEL-20461 new d03949f069 fixed servlet and http - inlining requires unique routes, partialy fixed openapi-java new 8858bae3e6 Fixed main-yaml - inlining requires unique routes, partialy fixed openapi-java new 2000903760 Fixed openapi-kava, get rid of v2, because of CAMEL-20488 new 8af9f4baf9 Micrometer logging for CI debugging purposes new 141d2d869c Formating fix new b8a8e2359d Fix path to custom component JSON metadata new 1476d05a74 Micrometer more debug logging new 3bb499707a Add Qdrant JVM only extension #5860 new 77a3680a3c Micrometer more debug logging 02 new 8527cc0020 Fixed micrometer in JVM because of CAMEL-20525 new 3d200eb70e Fixed compilation (requires CAMEL-20566) + generated files new dc982891a4 Rebased + generated files new 9366f605c4 Fixed micrometer in native because of CAMEL-20525 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (883869c528) \ N -- N -- N refs/heads/camel-main (9366f605c4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 27 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: docs/antora.yml| 2 +-
Re: [PR] CAMEL-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526375296
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +233,23 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering() &&
(Objects.isNull(getConfiguration().getSubQueue()) ||
Review Comment:
so something like
```
(ObjectHelper.isEmpty(getConfiguration().getSubQueue()) ||
ObjectHelper.equal(getConfiguration().getSubQueue(), SubQueue.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
Re: [PR] CAMEL-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526375296
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +233,23 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering() &&
(Objects.isNull(getConfiguration().getSubQueue()) ||
Review Comment:
so something like
`(ObjectHelper.isEmpty(getConfiguration().getSubQueue())
||ObjectHelper.equal(getConfiguration().getSubQueue(), SubQueue.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
Re: [PR] CAMEL-20565 - Azure servicebus dead-lettering [camel]
oscerd commented on PR #13507:
URL: https://github.com/apache/camel/pull/13507#issuecomment-1999783091
> Is there a way to write a test to cover this "onFailure" part ?
>
> for now I'm manully testing with route like:
>
> ```
> public static final String AZURE_SERVICE_BUS_COMPONENT =
"azure-servicebus";
> @Override
> public void configure() {
> String subscription = "test-scr";
> String inputTopic = "test";
> fromF("%s:%s?subscriptionName=%s=true",
AZURE_SERVICE_BUS_COMPONENT, inputTopic, subscription)
> .routeId("routeTestId")
> .throwException(new Exception("test failure"))
> .log("${body}");
>
> }
> ```
In this component we are only using integration tests, so you could have a
look at ServiceBusConsumerTest and write a similar tests with this option
enabled, but you'll need a real Azure Servicebus queue/topic.
--
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] Revert camel-quarkus-version remove from PR apache#1157 [camel-k-runtime]
gansheer closed pull request #1170: Revert camel-quarkus-version remove from PR apache#1157 URL: https://github.com/apache/camel-k-runtime/pull/1170 -- 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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526368465
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +233,23 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering() &&
(Objects.isNull(getConfiguration().getSubQueue()) ||
Review Comment:
ok thanks I'll check.
First time here so happy discover new things
--
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-20565 - Azure servicebus dead-lettering [camel]
oscerd commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526365686
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +233,23 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering() &&
(Objects.isNull(getConfiguration().getSubQueue()) ||
Review Comment:
You can use also ObjectHelper from camel-utils to be aligned with the
codebase
--
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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on PR #13507:
URL: https://github.com/apache/camel/pull/13507#issuecomment-1999772163
Is there a way to write a test to cover this "onFailure" part ?
for now I'm manully testing with route like:
```
public static final String AZURE_SERVICE_BUS_COMPONENT =
"azure-servicebus";
@Override
public void configure() {
String subscription = "test-scr";
String inputTopic = "test";
fromF("%s:%s?subscriptionName=%s=true",
AZURE_SERVICE_BUS_COMPONENT, inputTopic, subscription)
.routeId("routeTestId")
.throwException(new Exception("test failure"))
.log("${body}");
}
```
--
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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526356686
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
I've added the check
`Objects.isNull(getConfiguration().getSubQueue()) ||
getConfiguration().getSubQueue().equals(SubQueue.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
Re: [PR] CAMEL-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526321406
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
I've just removed my precedent comment as it was not correct.
According to the [Azure ServiceBus
documentation](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-dead-letter-queues)
"Azure Service Bus queues and topic subscriptions provide a secondary
subqueue, called a dead-letter queue"
So every queue or subscription has a deadletter.
but you are right, if the consumer is already consuming subqueue, we cannot
deadletter the message. So I need to check if the subQueue option is set
--
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-20565 - Azure servicebus dead-lettering [camel]
oscerd commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526323687
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
Yes, that was what I meant.
--
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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526321406
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
I've just removed my precedent comment as it was not correct.
According to the [Azure ServiceBus
documentation](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-dead-letter-queues)
"Azure Service Bus queues and topic subscriptions provide a secondary
subqueue, called a dead-letter queue"
So every queue or subscription has a deadletter.
but you are right, is the consumer is already consuming subqueue, we cannot
deadletter the message. So I need to check if the subQueue option is set
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-spring-boot) branch CAMEL-20572 deleted (was f96d50ad87a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20572 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was f96d50ad87a CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus - Added test 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-spring-boot) branch main updated: CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus (#1108)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 4eb78e0bb95 CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus
(#1108)
4eb78e0bb95 is described below
commit 4eb78e0bb95afc784dbe99b33b943fa7b3825a89
Author: Andrea Cosentino
AuthorDate: Fri Mar 15 14:46:45 2024 +0100
CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus (#1108)
* CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus
Signed-off-by: Andrea Cosentino
* CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus - Added test
Signed-off-by: Andrea Cosentino
-
Signed-off-by: Andrea Cosentino
---
.../camel/springboot/catalog/components.properties | 1 +
.../springboot/catalog/components/milvus.json | 51 ++
components-starter/camel-milvus-starter/pom.xml| 56 ++
.../camel-milvus-starter/src/main/docs/milvus.json | 75
.../MilvusComponentAutoConfiguration.java | 77
.../springboot/MilvusComponentConfiguration.java | 135 ++
.../springboot/MilvusComponentConverter.java | 63 +++
.../src/main/resources/META-INF/LICENSE.txt| 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++
components-starter/pom.xml | 1 +
.../camel/itest/springboot/CamelMilvusTest.java| 46 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 10 +
14 files changed, 753 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 336fa79e687..e545f198803 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -219,6 +219,7 @@ mapstruct
master
metrics
micrometer
+milvus
mina
minio
mllp
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milvus.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milvus.json
new file mode 100644
index 000..8c96c01c46b
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milvus.json
@@ -0,0 +1,51 @@
+{
+ "component": {
+"kind": "component",
+"name": "milvus",
+"title": "Milvus",
+"description": "Perform operations on the Milvus Vector Database.",
+"deprecated": false,
+"firstVersion": "4.5.0",
+"label": "database,ai",
+"javaType": "org.apache.camel.component.milvus.MilvusComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-milvus-starter",
+"version": "4.5.0-SNAPSHOT",
+"scheme": "milvus",
+"extendsScheme": "",
+"syntax": "milvus:collection",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType": "org.apache.camel.component.milvus.MilvusConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
configuration;" },
+"host": { "index": 1, "kind": "property", "displayName": "Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "localhost", "configurationClass":
"org.apache.camel.component.milvus.MilvusConfiguration", "configurationField":
"configuration", "description": "The host to connect to." },
+"lazyStartProducer": { "index": 2, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"port": { "index": 3, "kind": "property", "displayName": "Port",
[PR] CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus [camel-spring-boot]
oscerd opened a new pull request, #1108: URL: https://github.com/apache/camel-spring-boot/pull/1108 (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
Re: [PR] CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus [camel-spring-boot]
oscerd merged PR #1108: URL: https://github.com/apache/camel-spring-boot/pull/1108 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) 01/02: CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20572
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit edbc2d86cdf477425bffd1c2b5696c541a05d8b1
Author: Andrea Cosentino
AuthorDate: Fri Mar 15 14:43:58 2024 +0100
CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus
Signed-off-by: Andrea Cosentino
---
.../camel/springboot/catalog/components.properties | 1 +
.../springboot/catalog/components/milvus.json | 51 ++
components-starter/camel-milvus-starter/pom.xml| 56 ++
.../camel-milvus-starter/src/main/docs/milvus.json | 75
.../MilvusComponentAutoConfiguration.java | 77
.../springboot/MilvusComponentConfiguration.java | 135 ++
.../springboot/MilvusComponentConverter.java | 63 +++
.../src/main/resources/META-INF/LICENSE.txt| 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 10 +
13 files changed, 707 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 336fa79e687..e545f198803 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -219,6 +219,7 @@ mapstruct
master
metrics
micrometer
+milvus
mina
minio
mllp
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milvus.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milvus.json
new file mode 100644
index 000..8c96c01c46b
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milvus.json
@@ -0,0 +1,51 @@
+{
+ "component": {
+"kind": "component",
+"name": "milvus",
+"title": "Milvus",
+"description": "Perform operations on the Milvus Vector Database.",
+"deprecated": false,
+"firstVersion": "4.5.0",
+"label": "database,ai",
+"javaType": "org.apache.camel.component.milvus.MilvusComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-milvus-starter",
+"version": "4.5.0-SNAPSHOT",
+"scheme": "milvus",
+"extendsScheme": "",
+"syntax": "milvus:collection",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType": "org.apache.camel.component.milvus.MilvusConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
configuration;" },
+"host": { "index": 1, "kind": "property", "displayName": "Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "localhost", "configurationClass":
"org.apache.camel.component.milvus.MilvusConfiguration", "configurationField":
"configuration", "description": "The host to connect to." },
+"lazyStartProducer": { "index": 2, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"port": { "index": 3, "kind": "property", "displayName": "Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"int", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "defaultValue": 19530, "configurationClass":
"org.apache.camel.component.milvus.MilvusConfiguration", "configurationField":
"configuration", "description": "The port to connect to." },
+"timeout": { "index": 4, "kind": "property", "displayName": "Timeout",
"group": "producer", "label": "", "required": false, "type":
(camel-spring-boot) branch CAMEL-20572 created (now f96d50ad87a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20572 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at f96d50ad87a CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus - Added test This branch includes the following new commits: new edbc2d86cdf CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus new f96d50ad87a CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus - Added test 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.
(camel-spring-boot) 02/02: CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus - Added test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20572
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit f96d50ad87a5d08cd7f5dcd384ae8fa2b47f9b86
Author: Andrea Cosentino
AuthorDate: Fri Mar 15 14:46:12 2024 +0100
CAMEL-20572 - Add Spring Boot Starter for Camel-Milvus - Added test
Signed-off-by: Andrea Cosentino
---
.../camel/itest/springboot/CamelMilvusTest.java| 46 ++
1 file changed, 46 insertions(+)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMilvusTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMilvusTest.java
new file mode 100644
index 000..6fa48cc175e
--- /dev/null
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMilvusTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class CamelMilvusTest extends AbstractSpringBootTestSupport {
+
+@Deployment
+public static Archive createSpringBootPackage() throws Exception {
+return ArquillianPackager.springBootPackage(createTestConfig());
+}
+
+public static ITestConfig createTestConfig() {
+return new ITestConfigBuilder()
+.module(inferModuleName(CamelMilvusTest.class))
+.build();
+}
+
+@Test
+public void componentTests() throws Exception {
+this.runComponentTest(config);
+}
+
+}
Re: [PR] CAMEL-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526307224
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
Yes your're right, thanks for the feedback.
--
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-20565 - Azure servicebus dead-lettering [camel]
romain-pfund commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526307224
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
Yes your're right, thanks for the feedback.
--
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-20565 - Azure servicebus dead-lettering [camel]
oscerd commented on code in PR #13507:
URL: https://github.com/apache/camel/pull/13507#discussion_r1526298481
##
components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java:
##
@@ -228,8 +232,21 @@ public void onFailure(Exchange exchange) {
if (cause != null) {
getExceptionHandler().handleException("Error during processing
exchange.", exchange, cause);
}
+
if (!getConfiguration().isDisableAutoComplete()) {
-
clientWrapper.abandon(message).subscribeOn(Schedulers.boundedElastic()).subscribe();
+if (getConfiguration().isEnableDeadLettering()) {
Review Comment:
I think you need also to double check if there is actually a subqueue in
your client instance.
--
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] jt400: extend test coverage [camel-quarkus]
JiriOndrusek opened a new pull request, #5884: URL: https://github.com/apache/camel-quarkus/pull/5884 Upstream PR: https://github.com/apache/camel-quarkus/pull/5883 cherry-picked: c985751f382538d88339ca4869c4f88ed0bc0260 -- 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 (414dec26d20 -> e968db75767)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 414dec26d20 Regen for commit 7cdbf9b72e2ac10fbdd5c45c328c89553ea6a8c9 add e68c563ba85 Regen for commit 9706c2a2aa8511a90abdc94376d00db2e8db3218 (#13506) add e968db75767 Regen for commit 7cdbf9b72e2ac10fbdd5c45c328c89553ea6a8c9 (#13508) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (414dec26d20) \ N -- N -- N refs/heads/regen_bot (e968db75767) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(camel) branch camel-4.4.x updated: CAMEL-20517 camel-jbang-plugin-k doesn't recognize command (#13397)
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 22bd4374faf CAMEL-20517 camel-jbang-plugin-k doesn't recognize command
(#13397)
22bd4374faf is described below
commit 22bd4374fafd3043f22e212061a21679f3c4938a
Author: Claudio Miranda
AuthorDate: Tue Mar 12 11:26:17 2024 -0300
CAMEL-20517 camel-jbang-plugin-k doesn't recognize command (#13397)
(cherry picked from commit cc8a3f85356a535e2a5dc2c6c5326607c30aea24)
---
.../camel/dsl/jbang/core/common/PluginHelper.java | 127 +++--
1 file changed, 43 insertions(+), 84 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
index 303cbce1574..0470aad1cc2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
@@ -20,19 +20,22 @@ package org.apache.camel.dsl.jbang.core.common;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Optional;
+import java.util.Properties;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.catalog.CamelCatalog;
-import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.apache.camel.catalog.VersionHelper;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.impl.engine.DefaultFactoryFinder;
+import org.apache.camel.main.download.DependencyDownloader;
+import org.apache.camel.main.download.DependencyDownloaderClassLoader;
+import org.apache.camel.main.download.MavenDependencyDownloader;
import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.support.ObjectHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.json.JsonObject;
import org.apache.camel.util.json.Jsoner;
@@ -73,95 +76,51 @@ public final class PluginHelper {
String command = properties.getOrDefault("command",
name).toString();
Optional plugin =
FACTORY_FINDER.newInstance("camel-jbang-plugin-" + command, Plugin.class);
+if (plugin.isEmpty()) {
+plugin = downloadPlugin(command, main);
+}
if (plugin.isPresent()) {
plugin.get().customize(commandLine, main);
} else {
-String description =
properties.getOrDefault("description", "").toString();
-String dependency = properties.getOrDefault("dependency",
-
"org.apache.camel:camel-jbang-plugin-%s:${camel-version}".formatted(command)).toString();
-createSubCommand(commandLine, name, command, dependency,
description, main);
+main.getOut().println("camel-jbang-plugin-" + command + "
not found. Exit");
+main.quit(1);
}
}
}
}
-/**
- * Create sub-command as a placeholder for calling a plugin. When the
command gets executed the plugin is added to
- * the classpath and a new JBang process is spawned with the same
arguments. The factory finder mechanism will be
- * able to resolve the actual plugin from the classpath so the real plugin
command is run.
- *
- * @param commandLine to receive the new command
- * @param namethe plugin name
- * @param command the plugin command
- * @param dependency the Maven dependency for the plugin
- * @param description optional description of the plugin command
- * @param maincurrent Camel JBang main
- */
-private static void createSubCommand(
-CommandLine commandLine, String name, String command,
-String dependency, String description, CamelJBangMain main) {
-commandLine.addSubcommand(command,
CommandLine.Model.CommandSpec.wrapWithoutInspection(
-(Runnable) () -> {
-List args =
commandLine.getParseResult().originalArgs();
-if (args.contains("--help") || args.contains("--h")) {
-main.getOut().printf("Loading plugin %s for command
%s%n", name, command);
-}
-
-String gav = dependency;
-if (gav.endsWith(":${camel-version}")) {
-gav = gav.substring(0, gav.length() -
