[camel-spring-boot] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 0ea315b2cab Regen 0ea315b2cab is described below commit 0ea315b2cabf3afc011d14768f5b03a50e41d558 Author: Claus Ibsen AuthorDate: Tue Apr 25 06:19:24 2023 +0200 Regen --- .../springboot/catalog/components/aws2-sns.json| 4 .../src/main/docs/aws2-sns.json| 13 +++ .../sns/springboot/Sns2ComponentConfiguration.java | 27 ++ 3 files changed, 44 insertions(+) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json index d53a9fd732e..0e78a394175 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json @@ -32,6 +32,7 @@ "messageStructure": { "kind": "property", "displayName": "Message Structure", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The message structure to use such as json" }, "overrideEndpoint": { "kind": "property", "displayName": "Override Endpoint", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpoi [...] "policy": { "kind": "property", "displayName": "Policy", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "The policy for this topic. Is loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource [...] +"profileCredentialsName": { "kind": "property", "displayName": "Profile Credentials Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "If using a profile credentials provider this parameter will set the profile name" }, "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SNS client" }, "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SNS client" }, "proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating t [...] @@ -43,6 +44,7 @@ "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField": "configuration", "description": "If we want to trust
[GitHub] [camel-karavan] davsclaus commented on issue #745: Run or export integration failed on VS code (windows)
davsclaus commented on issue #745: URL: https://github.com/apache/camel-karavan/issues/745#issuecomment-1521130478 Okay but I think @mgubaidullin should make karavan use single quotes on the command to make it work out of the box on windows. Or in general. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] chander35 commented on issue #4264: Failed to fetch data from Mysql database using camel-k
chander35 commented on issue #4264: URL: https://github.com/apache/camel-k/issues/4264#issuecomment-1521126021 The problem has resolved as i exposed default port for mysql (3306). once i used different command to install mysql in my docker it started working (docker run --name some-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] chander35 closed issue #4264: Failed to fetch data from Mysql database using camel-k
chander35 closed issue #4264: Failed to fetch data from Mysql database using camel-k URL: https://github.com/apache/camel-k/issues/4264 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new b31a132d25 Updated CHANGELOG.md b31a132d25 is described below commit b31a132d256f5f8d0b0c8d7582ece135e53e0d87 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Apr 25 03:17:18 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2932b5f1d2..9093948f1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Snmp: add native support [\#4820](https://github.com/apache/camel-quarkus/issues/4820) +- FHIR integration test native image build fails [\#4811](https://github.com/apache/camel-quarkus/issues/4811) - \[camel-main\] Add `quarkus-jackson-jq-extra` to jq extension runtime module dependencies [\#4799](https://github.com/apache/camel-quarkus/issues/4799) - Smnp: Extend test coverage [\#4797](https://github.com/apache/camel-quarkus/issues/4797) - Test OpenTelemetry extension integration with `opentelemetry-jdbc` [\#4789](https://github.com/apache/camel-quarkus/issues/4789) @@ -16,12 +18,15 @@ **Merged pull requests:** +- Upgrade Cyclonedx Maven Plugin to version 2.7.7 [\#4824](https://github.com/apache/camel-quarkus/pull/4824) ([oscerd](https://github.com/oscerd)) - Generated sources regen for SBOM [\#4819](https://github.com/apache/camel-quarkus/pull/4819) ([github-actions[bot]](https://github.com/apps/github-actions)) - Bump quarkiverse-pooled-jms.version from 2.0.0.CR2 to 2.0.0 [\#4818](https://github.com/apache/camel-quarkus/pull/4818) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Improve handling of optional FHIR schematron and hapi-fhir-server dependencies [\#4817](https://github.com/apache/camel-quarkus/pull/4817) ([jamesnetherton](https://github.com/jamesnetherton)) - Upgrade cassandra-quarkus to 1.2.0 [\#4815](https://github.com/apache/camel-quarkus/pull/4815) ([jamesnetherton](https://github.com/jamesnetherton)) - Bump quarkus-artemis-bom from 3.0.0.CR1 to 3.0.0 [\#4814](https://github.com/apache/camel-quarkus/pull/4814) ([dependabot[bot]](https://github.com/apps/dependabot)) - Snmp: Extend test coverage \#4797 [\#4813](https://github.com/apache/camel-quarkus/pull/4813) ([JiriOndrusek](https://github.com/JiriOndrusek)) - Add camel-cli-connector extension. [\#4812](https://github.com/apache/camel-quarkus/pull/4812) ([zbendhiba](https://github.com/zbendhiba)) +- Upgrade quarkus-qpid-jms to 2.0.0 [\#4810](https://github.com/apache/camel-quarkus/pull/4810) ([zhfeng](https://github.com/zhfeng)) - Add a limitation doc about pooling support for camel-quarkus-amqp [\#4809](https://github.com/apache/camel-quarkus/pull/4809) ([zhfeng](https://github.com/zhfeng)) - Bump quarkiverse-freemarker.version from 1.0.0.Alpha2 to 1.0.0 [\#4804](https://github.com/apache/camel-quarkus/pull/4804) ([dependabot[bot]](https://github.com/apps/dependabot)) - Upgrade to quarkus-cxf 2.0.1, test for \#4746 [\#4803](https://github.com/apache/camel-quarkus/pull/4803) ([ppalaga](https://github.com/ppalaga))
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 17bc6b55 Updated CHANGELOG.md 17bc6b55 is described below commit 17bc6b557ce688b007df9d00b2379c9f1052fb67 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Apr 25 03:04:53 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 527088cb..7f917b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Merged pull requests:** +- build\(deps\): bump maven-checkstyle-plugin from 3.2.1 to 3.2.2 [\#1012](https://github.com/apache/camel-k-runtime/pull/1012) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump groovy-version from 3.0.16 to 3.0.17 [\#1009](https://github.com/apache/camel-k-runtime/pull/1009) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump maven-resources-plugin from 3.3.0 to 3.3.1 [\#1005](https://github.com/apache/camel-k-runtime/pull/1005) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump maven-deploy-plugin from 3.1.0 to 3.1.1 [\#1004](https://github.com/apache/camel-k-runtime/pull/1004) ([dependabot[bot]](https://github.com/apps/dependabot))
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1521091727 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 4792980362-1097-9b368297-aebe-48de-9c20-4150dbc78f4c * Camel Quarkus Commit: 022f2bfd220e9bb8ede5887c71c954b89faaa9fa * Quarkus Main Commit: e48dcbe74faaaefc78f26a1c78e2cd03c96a09cd * Link to build: https://github.com/apache/camel-quarkus/actions/runs/4792980362 -- 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] 28/33: Fix of upgrade jackson-jq
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 612bf46570cf98dade71a9ca0e5294683cbd3d4e Author: JiriOndrusek AuthorDate: Tue Apr 18 12:38:07 2023 +0200 Fix of upgrade jackson-jq --- poms/bom/pom.xml | 11 +++ poms/bom/src/main/generated/flattened-full-pom.xml| 11 +++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 11 +++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 11 +++ 4 files changed, 44 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5a67bad966..175342c9cc 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6199,6 +6199,12 @@ io.quarkiverse.jackson-jq quarkus-jackson-jq ${quarkiverse-jackson-jq.version} + + +jackson-jq +net.thisptr + + io.quarkiverse.jackson-jq @@ -6286,6 +6292,11 @@ smallrye-reactive-messaging-camel ${smallrye.reactive.messaging.camel.version} --> + +jackson-jq +net.thisptr +${jackson-jq-version} + jakarta.jms jakarta.jms-api diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ba9ce2d234..6d192e1117 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6097,6 +6097,12 @@ io.quarkiverse.jackson-jq quarkus-jackson-jq 2.0.0.Alpha + + +net.thisptr +jackson-jq + + io.quarkiverse.jackson-jq @@ -6179,6 +6185,11 @@ quarkus-tika-deployment 2.0.0 + +net.thisptr +jackson-jq +1.0.0-preview.20230409 + jakarta.jms jakarta.jms-api diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 00f9f89e2d..57dfbf63ec 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6112,6 +6112,12 @@ io.quarkiverse.jackson-jq quarkus-jackson-jq 2.0.0.Alpha + + +net.thisptr +jackson-jq + + io.quarkiverse.jackson-jq @@ -6194,6 +6200,11 @@ quarkus-tika-deployment 2.0.0 + +net.thisptr +jackson-jq +1.0.0-preview.20230409 + jakarta.jms jakarta.jms-api 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 bfd876a018..2f23100e65 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6097,6 +6097,12 @@ io.quarkiverse.jackson-jq quarkus-jackson-jq 2.0.0.Alpha + + +net.thisptr +jackson-jq + + io.quarkiverse.jackson-jq @@ -6179,6 +6185,11 @@ quarkus-tika-deployment 2.0.0 + +net.thisptr +jackson-jq +1.0.0-preview.20230409 + jakarta.jms jakarta.jms-api
[camel-quarkus] 05/33: Ref #1746: Groovy language native support
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d14c5f986a47945e8b312342b87b68b796594b15 Author: Nicolas Filotto AuthorDate: Wed Mar 22 16:58:08 2023 +0100 Ref #1746: Groovy language native support --- docs/modules/ROOT/examples/languages/groovy.yml| 6 +- .../ROOT/pages/reference/extensions/groovy.adoc| 22 ++- .../groovy/deployment/GroovyProcessor.java | 47 -- extensions-jvm/pom.xml | 1 - .../groovy/deployment/pom.xml | 8 + .../GroovyExpressionSourceBuildItem.java | 57 +++ .../groovy/deployment/GroovyProcessor.java | 176 + {extensions-jvm => extensions}/groovy/pom.xml | 2 +- .../groovy/runtime/pom.xml | 9 ++ .../groovy/runtime/src/main/doc/limitations.adoc | 3 + .../groovy/runtime/GroovyExpressionRecorder.java | 43 + .../groovy/runtime/GroovyStaticScript.java | 63 .../main/resources/META-INF/quarkus-extension.yaml | 0 extensions/pom.xml | 1 + integration-tests-jvm/pom.xml | 1 - .../groovy/pom.xml | 68 +++- .../quarkus/component/groovy/it/GroovyBean.java| 16 +- .../component/groovy/it/GroovyResource.java| 24 +++ .../quarkus/component/groovy/it/GroovyRoutes.java | 18 +++ .../groovy/src/main/resources/bean.txt | 4 + .../quarkus/component/groovy/it/GroovyIT.java | 21 +-- .../quarkus/component/groovy/it/GroovyTest.java| 43 - integration-tests/pom.xml | 1 + tooling/scripts/test-categories.yaml | 1 + 24 files changed, 550 insertions(+), 85 deletions(-) diff --git a/docs/modules/ROOT/examples/languages/groovy.yml b/docs/modules/ROOT/examples/languages/groovy.yml index 6a2a19afa1..5f8155df7b 100644 --- a/docs/modules/ROOT/examples/languages/groovy.yml +++ b/docs/modules/ROOT/examples/languages/groovy.yml @@ -2,11 +2,11 @@ # This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page cqArtifactId: camel-quarkus-groovy cqArtifactIdBase: groovy -cqNativeSupported: false -cqStatus: Preview +cqNativeSupported: true +cqStatus: Stable cqDeprecated: false cqJvmSince: 1.0.0 -cqNativeSince: n/a +cqNativeSince: 3.0.0 cqCamelPartName: groovy cqCamelPartTitle: Groovy cqCamelPartDescription: Evaluates a Groovy script. diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc index 45a56e1a12..e0c5ad48ed 100644 --- a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc @@ -5,17 +5,17 @@ :page-aliases: extensions/groovy.adoc :linkattrs: :cq-artifact-id: camel-quarkus-groovy -:cq-native-supported: false -:cq-status: Preview -:cq-status-deprecation: Preview +:cq-native-supported: true +:cq-status: Stable +:cq-status-deprecation: Stable :cq-description: Evaluate a Groovy script :cq-deprecated: false :cq-jvm-since: 1.0.0 -:cq-native-since: n/a +:cq-native-since: 3.0.0 ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##3.0.0## endif::[] Evaluate a Groovy script @@ -30,6 +30,10 @@ Please refer to the above link for usage and configuration details. [id="extensions-groovy-maven-coordinates"] == Maven coordinates +https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-groovy[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] + +Or add the coordinates to your existing project: + [source,xml] @@ -40,3 +44,11 @@ Please refer to the above link for usage and configuration details. 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::[] + +[id="extensions-groovy-camel-quarkus-limitations"] +== Camel Quarkus limitations + +Due to some limitations in GraalVM that prevent to execute even basic scripts in native mode, the compilation of the +Groovy expressions is made with the static compilation enabled which means that the types used in your expression must +be known at compile time. Please refer to the https://docs.groovy-lang.org/latest/html/documentation/core-semantics.html#static-type-checking[Groovy documentation for more details]. + diff --git a/extensions-jvm/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java
[camel-quarkus] 12/33: [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit e500bc4d11c5d6f8f756745b0769c7a5ff4c6d61 Author: JiriOndrusek AuthorDate: Wed Mar 29 14:18:43 2023 +0200 [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image) --- .../src/main/resources/wsdl/CalculatorService.wsdl | 332 ++--- .../cxf/soap/client/it/CxfSoapClientTest.java | 2 +- .../src/test/resources/mappings/oauth2.json| 2 +- 3 files changed, 168 insertions(+), 168 deletions(-) diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl index 43455b0449..b1ecbba142 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl +++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl @@ -1,173 +1,173 @@ http://www.w3.org/2001/XMLSchema; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/; xmlns:ns1="http://schemas.xmlsoap.org/soap/http; name="CalculatorService" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator;> - + --> -http://www.w3.org/2001/XMLSchema; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; version="1.0"> +http://www.w3.org/2001/XMLSchema; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; version="1.0"> - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -236,51 +236,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java index eeeb364ffb..61c49b1890 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java @@ -53,7 +53,7 @@ class CxfSoapClientTest {
[camel-quarkus] 21/33: camel-java-joor-dsl - Ease the way to get all the compiled classes
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f9970ae5a05b8b76fb5274a49d794339705806ef Author: Nicolas Filotto AuthorDate: Wed Apr 5 20:47:27 2023 +0200 camel-java-joor-dsl - Ease the way to get all the compiled classes --- .../java/joor/deployment/JavaJoorDslProcessor.java | 27 +- .../component/joor/deployment/JoorProcessor.java | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java b/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java index a34f0d8e87..ff3bf2c335 100644 --- a/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java +++ b/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java @@ -99,29 +99,14 @@ public class JavaJoorDslProcessor { .map(Objects::toString) .collect(Collectors.joining(System.getProperty("path.separator"); for (String className : result.getClassNames()) { +registerForReflection(reflectiveClass, lambdaCapturingTypeProducer, result.getClass(className)); +} +for (String className : result.getCompiledClassNames()) { +int index = className.indexOf("$"); +String outerClassName = index == -1 ? className : className.substring(0, index); generatedClass -.produce(new JavaJoorGeneratedClassBuildItem(className, nameToResource.get(className).getLocation(), +.produce(new JavaJoorGeneratedClassBuildItem(className, nameToResource.get(outerClassName).getLocation(), result.getByteCode(className))); -Class aClass = result.getClass(className); -// Inner classes -for (Class clazz : aClass.getDeclaredClasses()) { -String name = clazz.getName(); -generatedClass -.produce(new JavaJoorGeneratedClassBuildItem(name, nameToResource.get(className).getLocation(), -result.getByteCode(name))); -} -// Anonymous classes -for (int i = 1;; i++) { -String name = String.format("%s$%d", className, i); -byte[] content = result.getByteCode(name); -if (content == null) { -break; -} -generatedClass -.produce(new JavaJoorGeneratedClassBuildItem(name, nameToResource.get(className).getLocation(), -content)); -} -registerForReflection(reflectiveClass, lambdaCapturingTypeProducer, aClass); } } diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java index cb8c10df23..49a3e9c674 100644 --- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java +++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java @@ -144,7 +144,7 @@ class JoorProcessor { .flatMap(PathCollection::stream) .map(Objects::toString) .collect(Collectors.joining(System.getProperty("path.separator"); -for (String className : compilationResult.getClassNames()) { +for (String className : compilationResult.getCompiledClassNames()) { generatedClass .produce( new GeneratedClassBuildItem(true, className, compilationResult.getByteCode(className)));
[camel-quarkus] 22/33: Regen poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5234c519388d0fca030834c619e7bbefa67e3d27 Author: Nicolas Filotto AuthorDate: Thu Apr 6 08:56:59 2023 +0200 Regen poms --- .../src/main/generated/flattened-reduced-pom.xml | 26 ++ 1 file changed, 26 insertions(+) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 8eec5c4095..fe49c02eba 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6573,6 +6573,11 @@ cxf-rt-features-logging 4.0.0 + +org.apache.cxf +cxf-rt-features-metrics +4.0.0 + org.apache.cxf cxf-rt-frontend-jaxws @@ -6589,6 +6594,17 @@ cxf-rt-transports-http 4.0.0 + +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.0 + + +org.slf4j +jcl-over-slf4j + + + org.apache.cxf cxf-rt-ws-mex @@ -6599,6 +6615,11 @@ cxf-rt-ws-security 4.0.0 + +org.apache.cxf +cxf-rt-ws-rm +4.0.0 + org.apache.cxf cxf-rt-wsdl @@ -6859,6 +6880,11 @@ cxf-rt-frontend-simple 4.0.0 + +org.apache.cxf +cxf-rt-management +4.0.0 + org.apache.cxf cxf-rt-rs-json-basic
[camel-quarkus] 18/33: Fixed #4735 and auto-generated changes
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit cb4252101cb003e11966045b877f167275833e50 Author: JiriOndrusek AuthorDate: Wed Apr 5 15:49:11 2023 +0200 Fixed #4735 and auto-generated changes --- .../main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java | 2 +- .../src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java | 2 -- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java index 636ae134e2..67397d28cd 100644 --- a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java +++ b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java @@ -105,7 +105,7 @@ public class BeanRoutes extends RouteBuilder { .to("bean:parametersBean?method=parameterLiterals(*, true)"); from("direct:parameterTypes") -.to("bean:parametersBean?method=parameterTypes(String)"); +.to("bean:parametersBean?method=parameterTypes(String.class)"); from("direct:produceInterface") .process(e -> e.getMessage().setBody("produceInterface " + e.getMessage().getBody(String.class))); diff --git a/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java b/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java index cce658e280..5e61dc0d55 100644 --- a/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java +++ b/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java @@ -21,7 +21,6 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.apache.camel.quarkus.component.bean.model.Employee; import org.apache.camel.util.StringHelper; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -203,7 +202,6 @@ public class BeanTest { } @Test -@Disabled // https://github.com/apache/camel-quarkus/issues/4735 public void parameterTypes() { RestAssured.given() .contentType(ContentType.JSON) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 3845ba404c..c425f3d81e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2294,7 +2294,7 @@ org.apache.camel camel-tika -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel
[camel-quarkus] 31/33: Regenerate poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0fe41470e31916006029cab0814c2461776838b0 Author: James Netherton AuthorDate: Fri Apr 21 07:53:24 2023 +0100 Regenerate poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 490 ++--- .../src/main/generated/flattened-reduced-pom.xml | 34 +- .../generated/flattened-reduced-verbose-pom.xml| 102 ++--- 3 files changed, 313 insertions(+), 313 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index f14ad5e5f3..e746c635b3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -19450,411 +19450,411 @@ 1.33 -org.eclipse.jetty -apache-jsp -11.0.14 +org.eclipse.jetty +apache-jsp +11.0.15 -org.eclipse.jetty -glassfish-jstl -11.0.14 +org.eclipse.jetty +glassfish-jstl +11.0.15 -org.eclipse.jetty -jetty-alpn-client -11.0.14 +org.eclipse.jetty +jetty-alpn-client +11.0.15 -org.eclipse.jetty -jetty-alpn-java-client -11.0.14 +org.eclipse.jetty +jetty-alpn-java-client +11.0.15 -org.eclipse.jetty -jetty-alpn-java-server -11.0.14 +org.eclipse.jetty +jetty-alpn-java-server +11.0.15 -org.eclipse.jetty -jetty-alpn-conscrypt-client -11.0.14 +org.eclipse.jetty +jetty-alpn-conscrypt-client +11.0.15 -org.eclipse.jetty -jetty-alpn-conscrypt-server -11.0.14 +org.eclipse.jetty +jetty-alpn-conscrypt-server +11.0.15 -org.eclipse.jetty -jetty-alpn-server -11.0.14 +org.eclipse.jetty +jetty-alpn-server +11.0.15 -org.eclipse.jetty -jetty-annotations -11.0.14 +org.eclipse.jetty +jetty-annotations +11.0.15 -org.eclipse.jetty -jetty-ant -11.0.14 +org.eclipse.jetty +jetty-ant +11.0.15 -org.eclipse.jetty -jetty-client -11.0.14 +org.eclipse.jetty +jetty-client +11.0.15 -org.eclipse.jetty -jetty-cdi -11.0.14 +org.eclipse.jetty +jetty-cdi +11.0.15 -org.eclipse.jetty -jetty-deploy -11.0.14 +org.eclipse.jetty +jetty-deploy +11.0.15 -org.eclipse.jetty.fcgi -fcgi-client -11.0.14 +org.eclipse.jetty.fcgi +fcgi-client +11.0.15 -org.eclipse.jetty.fcgi -fcgi-server -11.0.14 +org.eclipse.jetty.fcgi +fcgi-server +11.0.15 -org.eclipse.jetty.gcloud -jetty-gcloud-session-manager -11.0.14 +org.eclipse.jetty.gcloud +jetty-gcloud-session-manager +11.0.15 -org.eclipse.jetty -jetty-home -11.0.14 -zip +org.eclipse.jetty +jetty-home +11.0.15 +zip -org.eclipse.jetty -jetty-home -11.0.14 -tar.gz +org.eclipse.jetty +jetty-home +11.0.15 +tar.gz -org.eclipse.jetty -jetty-http -11.0.14 +org.eclipse.jetty +jetty-http +11.0.15 -org.eclipse.jetty.http2 -http2-client -11.0.14 +org.eclipse.jetty.http2 +http2-client +11.0.15 -org.eclipse.jetty.http2 -http2-common -11.0.14 +org.eclipse.jetty.http2 +http2-common +11.0.15 -org.eclipse.jetty.http2 -http2-hpack -11.0.14 +org.eclipse.jetty.http2 +http2-hpack +11.0.15 -org.eclipse.jetty.http2 -http2-http-client-transport -11.0.14 +org.eclipse.jetty.http2 +http2-http-client-transport +11.0.15 -org.eclipse.jetty.http2 -http2-server -11.0.14 +org.eclipse.jetty.http2 +http2-server +11.0.15 -org.eclipse.jetty.http3 -http3-client -11.0.14 +org.eclipse.jetty.http3 +http3-client +11.0.15 -org.eclipse.jetty.http3 -http3-common -
[camel-quarkus] 01/33: Ref #4384: Groovy DSL - Add support of Groovy extensions
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d1901e753a9411ea0f1de450e9cbe683c5ff275b Author: Nicolas Filotto AuthorDate: Wed Mar 8 10:28:33 2023 +0100 Ref #4384: Groovy DSL - Add support of Groovy extensions --- .../pages/reference/extensions/groovy-dsl.adoc | 6 - .../dsl/groovy/deployment/GroovyDslProcessor.java | 65 +++- .../runtime/src/main/doc/limitations.adoc | 1 - integration-tests/groovy-dsl/pom.xml | 54 +- .../quarkus/dsl/groovy/GroovyDslResource.java | 6 + .../main/resources/routes/routes-with-eip.groovy | 36 .../camel/quarkus/dsl/groovy/GroovyDslTest.java| 181 +++-- 7 files changed, 285 insertions(+), 64 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc index f9c62daa0d..1926f73527 100644 --- a/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc @@ -43,9 +43,3 @@ Or add the coordinates to your existing project: 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::[] - -[id="extensions-groovy-dsl-camel-quarkus-limitations"] -== Camel Quarkus limitations - -The Groovy extensions are not supported which means that the extensions defined in the Camel project are ignored, more details in https://github.com/apache/camel-quarkus/issues/4384[Groovy DSL - Add support of Groovy extensions issue #4384]. - diff --git a/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java b/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java index d39b5eb8fc..6a8fd78dfd 100644 --- a/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java +++ b/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java @@ -19,14 +19,19 @@ package org.apache.camel.quarkus.dsl.groovy.deployment; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; @@ -34,6 +39,10 @@ import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.deployment.pkg.steps.NativeBuild; import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Message; import org.apache.camel.quarkus.core.deployment.main.CamelMainHelper; import org.apache.camel.quarkus.dsl.groovy.runtime.Configurer; import org.apache.camel.quarkus.support.dsl.deployment.DslGeneratedClassBuildItem; @@ -44,6 +53,9 @@ import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.Phases; import org.codehaus.groovy.tools.GroovyClass; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; +import org.jboss.jandex.IndexView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,6 +65,11 @@ import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcesso public class GroovyDslProcessor { private static final Logger LOG = LoggerFactory.getLogger(GroovyDslProcessor.class); +private static final List> CAMEL_REFLECTIVE_CLASSES = Arrays.asList( +Exchange.class, +Message.class, +ExchangePattern.class, +CamelContext.class); private static final String PACKAGE_NAME = "org.apache.camel.quarkus.dsl.groovy.generated"; private static final String FILE_FORMAT = """ package %s @@ -117,12 +134,48 @@ public class GroovyDslProcessor { } } -// To put it back once the Groovy extensions will be supported (https://github.com/apache/camel-quarkus/issues/4384) -//@BuildStep -//void registerNativeImageResources(BuildProducer serviceProvider) { -//serviceProvider -//
[camel-quarkus] 11/33: Revert "Temporarily disable dataformat integration tests due to #4662"
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 96b8999354768f8ef5efd417b5e8a4efdc1b0bed Author: Zineb Bendhiba AuthorDate: Tue Mar 28 14:09:26 2023 +0200 Revert "Temporarily disable dataformat integration tests due to #4662" This reverts commit 18159898d10df121db50bf35296b5043c76dbf8e. Fixes #4662 --- integration-tests/dataformat/pom.xml| 2 -- .../org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java | 2 -- .../apache/camel/quarkus/component/dataformat/it/DataformatTest.java| 2 -- 3 files changed, 6 deletions(-) diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml index db9224d215..4929793f54 100644 --- a/integration-tests/dataformat/pom.xml +++ b/integration-tests/dataformat/pom.xml @@ -67,7 +67,6 @@ - virtualDependencies diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java index 59b391c096..8676954dce 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.dataformat.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/4662;) @QuarkusIntegrationTest class DataformatIT extends DataformatTest { diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java index 6b57eb634b..5556571bfa 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java @@ -29,14 +29,12 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import static org.hamcrest.CoreMatchers.equalTo; -@Disabled("https://github.com/apache/camel-quarkus/issues/4662;) @QuarkusTest class DataformatTest {
[camel-quarkus] 16/33: Fixed KameletProcessor.java compilation error
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c33f4cec04dd273d61a6d9273ea0753b35ea6c15 Author: JiriOndrusek AuthorDate: Mon Apr 3 17:00:44 2023 +0200 Fixed KameletProcessor.java compilation error --- .../camel/quarkus/component/kamelet/deployment/KameletProcessor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 1ca4c9e581..9331c81e8f 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 @@ -54,9 +54,8 @@ class KameletProcessor { return new KameletResolverBuildItem(new KameletResolver() { @Override public Optional resolve(String id, CamelContext context) throws Exception { -ExtendedCamelContext ecc = context.getCamelContextExtension(); return Optional.ofNullable( - PluginHelper.getResourceLoader(ecc).resolveResource("/kamelets/" + id + ".kamelet.yaml")); + PluginHelper.getResourceLoader(context).resolveResource("/kamelets/" + id + ".kamelet.yaml")); } }); }
[camel-quarkus] 27/33: Regen poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 49731d9e0d5a19ccc9ead35b843f25453aeceb57 Author: JiriOndrusek AuthorDate: Mon Apr 17 09:27:32 2023 +0200 Regen poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 16 poms/bom/src/main/generated/flattened-reduced-pom.xml| 16 .../src/main/generated/flattened-reduced-verbose-pom.xml | 16 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4665af7d56..ba9ce2d234 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6081,7 +6081,7 @@ io.projectreactor.netty reactor-netty -1.1.3 +1.1.6 io.quarkiverse.freemarker @@ -6454,7 +6454,7 @@ org.springframework spring-aop -6.0.6 +6.0.8 org.springframework @@ -6469,7 +6469,7 @@ org.springframework spring-expression -6.0.6 +6.0.8 org.springframework @@ -6480,7 +6480,7 @@ org.springframework spring-jdbc -6.0.6 +6.0.8 org.springframework @@ -6495,7 +6495,7 @@ org.springframework spring-jms -6.0.6 +6.0.8 org.springframework @@ -6510,7 +6510,7 @@ org.springframework spring-messaging -6.0.6 +6.0.8 org.springframework @@ -6525,7 +6525,7 @@ org.springframework spring-orm -6.0.6 +6.0.8 org.springframework @@ -6540,7 +6540,7 @@ org.springframework spring-tx -6.0.6 +6.0.8 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 085f4b46fd..00f9f89e2d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6096,7 +6096,7 @@ io.projectreactor.netty reactor-netty -1.1.3 +1.1.6 io.quarkiverse.freemarker @@ -6424,7 +6424,7 @@ org.springframework spring-aop -6.0.6 +6.0.8 org.springframework @@ -6439,7 +6439,7 @@ org.springframework spring-expression -6.0.6 +6.0.8 org.springframework @@ -6450,7 +6450,7 @@ org.springframework spring-jdbc -6.0.6 +6.0.8 org.springframework @@ -6465,7 +6465,7 @@ org.springframework spring-jms -6.0.6 +6.0.8 org.springframework @@ -6480,7 +6480,7 @@ org.springframework spring-messaging -6.0.6 +6.0.8 org.springframework @@ -6495,7 +6495,7 @@ org.springframework spring-orm -6.0.6 +6.0.8 org.springframework @@ -6510,7 +6510,7 @@ org.springframework spring-tx -6.0.6 +6.0.8 org.springframework 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 314be91ac2..bfd876a018 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6081,7 +6081,7 @@ io.projectreactor.netty reactor-netty -1.1.3 +1.1.6 io.quarkiverse.freemarker @@ -6409,7 +6409,7 @@ org.springframework spring-aop -6.0.6 +6.0.8 org.springframework @@ -6424,7 +6424,7 @@ org.springframework spring-expression -6.0.6 +6.0.8 org.springframework @@ -6435,7 +6435,7 @@ org.springframework spring-jdbc -6.0.6 +6.0.8 org.springframework @@ -6450,7 +6450,7 @@ org.springframework spring-jms -6.0.6 +6.0.8 org.springframework @@ -6465,7 +6465,7 @@
[camel-quarkus] 32/33: Regenerate poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3984ff892e2ba506d267ea0cfc6dd9b40b378762 Author: JiriOndrusek AuthorDate: Mon Apr 24 09:11:41 2023 +0200 Regenerate poms --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 550 +++-- .../src/main/generated/flattened-reduced-pom.xml | 21 +- .../generated/flattened-reduced-verbose-pom.xml| 498 ++- 4 files changed, 573 insertions(+), 498 deletions(-) diff --git a/pom.xml b/pom.xml index 4fde65299b..a6e652cc19 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 2.1.2 0.2.8 ${json-path-version} -2.4.7 +2.4.10 3.4.0 ${kudu-version} 1.8.10 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e746c635b3..2ab40a2579 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -539,6 +539,11 @@ camel-chunk 4.0.0-SNAPSHOT + +org.apache.camel +camel-cli-connector +4.0.0-SNAPSHOT + org.apache.camel camel-cloud @@ -3057,6 +3062,16 @@ camel-quarkus-chunk-deployment 3.0.0-SNAPSHOT + +org.apache.camel.quarkus +camel-quarkus-cli-connector +3.0.0-SNAPSHOT + + +org.apache.camel.quarkus +camel-quarkus-cli-connector-deployment +3.0.0-SNAPSHOT + org.apache.camel.quarkus camel-quarkus-cloudevents @@ -5962,7 +5977,7 @@ com.jayway.jsonpath json-path -2.7.0 +2.8.0 com.lihaoyi @@ -6143,12 +6158,12 @@ io.quarkiverse.messaginghub quarkus-pooled-jms -2.0.0.CR2 +2.0.0 io.quarkiverse.messaginghub quarkus-pooled-jms-deployment -2.0.0.CR2 +2.0.0 io.quarkiverse.minio @@ -6234,7 +6249,7 @@ net.minidev json-smart -2.4.7 +2.4.10 org.antlr @@ -6637,381 +6652,396 @@ 3.6.4 -org.apache.cxf -cxf-core -4.0.0 +org.apache.cxf +cxf-core +4.0.0 -org.apache.cxf -cxf-rt-features-logging -4.0.0 +org.apache.cxf +cxf-rt-features-logging +4.0.0 -org.apache.cxf -cxf-rt-features-metrics -4.0.0 +org.apache.cxf +cxf-rt-features-metrics +4.0.0 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.0 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.0 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.0 +org.apache.cxf +cxf-rt-transports-http +4.0.0 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.0 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.0 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.0 +org.apache.cxf +cxf-rt-ws-mex +4.0.0 -org.apache.cxf -cxf-rt-ws-security -4.0.0 +org.apache.cxf +cxf-rt-ws-security +4.0.0 -org.apache.cxf -cxf-rt-ws-rm -4.0.0 +org.apache.cxf +cxf-rt-ws-rm +4.0.0 -org.apache.cxf -cxf-rt-wsdl -4.0.0 +org.apache.cxf +cxf-rt-wsdl +4.0.0 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.0 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +
[camel-quarkus] 14/33: Fixed compilation failures because of CAMEL-15105
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 7bec72ee1c4f295ca245ae3ec5ba17f9288fba61 Author: JiriOndrusek AuthorDate: Mon Apr 3 09:51:26 2023 +0200 Fixed compilation failures because of CAMEL-15105 --- .../quarkus/core/deployment/CamelPackageScanClassResolverTest.java | 6 +++--- .../java/org/apache/camel/quarkus/core/CamelContextRecorder.java | 6 +++--- .../src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java | 3 ++- .../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 2 +- .../src/main/java/org/apache/camel/quarkus/main/CamelMain.java | 1 + .../camel/quarkus/support/language/deployment/dm/DryModeMain.java | 4 ++-- .../java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java | 3 ++- .../quarkus/component/kamelet/deployment/KameletProcessor.java | 5 +++-- .../component/name/resolver/ComponentNameResolverResource.java | 5 +++-- .../quarkus/component/dsl/modeline/it/DslModelineResource.java | 3 ++- .../java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java | 5 +++-- .../org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java | 3 ++- .../main/java/org/apache/camel/quarkus/main/CoreMainResource.java | 7 --- .../messaging/it/util/scheme/MessagingComponentSchemeProducer.java | 3 ++- 14 files changed, 33 insertions(+), 23 deletions(-) diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java index 2366898802..312f33277b 100644 --- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java +++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelPackageScanClassResolverTest.java @@ -65,7 +65,7 @@ public class CamelPackageScanClassResolverTest { @Test public void findImplementations() { ExtendedCamelContext ecc = context.getCamelContextExtension(); -PackageScanClassResolver resolver = ecc.getPackageScanClassResolver(); +PackageScanClassResolver resolver = ecc.getContextPlugin(PackageScanClassResolver.class); Set> classes = resolver.findImplementations(Animal.class, Animal.class.getPackageName()); assertNotNull(classes); assertEquals(2, classes.size()); @@ -76,7 +76,7 @@ public class CamelPackageScanClassResolverTest { @Test public void findByFilter() { ExtendedCamelContext ecc = context.getCamelContextExtension(); -PackageScanClassResolver resolver = ecc.getPackageScanClassResolver(); +PackageScanClassResolver resolver = ecc.getContextPlugin(PackageScanClassResolver.class); Set> classes = resolver.findByFilter(Fungi.class::isAssignableFrom, Fungi.class.getPackageName()); assertNotNull(classes); assertEquals(1, classes.size()); @@ -86,7 +86,7 @@ public class CamelPackageScanClassResolverTest { @Test public void findAnnotated() { ExtendedCamelContext ecc = context.getCamelContextExtension(); -PackageScanClassResolver resolver = ecc.getPackageScanClassResolver(); +PackageScanClassResolver resolver = ecc.getContextPlugin(PackageScanClassResolver.class); Set> classes = resolver.findAnnotated(Singleton.class, Animal.class.getPackageName()); assertNotNull(classes); assertEquals(1, classes.size()); diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java index ebcaa4428e..a024637fc3 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java @@ -69,10 +69,10 @@ public class CamelContextRecorder { extendedCamelContext.setRegistry(registry.getValue()); context.setTypeConverterRegistry(typeConverterRegistry.getValue()); context.setLoadTypeConverters(false); - extendedCamelContext.setModelJAXBContextFactory(contextFactory.getValue()); - extendedCamelContext.setPackageScanClassResolver(packageScanClassResolver.getValue()); +extendedCamelContext.addContextPlugin(ModelJAXBContextFactory.class, contextFactory.getValue()); +extendedCamelContext.addContextPlugin(PackageScanClassResolver.class, packageScanClassResolver.getValue()); context.build(); - extendedCamelContext.setComponentNameResolver(componentNameResolver.getValue()); +
[camel-quarkus] 23/33: Regen poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a4fb6cf58c704b149967425d783379ce18f92e8f Author: JiriOndrusek AuthorDate: Thu Apr 6 09:04:56 2023 +0200 Regen poms --- poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++ 1 file changed, 15 insertions(+) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index fe49c02eba..c425f3d81e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6870,6 +6870,11 @@ cxf-rt-bindings-xml 4.0.0 + +org.apache.cxf +cxf-rt-databinding-aegis +4.0.0 + org.apache.cxf cxf-rt-databinding-jaxb @@ -6880,6 +6885,11 @@ cxf-rt-frontend-simple 4.0.0 + +org.apache.cxf +cxf-rt-javascript +4.0.0 + org.apache.cxf cxf-rt-management @@ -6920,6 +6930,11 @@ cxf-tools-common 4.0.0 + +org.apache.cxf +cxf-tools-java2ws +4.0.0 + org.apache.cxf cxf-tools-validator
[camel-quarkus] 20/33: Regen poms
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c2f34b4e30ccc8796b1ed9ad73aca7ead10780b6 Author: Nicolas Filotto AuthorDate: Wed Apr 5 20:46:27 2023 +0200 Regen poms --- .../src/main/generated/flattened-reduced-pom.xml | 41 -- 1 file changed, 41 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index c425f3d81e..8eec5c4095 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6573,11 +6573,6 @@ cxf-rt-features-logging 4.0.0 - -org.apache.cxf -cxf-rt-features-metrics -4.0.0 - org.apache.cxf cxf-rt-frontend-jaxws @@ -6594,17 +6589,6 @@ cxf-rt-transports-http 4.0.0 - -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.0 - - -org.slf4j -jcl-over-slf4j - - - org.apache.cxf cxf-rt-ws-mex @@ -6615,11 +6599,6 @@ cxf-rt-ws-security 4.0.0 - -org.apache.cxf -cxf-rt-ws-rm -4.0.0 - org.apache.cxf cxf-rt-wsdl @@ -6870,11 +6849,6 @@ cxf-rt-bindings-xml 4.0.0 - -org.apache.cxf -cxf-rt-databinding-aegis -4.0.0 - org.apache.cxf cxf-rt-databinding-jaxb @@ -6885,16 +6859,6 @@ cxf-rt-frontend-simple 4.0.0 - -org.apache.cxf -cxf-rt-javascript -4.0.0 - - -org.apache.cxf -cxf-rt-management -4.0.0 - org.apache.cxf cxf-rt-rs-json-basic @@ -6930,11 +6894,6 @@ cxf-tools-common 4.0.0 - -org.apache.cxf -cxf-tools-java2ws -4.0.0 - org.apache.cxf cxf-tools-validator
[camel-quarkus] 09/33: Fuxed Cxf-soap-client:missing licence in wsdl
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 3eaba1e27c4b80d3f1841a824845bdc3dbe5a93e Author: JiriOndrusek AuthorDate: Tue Mar 28 16:48:44 2023 +0200 Fuxed Cxf-soap-client:missing licence in wsdl --- .../src/main/resources/wsdl/CalculatorService.wsdl | 18 ++ 1 file changed, 18 insertions(+) diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl index eb50ff2c8c..43455b0449 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl +++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl @@ -1,4 +1,22 @@ http://www.w3.org/2001/XMLSchema; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/; xmlns:ns1="http://schemas.xmlsoap.org/soap/http; name="CalculatorService" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator;> + http://www.w3.org/2001/XMLSchema; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; version="1.0">
[camel-quarkus] 19/33: Ref #4745: Add context plugins for the dry mode as expected
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 09925d772e65588c5bb4c4ed392c9ad2cccb24a4 Author: Nicolas Filotto AuthorDate: Wed Apr 5 18:17:52 2023 +0200 Ref #4745: Add context plugins for the dry mode as expected --- .../camel/quarkus/support/language/deployment/dm/DryModeMain.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java index d01121acc4..53bf5bab83 100644 --- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java +++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeMain.java @@ -23,6 +23,8 @@ import org.apache.camel.ExtendedCamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.main.MainSupport; +import org.apache.camel.spi.ComponentResolver; +import org.apache.camel.spi.LanguageResolver; /** * {@code DryModeMain} a specific main implementation allowing to do a dry run of the application in order to collect @@ -53,8 +55,8 @@ public class DryModeMain extends MainSupport { ctx.setInjector(new DryModeInjector(ctx.getInjector())); ExtendedCamelContext extendedCamelContext = ctx.getCamelContextExtension(); -extendedCamelContext.addContextPlugin(DryModeLanguageResolver.class, languageResolver); -extendedCamelContext.addContextPlugin(DryModeComponentResolver.class, new DryModeComponentResolver()); +extendedCamelContext.addContextPlugin(LanguageResolver.class, languageResolver); +extendedCamelContext.addContextPlugin(ComponentResolver.class, new DryModeComponentResolver()); return ctx; }
[camel-quarkus] 17/33: Fixed compilation error linked to getModelToXMLDumper()
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0acee8a9524c88553a15271f893ea934414a62d4 Author: JiriOndrusek AuthorDate: Tue Apr 4 08:50:21 2023 +0200 Fixed compilation error linked to getModelToXMLDumper() --- .../main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java | 2 +- .../java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java | 2 +- .../src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java | 2 +- 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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java index d7843282f7..97036f8efd 100644 --- a/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java +++ b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlIoResource.java @@ -70,7 +70,7 @@ public class CoreMainXmlIoResource { .add("xml-routes-builder-loader", camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) .findClass(XmlRoutesBuilderLoader.EXTENSION).get().getName()) -.add("xml-model-dumper", camelContext.getModelToXMLDumper().getClass().getName()) +.add("xml-model-dumper", PluginHelper.getModelToXMLDumper(camelContext).getClass().getName()) .add("xml-model-factory", PluginHelper.getModelJAXBContextFactory(camelContext).getClass().getName()) .add("routeBuilders", routeBuilders) .add("routes", routes) diff --git a/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java index c63ba0a9e3..31192bda6b 100644 --- a/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java +++ b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/main/CoreMainXmlJaxbResource.java @@ -62,7 +62,7 @@ public class CoreMainXmlJaxbResource { .add("xml-routes-builder-loader", camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) .findClass(XmlRoutesBuilderLoader.EXTENSION).get().getName()) -.add("xml-model-dumper", camelContext.getModelToXMLDumper().getClass().getName()) +.add("xml-model-dumper", PluginHelper.getModelToXMLDumper(camelContext).getClass().getName()) .add("xml-model-factory", PluginHelper.getModelJAXBContextFactory(camelContext).getClass().getName()) .add("routeBuilders", routeBuilders) .add("routes", routes) diff --git a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java index af4f12fea0..1652f2d49a 100644 --- a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java +++ b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java @@ -136,7 +136,7 @@ public class CoreMainResource { } return Json.createObjectBuilder() -.add("xml-model-dumper", camelContext.getCamelContextExtension().getModelToXMLDumper().getClass().getName()) +.add("xml-model-dumper", PluginHelper.getModelToXMLDumper(camelContext).getClass().getName()) .add("routes-collector", collector) .add("listeners", listeners) .add("routeBuilders", routeBuilders) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 50bbec4d39..5aa211d7b9 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2467,7 +2467,7 @@ org.apache.camel camel-xmlsecurity -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 5f5816b107..3845ba404c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2467,7 +2467,7 @@
[camel-quarkus] 29/33: Fixed jackson-jq-extra (CAMEL-19276)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit fbf828d3afb8afd2624d4e99688768133e970491 Author: JiriOndrusek AuthorDate: Wed Apr 19 09:45:21 2023 +0200 Fixed jackson-jq-extra (CAMEL-19276) --- extensions/jq/runtime/pom.xml | 4 poms/bom/pom.xml | 18 +- poms/bom/src/main/generated/flattened-full-pom.xml | 16 poms/bom/src/main/generated/flattened-reduced-pom.xml | 16 .../main/generated/flattened-reduced-verbose-pom.xml | 16 5 files changed, 69 insertions(+), 1 deletion(-) diff --git a/extensions/jq/runtime/pom.xml b/extensions/jq/runtime/pom.xml index 916c2545fa..d3546debab 100644 --- a/extensions/jq/runtime/pom.xml +++ b/extensions/jq/runtime/pom.xml @@ -52,6 +52,10 @@ org.apache.camel camel-jq + +io.quarkiverse.jackson-jq +quarkus-jackson-jq-extra + diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 175342c9cc..70998543ae 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6201,8 +6201,8 @@ ${quarkiverse-jackson-jq.version} -jackson-jq net.thisptr +jackson-jq @@ -6211,6 +6211,17 @@ quarkus-jackson-jq-deployment ${quarkiverse-jackson-jq.version} + +io.quarkiverse.jackson-jq +quarkus-jackson-jq-extra +${quarkiverse-jackson-jq.version} + + +net.thisptr +jackson-jq + + + io.quarkiverse.jgit quarkus-jgit @@ -6293,8 +6304,13 @@ ${smallrye.reactive.messaging.camel.version} --> +net.thisptr jackson-jq +${jackson-jq-version} + + net.thisptr +jackson-jq-extra ${jackson-jq-version} diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 6d192e1117..f14ad5e5f3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6109,6 +6109,17 @@ quarkus-jackson-jq-deployment 2.0.0.Alpha + +io.quarkiverse.jackson-jq +quarkus-jackson-jq-extra +2.0.0.Alpha + + +net.thisptr +jackson-jq + + + io.quarkiverse.jgit quarkus-jgit @@ -6190,6 +6201,11 @@ jackson-jq 1.0.0-preview.20230409 + +net.thisptr +jackson-jq-extra +1.0.0-preview.20230409 + jakarta.jms jakarta.jms-api diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 57dfbf63ec..27c7b7251b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6124,6 +6124,17 @@ quarkus-jackson-jq-deployment 2.0.0.Alpha + +io.quarkiverse.jackson-jq +quarkus-jackson-jq-extra +2.0.0.Alpha + + +net.thisptr +jackson-jq + + + io.quarkiverse.jgit quarkus-jgit @@ -6205,6 +6216,11 @@ jackson-jq 1.0.0-preview.20230409 + +net.thisptr +jackson-jq-extra +1.0.0-preview.20230409 + jakarta.jms jakarta.jms-api 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 2f23100e65..326867142c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6109,6 +6109,17 @@ quarkus-jackson-jq-deployment 2.0.0.Alpha + +io.quarkiverse.jackson-jq +quarkus-jackson-jq-extra +2.0.0.Alpha + + +net.thisptr +jackson-jq + + + io.quarkiverse.jgit quarkus-jgit @@ -6190,6 +6201,11 @@ jackson-jq 1.0.0-preview.20230409 + +net.thisptr +jackson-jq-extra +
[camel-quarkus] 30/33: Fix of Opentelemetry test
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4ce707972708e5c3f92e1b4ba69128e95575f058 Author: JiriOndrusek AuthorDate: Wed Apr 19 09:57:59 2023 +0200 Fix of Opentelemetry test --- .../component/opentelemetry/it/OpenTelemetryTest.java | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java index d09bda01c5..b354857771 100644 --- a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java +++ b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java @@ -89,7 +89,7 @@ class OpenTelemetryTest { } @Test -public void testTracedBean() throws InterruptedException { +public void testTracedBean() { String name = "Camel Quarkus OpenTelemetry"; RestAssured.get("/opentelemetry/greet/" + name) .then() @@ -118,9 +118,9 @@ class OpenTelemetryTest { assertTrue(Long.parseLong(timestamp) > 0); // Verify the span hierarchy is JAX-RS Service -> Direct Endpoint -> Bean Endpoint -> Bean method -> JDBC query -await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 5); +await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 6); List> spans = getSpans(); -assertEquals(5, spans.size()); +assertEquals(6, spans.size()); assertEquals(spans.get(0).get("parentId"), spans.get(1).get("parentId")); assertEquals(spans.get(0).get("code.function"), "getConnection"); @@ -133,8 +133,11 @@ class OpenTelemetryTest { assertEquals(spans.get(3).get("parentId"), spans.get(4).get("spanId")); assertEquals(spans.get(3).get("camel.uri"), "direct://jdbcQuery"); -assertEquals(spans.get(4).get("parentId"), ""); -assertEquals(spans.get(4).get("code.function"), "jdbcQuery"); +assertEquals(spans.get(4).get("parentId"), spans.get(5).get("spanId")); +assertEquals(spans.get(4).get("camel.uri"), "direct://jdbcQuery"); + +assertEquals(spans.get(5).get("parentId"), ""); +assertEquals(spans.get(5).get("code.function"), "jdbcQuery"); } private List> getSpans() {
[camel-quarkus] 13/33: Fixed getter/setter on ExtendedCamelContext - CAMEL-15105
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c8acc7e8bb5b2eb9351fd8f6f259d5501d3dff4c Author: JiriOndrusek AuthorDate: Thu Mar 30 10:09:33 2023 +0200 Fixed getter/setter on ExtendedCamelContext - CAMEL-15105 --- .../java/org/apache/camel/quarkus/core/CamelContextRecorder.java | 3 ++- .../src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java | 3 ++- .../org/apache/camel/quarkus/component/kamelet/KameletRecorder.java | 2 +- .../microprofile/health/runtime/CamelMicroProfileHealthRecorder.java | 2 +- .../src/main/java/org/apache/camel/quarkus/core/CoreResource.java| 3 ++- .../org/apache/camel/quarkus/component/direct/it/DirectResource.java | 3 ++- .../apache/camel/quarkus/component/kamelet/it/KameletResource.java | 2 +- .../component/microprofile/it/health/MicroProfileHealthResource.java | 2 +- .../camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java | 5 +++-- .../quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java| 5 +++-- .../camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java | 5 +++-- .../quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java | 3 ++- 12 files changed, 23 insertions(+), 15 deletions(-) diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java index fe77110ee1..ebcaa4428e 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java @@ -64,7 +64,8 @@ public class CamelContextRecorder { // Set ClassLoader first as some actions depend on it being available ExtendedCamelContext extendedCamelContext = context.getCamelContextExtension(); context.setApplicationContextClassLoader(tccl); -context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new CamelRuntimeCatalog(config.runtimeCatalog)); + context.getCamelContextExtension().addContextPlugin(RuntimeCamelCatalog.class, +new CamelRuntimeCatalog(config.runtimeCatalog)); extendedCamelContext.setRegistry(registry.getValue()); context.setTypeConverterRegistry(typeConverterRegistry.getValue()); context.setLoadTypeConverters(false); diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java index 359dcce066..36c21585d9 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java @@ -72,7 +72,8 @@ public class ConsumeRecorder { try { final RoutesDefinition routes = routesDefinition.getValue(); routes.setCamelContext(camelContext.getValue()); - camelContext.getValue().getExtension(Model.class).addRouteDefinitions(routes.getRoutes()); + camelContext.getValue().getCamelContextExtension().getContextPlugin(Model.class) +.addRouteDefinitions(routes.getRoutes()); } catch (Exception e) { throw new RuntimeException("Could not add routes to context", e); } 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 1f59eadb94..eddc8a87a5 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 @@ -35,7 +35,7 @@ public class KameletRecorder { @Override public void configure(CamelContext context) { try { - context.getExtension(Model.class).addRouteTemplateDefinitions(definitions); + context.getCamelContextExtension().getContextPlugin(Model.class).addRouteTemplateDefinitions(definitions); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java b/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java index e33777b17b..4a951db780 100644 ---
[camel-quarkus] 10/33: Generated flattened pom + add more information into cxf-soap-client assert
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 54ff80c4f213a7b94e75cbfb4b5d7b41d36afa80 Author: JiriOndrusek AuthorDate: Wed Mar 29 09:15:40 2023 +0200 Generated flattened pom + add more information into cxf-soap-client assert --- .../quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java | 8 +++- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java index 96375417ee..eeeb364ffb 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java @@ -144,7 +144,13 @@ class CxfSoapClientTest { if (!expected.replaceAll(sanitizerRegex, "").replaceAll("\\s", "").equals(staticCopyContent)) { Files.writeString(staticCopyPath, expected, StandardCharsets.UTF_8); Assertions.fail("The static WSDL copy in " + staticCopyPath -+ " went out of sync with the WSDL served by the container. The content was updated by the test, you just need to review and commit the changes."); ++ " went out of sync with the WSDL served by the container. The content was updated by the test, you just need to review and commit the changes.\n" ++ "From the container:\n" ++ expected.replaceAll(sanitizerRegex, "").replaceAll("\\s", "") ++ "\n" ++ "In the sources: \n" ++ staticCopyContent); + } } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b9c400f80e..50bbec4d39 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -845,7 +845,7 @@ org.apache.camel camel-elasticsearch -4.0.0-M2 +4.0.0-SNAPSHOT com.google.code.findbugs @@ -1722,7 +1722,7 @@ org.apache.camel camel-mapstruct -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1d10d75905..5f5816b107 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -845,7 +845,7 @@ org.apache.camel camel-elasticsearch -4.0.0-M2 +4.0.0-SNAPSHOT com.google.code.findbugs @@ -1722,7 +1722,7 @@ org.apache.camel camel-mapstruct -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel 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 bd661b1912..ae0c702780 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -845,7 +845,7 @@ org.apache.camel camel-elasticsearch -4.0.0-M2 +4.0.0-SNAPSHOT com.google.code.findbugs @@ -1722,7 +1722,7 @@ org.apache.camel camel-mapstruct -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel
[camel-quarkus] 07/33: Fix in cxf-soap-client
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4d37bba60e9caa5906b543ffd0c72c3c85d3e394 Author: JiriOndrusek AuthorDate: Tue Mar 28 09:58:37 2023 +0200 Fix in cxf-soap-client --- .../src/main/resources/wsdl/CalculatorService.wsdl | 18 -- .../cxf/soap/client/it/CxfSoapClientTest.java | 2 +- poms/bom/pom.xml | 18 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 18 ++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 18 ++ 5 files changed, 55 insertions(+), 19 deletions(-) diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl index 43455b0449..eb50ff2c8c 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl +++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl @@ -1,22 +1,4 @@ http://www.w3.org/2001/XMLSchema; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/; xmlns:ns1="http://schemas.xmlsoap.org/soap/http; name="CalculatorService" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator;> - http://www.w3.org/2001/XMLSchema; xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator; version="1.0"> diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java index f17e279f7c..96375417ee 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java @@ -53,7 +53,7 @@ class CxfSoapClientTest { .post("/cxf-soap/client/simple") .then() .statusCode(201) -.body(equalTo("3")); +.body(equalTo("12")); } @ParameterizedTest diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 2b788e1d5c..fe88e996e6 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2119,6 +2119,24 @@ org.apache.camel camel-salesforce ${camel.version} + + +com.google.android +annotations + + +com.google.code.findbugs +jsr305 + + +org.checkerframework +checker-qual + + +org.codehaus.mojo +animal-sniffer-annotations + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 03b2d1df5b..b9c400f80e 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2052,6 +2052,24 @@ org.apache.camel camel-salesforce 4.0.0-SNAPSHOT + + +com.google.android +annotations + + +com.google.code.findbugs +jsr305 + + +org.checkerframework +checker-qual + + +org.codehaus.mojo +animal-sniffer-annotations + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index c878ab8560..1d10d75905 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2052,6 +2052,24 @@ org.apache.camel camel-salesforce 4.0.0-SNAPSHOT + + +com.google.android +annotations + + +com.google.code.findbugs +jsr305 + + +org.checkerframework +
[camel-quarkus] 15/33: Disabled several foundation tests + fixin runtinme because of CAMEL-15105
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 26be5d592e173e475b01d3a297058356d2d5e27a Author: JiriOndrusek AuthorDate: Mon Apr 3 16:13:29 2023 +0200 Disabled several foundation tests + fixin runtinme because of CAMEL-15105 --- .../java/org/apache/camel/quarkus/core/FastCamelContext.java | 10 +- .../src/main/java/org/apache/camel/quarkus/main/CamelMain.java | 2 +- .../java/org/apache/camel/quarkus/component/bean/BeanTest.java | 2 ++ .../core/it/routeconfigurations/RouteConfigurationsTest.java | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java index 3eede2bc99..85308ed771 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java @@ -108,7 +108,7 @@ public class FastCamelContext extends DefaultCamelContext implements CatalogCame @Override protected ComponentNameResolver createComponentNameResolver() { // Component names are discovered at build time -throw new UnsupportedOperationException(); +return null; } @Override @@ -120,7 +120,7 @@ public class FastCamelContext extends DefaultCamelContext implements CatalogCame @Override protected TypeConverterRegistry createTypeConverterRegistry() { // TypeConverterRegistry creation is done at build time -throw new UnsupportedOperationException(); +return null; } @Override @@ -133,12 +133,12 @@ public class FastCamelContext extends DefaultCamelContext implements CatalogCame @Override protected ModelJAXBContextFactory createModelJAXBContextFactory() { // Disabled by default and is provided by the xml-jaxb extension if present on the classpath -return new DisabledModelJAXBContextFactory(); +return null; } protected FactoryFinderResolver createFactoryFinderResolver() { -throw new UnsupportedOperationException( -"FactoryFinderResolver should have been set in the FastCamelContext constructor"); +// FactoryFinderResolver is initialized at build time +return null; } @Override diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java index a237c3cc0e..e75d87c794 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMain.java @@ -61,7 +61,7 @@ public final class CamelMain extends MainCommandLineSupport implements HasCamelC configurer.setRoutesCollector(routesCollector); } - configurer.setBeanPostProcessor(camelContext.getCamelContextExtension().getBeanPostProcessor()); + configurer.setBeanPostProcessor(PluginHelper.getBeanPostProcessor(camelContext)); configurer.setRoutesBuilders(mainConfigurationProperties.getRoutesBuilders()); configurer.setRoutesExcludePattern(mainConfigurationProperties.getRoutesExcludePattern()); configurer.setRoutesIncludePattern(mainConfigurationProperties.getRoutesIncludePattern()); diff --git a/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java b/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java index 5e61dc0d55..cce658e280 100644 --- a/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java +++ b/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java @@ -21,6 +21,7 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.apache.camel.quarkus.component.bean.model.Employee; import org.apache.camel.util.StringHelper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -202,6 +203,7 @@ public class BeanTest { } @Test +@Disabled // https://github.com/apache/camel-quarkus/issues/4735 public void parameterTypes() { RestAssured.given() .contentType(ContentType.JSON) diff --git a/integration-test-groups/foundation/route-configurations/src/test/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsTest.java
[camel-quarkus] 06/33: Fix in http component (caused by upgrade of httpclient)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c563a0906532b66f882a0fc565827452ce66fbe9 Author: JiriOndrusek AuthorDate: Mon Mar 27 17:32:24 2023 +0200 Fix in http component (caused by upgrade of httpclient) --- .../apache/camel/quarkus/component/http/deployment/HttpProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/http/deployment/src/main/java/org/apache/camel/quarkus/component/http/deployment/HttpProcessor.java b/extensions/http/deployment/src/main/java/org/apache/camel/quarkus/component/http/deployment/HttpProcessor.java index 0ebe59d620..fcffc893fc 100644 --- a/extensions/http/deployment/src/main/java/org/apache/camel/quarkus/component/http/deployment/HttpProcessor.java +++ b/extensions/http/deployment/src/main/java/org/apache/camel/quarkus/component/http/deployment/HttpProcessor.java @@ -22,8 +22,8 @@ import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import org.apache.camel.http.base.HttpOperationFailedException; +import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.auth.BasicScheme; -import org.apache.http.client.config.RequestConfig; class HttpProcessor { public static final String FEATURE = "camel-http";
[camel-quarkus] 08/33: Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 100eb6286587f7db5183d3d9493687674f82f406 Author: JiriOndrusek AuthorDate: Tue Mar 28 13:49:52 2023 +0200 Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193 --- .../component/micrometer/it/MicrometerTest.java| 13 +++ .../opentelemetry/it/SpanExporterResource.java | 1 + .../opentelemetry/it/OpenTelemetryTest.java| 41 -- 3 files changed, 31 insertions(+), 24 deletions(-) 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 e15cfa4b5e..8501ca7e06 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 @@ -56,8 +56,9 @@ class MicrometerTest { RestAssured.get("/micrometer/timer") .then() .statusCode(200); -assertTrue(getMetricValue(Integer.class, "counter", "CamelExchangesSucceeded", "routeId=micrometer-metrics-timer") > 0); -assertEquals(0, getMetricValue(Integer.class, "counter", "CamelExchangesFailed", "routeId=micrometer-metrics-timer")); +assertTrue( +getMetricValue(Integer.class, "counter", "camel.exchanges.succeeded", "routeId=micrometer-metrics-timer") > 0); +assertEquals(0, getMetricValue(Integer.class, "counter", "camel.exchanges.failed", "routeId=micrometer-metrics-timer")); } @Test @@ -66,13 +67,13 @@ class MicrometerTest { .then() .statusCode(200); String tags = "nodeId=log1,routeId=log"; -assertTrue(getMetricValue(Double.class, "timer", "CamelMessageHistory", tags) > 0.0); +assertTrue(getMetricValue(Double.class, "timer", "camel.message.history", tags) > 0.0); } @Test public void testMicrometerRouteEventNotifier() { -assertTrue(getMetricValue(Integer.class, "gauge", "CamelRoutesAdded") >= 4); -assertTrue(getMetricValue(Integer.class, "gauge", "CamelRoutesRunning") >= 4); +assertTrue(getMetricValue(Integer.class, "gauge", "camel.routes.added") >= 4); +assertTrue(getMetricValue(Integer.class, "gauge", "camel.routes.running") >= 4); } @Test @@ -81,7 +82,7 @@ class MicrometerTest { .then() .statusCode(200); String tags = "endpointName=direct://log,eventType=ExchangeSentEvent"; -assertTrue(getMetricValue(Double.class, "timer", "CamelExchangeEventNotifier", tags) >= 0.0); +assertTrue(getMetricValue(Double.class, "timer", "camel.exchange.event.notifier", tags) >= 0.0); } @Test diff --git a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java index 928fe42119..923331d370 100644 --- a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java +++ b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java @@ -55,6 +55,7 @@ public class SpanExporterResource { objectBuilder.add("spanId", span.getSpanId()); objectBuilder.add("traceId", span.getTraceId()); objectBuilder.add("parentId", span.getParentSpanId()); +objectBuilder.add("kind", span.getKind().name()); attributes.forEach((k, v) -> objectBuilder.add(String.valueOf(k), v.toString())); diff --git a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java index f2af02ec30..d09bda01c5 100644 --- a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java +++ b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import io.opentelemetry.api.trace.SpanKind; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import org.junit.jupiter.api.AfterEach; @@ -79,14 +80,16 @@ class OpenTelemetryTest { .body(equalTo("Traced direct:start")); // Verify the span
[camel-quarkus] branch camel-main updated (f5b6b4be58 -> d09c2090ef)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard f5b6b4be58 Fixed debezium-mongodb (CAMEL-19287) + regen poms discard ce167cfbfc Regenerate poms discard bd8d6f796b Regenerate poms discard a09c49d6ec Fix of Opentelemetry test discard efd7e4342e Fixed jackson-jq-extra (CAMEL-19276) discard c969e89bda Fix of upgrade jackson-jq discard 12624ece4d Regen poms discard 258da64314 Fixed Tika compilation issue discard 5df2a6fb80 Regen poms discard 0d6d9300be Regen poms discard 5fee17212c Regen poms discard 0957011cff Regen poms discard ceb9b5dff8 camel-java-joor-dsl - Ease the way to get all the compiled classes discard 09d74d4689 Regen poms discard da0b2afa32 Ref #4745: Add context plugins for the dry mode as expected discard 82a2f49a74 Fixed #4735 and auto-generated changes discard c7cc395abe Fixed compilation error linked to getModelToXMLDumper() discard a2b6050db4 Fixed KameletProcessor.java compilation error discard d360c33a3f Disabled several foundation tests + fixin runtinme because of CAMEL-15105 discard 5629b99b80 Fixed compilation failures because of CAMEL-15105 discard 2d8d6edd73 Fixed getter/setter on ExtendedCamelContext - CAMEL-15105 discard 9ea32948fb [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image) discard 8024873cea Revert "Temporarily disable dataformat integration tests due to #4662" discard 4068559b5d Generated flattened pom + add more information into cxf-soap-client assert discard 4e7628e5bb Fuxed Cxf-soap-client:missing licence in wsdl discard b83dc367f3 Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193 discard df66dd5313 Fix in cxf-soap-client discard 94d0e28c59 Fix in http component (caused by upgrade of httpclient) discard c74a389a06 Ref #1746: Groovy language native support discard c72cd51e89 Add support of expressions referring an external resource discard 983b7afbed Upgrade Camel to 4.0.0-M3 discard 7d9c4cbfb4 Ref #4624: Upgrade to Groovy 4.x discard f09eba30ed Ref #4384: Groovy DSL - Add support of Groovy extensions add e48dcbe74f Upgrade Cyclonedx Maven Plugin to version 2.7.7 new d1901e753a Ref #4384: Groovy DSL - Add support of Groovy extensions new 9045d44b1a Ref #4624: Upgrade to Groovy 4.x new fa976ff5ec Upgrade Camel to 4.0.0-M3 new 24ea86f36f Add support of expressions referring an external resource new d14c5f986a Ref #1746: Groovy language native support new c563a09065 Fix in http component (caused by upgrade of httpclient) new 4d37bba60e Fix in cxf-soap-client new 100eb62865 Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193 new 3eaba1e27c Fuxed Cxf-soap-client:missing licence in wsdl new 54ff80c4f2 Generated flattened pom + add more information into cxf-soap-client assert new 96b8999354 Revert "Temporarily disable dataformat integration tests due to #4662" new e500bc4d11 [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image) new c8acc7e8bb Fixed getter/setter on ExtendedCamelContext - CAMEL-15105 new 7bec72ee1c Fixed compilation failures because of CAMEL-15105 new 26be5d592e Disabled several foundation tests + fixin runtinme because of CAMEL-15105 new c33f4cec04 Fixed KameletProcessor.java compilation error new 0acee8a952 Fixed compilation error linked to getModelToXMLDumper() new cb4252101c Fixed #4735 and auto-generated changes new 09925d772e Ref #4745: Add context plugins for the dry mode as expected new c2f34b4e30 Regen poms new f9970ae5a0 camel-java-joor-dsl - Ease the way to get all the compiled classes new 5234c51938 Regen poms new a4fb6cf58c Regen poms new c6e8cb7da9 Regen poms new 07d04dca49 Regen poms new ab02d09803 Fixed Tika compilation issue new 49731d9e0d Regen poms new 612bf46570 Fix of upgrade jackson-jq new fbf828d3af Fixed jackson-jq-extra (CAMEL-19276) new 4ce7079727 Fix of Opentelemetry test new 0fe41470e3 Regenerate poms new 3984ff892e Regenerate poms new d09c2090ef Fixed debezium-mongodb (CAMEL-19287) + regen poms 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 (f5b6b4be58) \ N -- N -- N refs/heads/camel-main (d09c2090ef) 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
[camel-quarkus] 04/33: Add support of expressions referring an external resource
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 24ea86f36fde7baa8b47ce3fb907828f06cd284e Author: Nicolas Filotto AuthorDate: Thu Mar 23 19:39:57 2023 +0100 Add support of expressions referring an external resource --- .../language/deployment/ExpressionBuildItem.java | 26 +- .../deployment/LanguageSupportProcessor.java | 10 ++--- .../language/deployment/ScriptBuildItem.java | 8 ++- .../language/deployment/dm/DryModeLanguage.java| 17 -- .../deployment/dm/DryModeLanguageResolver.java | 4 ++-- .../deployment/dm/DryModeScriptingLanguage.java| 7 +++--- .../language/deployment/dm/ExpressionHolder.java | 12 +++--- .../language/deployment/dm/ScriptHolder.java | 8 ++- 8 files changed, 71 insertions(+), 21 deletions(-) diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/ExpressionBuildItem.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/ExpressionBuildItem.java index bbb5242308..b3dc72b3fa 100644 --- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/ExpressionBuildItem.java +++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/ExpressionBuildItem.java @@ -26,28 +26,52 @@ public final class ExpressionBuildItem extends MultiBuildItem { final String language; final String expression; +final String loadedExpression; final boolean predicate; final Object[] properties; -public ExpressionBuildItem(String language, String expression, Object[] properties, boolean predicate) { +public ExpressionBuildItem(String language, String expression, String loadedExpression, Object[] properties, +boolean predicate) { this.language = language; this.expression = expression; +this.loadedExpression = loadedExpression; this.properties = properties; this.predicate = predicate; } +/** + * @return the name of the language in which the expression is written. + */ public String getLanguage() { return language; } +/** + * @return the original content of the extracted expression. + */ public String getExpression() { return expression; } +/** + * @return the content of the expression after being loaded in case the given expression is referring to an external + * resource by using the syntax + * resource:scheme:uri. + */ +public String getLoadedExpression() { +return loadedExpression; +} + +/** + * @return {@code true} if the expression is a predicate, {@code false} otherwise. + */ public boolean isPredicate() { return predicate; } +/** + * @return the properties provided to evaluate the expression. + */ public Object[] getProperties() { return properties; } diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/LanguageSupportProcessor.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/LanguageSupportProcessor.java index 3a5f88eaf0..7f95d71d40 100644 --- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/LanguageSupportProcessor.java +++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/LanguageSupportProcessor.java @@ -64,13 +64,17 @@ class LanguageSupportProcessor { for (DryModeLanguage language : main.getLanguages()) { final String name = language.getName(); for (ExpressionHolder holder : language.getPredicates()) { -expressions.produce(new ExpressionBuildItem(name, holder.getContent(), holder.getProperties(), true)); +expressions.produce(new ExpressionBuildItem(name, holder.getContent(), holder.getLoadedContent(), +holder.getProperties(), true)); } for (ExpressionHolder holder : language.getExpressions()) { -expressions.produce(new ExpressionBuildItem(name, holder.getContent(), holder.getProperties(), false)); +expressions.produce(new ExpressionBuildItem(name, holder.getContent(), holder.getLoadedContent(), +holder.getProperties(), false)); } for (ScriptHolder script : language.getScripts()) { -
[camel-quarkus] 02/33: Ref #4624: Upgrade to Groovy 4.x
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9045d44b1af8d8cb5ca23c527736fdb93dbffe49 Author: Nicolas Filotto AuthorDate: Wed Mar 8 11:57:15 2023 +0100 Ref #4624: Upgrade to Groovy 4.x --- .../groovy/runtime/graal/GroovySubstitutions.java | 130 - 1 file changed, 98 insertions(+), 32 deletions(-) diff --git a/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/graal/GroovySubstitutions.java b/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/graal/GroovySubstitutions.java index 3ddba6d540..927018517c 100644 --- a/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/graal/GroovySubstitutions.java +++ b/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/graal/GroovySubstitutions.java @@ -16,68 +16,134 @@ */ package org.apache.camel.quarkus.dsl.groovy.runtime.graal; -import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodHandle; import java.lang.invoke.MutableCallSite; -import java.lang.reflect.Constructor; +import java.util.function.BiFunction; -import com.oracle.svm.core.annotate.Delete; +import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import org.codehaus.groovy.control.ParserPluginFactory; +import org.codehaus.groovy.control.SourceUnit; +import org.codehaus.groovy.runtime.memoize.MemoizeCache; +import org.codehaus.groovy.vmplugin.v8.CacheableCallSite; +import org.codehaus.groovy.vmplugin.v8.IndyInterface; final class GroovySubstitutions { } -@TargetClass(className = "org.codehaus.groovy.vmplugin.v8.IndyInterface") +@TargetClass(className = "org.codehaus.groovy.vmplugin.v8.MethodHandleWrapper") +final class SubstituteMethodHandleWrapper { + +@Alias +public boolean isCanSetTarget() { +return false; +} + +@Alias +public MethodHandle getCachedMethodHandle() { +return null; +} +} + +@TargetClass(className = "org.codehaus.groovy.vmplugin.v8.IndyInterface$FallbackSupplier") +final class SubstituteIndyFallbackSupplier { + +@Alias +SubstituteIndyFallbackSupplier(MutableCallSite callSite, Class sender, String methodName, int callID, +Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) { + +} + +@Alias +SubstituteMethodHandleWrapper get() { +return null; +} +} + +@TargetClass(CacheableCallSite.class) +final class SubstituteCacheableCallSite { + +@Alias +public SubstituteMethodHandleWrapper getAndPut(String className, +MemoizeCache.ValueProvider valueProvider) { +return null; +} +} + +@TargetClass(IndyInterface.class) final class SubstituteIndyInterface { +@Alias +private static SubstituteMethodHandleWrapper NULL_METHOD_HANDLE_WRAPPER; + @Substitute protected static void invalidateSwitchPoints() { throw new UnsupportedOperationException("invalidateSwitchPoints is not supported"); } -@Substitute -public static Object fromCache(MutableCallSite callSite, Class sender, String methodName, int callID, -Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) { -throw new UnsupportedOperationException("fromCache is not supported"); +@Alias +private static boolean bypassCache(Boolean spreadCall, Object[] arguments) { +return false; } -} -@TargetClass(className = "org.codehaus.groovy.control.SourceUnit") -final class SubstituteSourceUnit { +@Alias +private static T doWithCallSite(MutableCallSite callSite, Object[] arguments, +BiFunction f) { +return null; +} @Substitute -public void convert() { -throw new UnsupportedOperationException("convert is not supported"); +public static Object selectMethod(MutableCallSite callSite, Class sender, String methodName, int callID, +Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) +throws Throwable { +throw new UnsupportedOperationException("selectMethod is not supported"); } -} - -@TargetClass(className = "org.codehaus.groovy.vmplugin.v8.Java8") -final class SubstituteJava8 { @Substitute -private static Constructor getLookupConstructor() { -throw new UnsupportedOperationException("getLookupConstructor is not supported"); +public static Object fromCache(MutableCallSite callSite, Class sender, String methodName, int callID, +Boolean safeNavigation, Boolean thisCall, Boolean spreadCall, Object dummyReceiver, Object[] arguments) +throws Throwable {
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1521089512 Build fixed with: * Camel Quarkus Commit: d09c2090efa7f54dc5be555748d8a545057f0763 * Camel Main Commit: e48dcbe74faaaefc78f26a1c78e2cd03c96a09cd * Link to build: https://github.com/apache/camel-quarkus/actions/runs/4792255734 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2927 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] trickMin closed issue #745: Run or export integration failed on VS code (windows)
trickMin closed issue #745: Run or export integration failed on VS code (windows) URL: https://github.com/apache/camel-karavan/issues/745 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] trickMin commented on issue #745: Run or export integration failed on VS code (windows)
trickMin commented on issue #745: URL: https://github.com/apache/camel-karavan/issues/745#issuecomment-1521082016 Thanks! It works well by using following command! `jbang -D'camel.jbang.version=3.20.3' camel@apache/camel run *` or `jbang -D"camel.jbang.version=3.20.3" camel@apache/camel run *` I think it's a bug of windows VS code Karavan plugin (powershell) executing using no "" or '' after `-D` option. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] trickMin commented on issue #743: How can I get more documentations on using and configuring karavan?
trickMin commented on issue #743: URL: https://github.com/apache/camel-karavan/issues/743#issuecomment-1521069731 I have browsed the content on the Camel docs website (https://camel.apache.org/docs/) and found very detailed documentation for Camel-core and Camel-k. However, for Karavan, I only found the introduction documentation on the GitHub README.md. I am sure that Karavan provides a wealth of visual components, but I do not know how to build a complete demo with them, such as configuring the runtime environment or exporting a usable program. I probably need a guide to help me get started with Karavan quickly. I think I can study more advanced and complex functions on my own. I try runtime for Karavan, but VS code prompt "no application", How can I configure it? ![image](https://user-images.githubusercontent.com/59214333/234156826-b69a44c1-0b44-4b80-9062-e1b2e52119b1.png) There are three default modules in VS Code. What is the relation between RestAPI and Routes? If I configure Beans, where should I put the Bean class? ![image](https://user-images.githubusercontent.com/59214333/234156971-d4dee086-a445-4298-aab3-fc0a06cf332b.png) These are just a few examples I have cited, and there may be more. I have not found any relevant documentation to guide me on these issues. Therefore, I hope there is a step-by-step guide to help me use a complete integrated application with Karavan smoothly -- 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 automatic-periodic-sync updated (1b3b24d5f0b -> 8c7b1203eaa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 1b3b24d5f0b [create-pull-request] automated change add 8c7b1203eaa [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../springboot/catalog/components/aws2-sns.json| 4 .../src/main/docs/aws2-sns.json| 13 +++ .../sns/springboot/Sns2ComponentConfiguration.java | 27 ++ 3 files changed, 44 insertions(+)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #824: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4)
github-actions[bot] opened a new pull request, #824: URL: https://github.com/apache/camel-spring-boot/pull/824 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 dependabot/go_modules/github.com/container-tools/spectrum-0.6.9 created (now 3dbe1052d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.9 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 3dbe1052d chore(deps): bump github.com/container-tools/spectrum No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #4269: chore(deps): bump github.com/container-tools/spectrum from 0.6.8 to 0.6.9
dependabot[bot] opened a new pull request, #4269: URL: https://github.com/apache/camel-k/pull/4269 Bumps [github.com/container-tools/spectrum](https://github.com/container-tools/spectrum) from 0.6.8 to 0.6.9. Release notes Sourced from https://github.com/container-tools/spectrum/releases;>github.com/container-tools/spectrum's releases. v0.6.9 Changelog 39d44c1 Bump github.com/docker/cli Docker images docker pull quay.io/container-tools/spectrum:v0.6.9 docker pull quay.io/container-tools/spectrum:v0.6 Commits https://github.com/container-tools/spectrum/commit/39d44c1684627d1d5c18ed61487ad686dd4fa74c;>39d44c1 Bump github.com/docker/cli See full diff in https://github.com/container-tools/spectrum/compare/v0.6.8...v0.6.9;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/container-tools/spectrum=go_modules=0.6.8=0.6.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #4000: missing Operator env vars usage in the docs
github-actions[bot] commented on issue #4000: URL: https://github.com/apache/camel-k/issues/4000#issuecomment-1520984313 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Runner image (experimental)
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 f7dbbe5a Runner image (experimental) f7dbbe5a is described below commit f7dbbe5a911f814e88ca1d01a18fba1cc62ecbe8 Author: Marat Gubaidullin AuthorDate: Mon Apr 24 19:00:52 2023 -0400 Runner image (experimental) --- .github/workflows/runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml index ba14848e..f9fc2281 100644 --- a/.github/workflows/runner.yml +++ b/.github/workflows/runner.yml @@ -29,7 +29,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v3 with: - context: . + context: ./karavan-runner file: karavan-runner/Dockerfile push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
[camel-karavan] branch main updated (820fad7f -> a2b9447e)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from 820fad7f Fix #746 add a2b9447e Runner image (experimental) No new revisions were added by this update. Summary of changes: .github/workflows/{builder.yml => runner.yml} | 6 +++--- change_version.sh | 2 ++ karavan-runner/Dockerfile | 15 +++ karavan-runner/docker-entrypoint.sh | 16 package-lock.json | 6 -- 5 files changed, 36 insertions(+), 9 deletions(-) copy .github/workflows/{builder.yml => runner.yml} (85%) create mode 100644 karavan-runner/Dockerfile create mode 100644 karavan-runner/docker-entrypoint.sh delete mode 100644 package-lock.json
[GitHub] [camel-quarkus] ffang commented on pull request #4721: Cxf ws-rm tests coverage - JVM only
ffang commented on PR #4721: URL: https://github.com/apache/camel-quarkus/pull/4721#issuecomment-1520854585 > CxfSoapWsrmTest Hi @JiriOndrusek , Thanks for the clarification! I just pushed another commit to https://github.com/quarkiverse/quarkus-cxf/pull/835 Could you please re-run your test against the new commit also. Also your testcase need some configuration to use the decoupled endpoint like ``` --- a/integration-test-groups/cxf-soap/cxf-soap-ws-rm/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wsrm/it/CxfSoapWsrmRoutes.java +++ b/integration-test-groups/cxf-soap/cxf-soap-ws-rm/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wsrm/it/CxfSoapWsrmRoutes.java @@ -26,8 +26,15 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.cxf.jaxws.CxfConfigurer; import org.apache.camel.component.cxf.jaxws.CxfEndpoint; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingFeature; +import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory; +import org.apache.cxf.transport.http.HTTPConduit; +import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; +import org.apache.cxf.ws.addressing.WSAContextUtils; import org.apache.cxf.ws.rm.manager.AcksPolicyType; import org.apache.cxf.ws.rm.manager.DestinationPolicyType; import org.apache.cxf.ws.rmp.v200502.RMAssertion; @@ -91,7 +98,7 @@ public class CxfSoapWsrmRoutes extends RouteBuilder { cxfEndpoint.setAddress("/wsrm/RouterPort"); addWsRmFeature(cxfEndpoint); - +cxfEndpoint.setCxfConfigurer(new MyCxfConfigurer()); return cxfEndpoint; } @@ -185,4 +192,32 @@ public class CxfSoapWsrmRoutes extends RouteBuilder { : config.getValue("quarkus.http.port", Integer.class); return String.format("http://localhost:%d;, port); } + +public class MyCxfConfigurer implements CxfConfigurer { + +@Override +public void configure(AbstractWSDLBasedEndpointFactory factoryBean) { +// Do nothing here +} + +@Override +public void configureClient(Client client) { + +String decoupledEndpoint = "/wsrm/decoupled_endpoint"; +HTTPConduit hc = (HTTPConduit) (client.getConduit()); +HTTPClientPolicy cp = hc.getClient(); +cp.setDecoupledEndpoint(decoupledEndpoint); + client.getBus().setProperty(WSAContextUtils.DECOUPLED_ENDPOINT_BASE_PROPERTY, +getServerUrl() ++ "/soapservice"); + +} + +@Override +public void configureServer(Server server) { +// Do nothing here + +} + +} ``` I changed this on your CQ4689-cxf-wsrm-coverage-backup branch, then I checked the log and decoupled-endpoint works using vertx destination, also the lost message got re-transmitted as expected(ws-rm works) Let me know if you have any further questions. Thanks! Freeman -- 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: Fix #746
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 820fad7f Fix #746 820fad7f is described below commit 820fad7fe9cb6a6861eef7ebc4fb7c26da2ac9b3 Author: Marat Gubaidullin AuthorDate: Mon Apr 24 16:20:30 2023 -0400 Fix #746 --- karavan-builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile index 3b92f9b2..0f37004c 100644 --- a/karavan-builder/Dockerfile +++ b/karavan-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM jbangdev/jbang-action:0.106.3 +FROM jbangdev/jbang-action:0.106.1 # Add Camel-JBang RUN jbang trust add -o --fresh --quiet https://github.com/apache/camel/blob/HEAD/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
[camel-karavan] branch dependabot/npm_and_yarn/karavan-vscode/yaml-and-svgr/webpack--removed created (now ac1d5a7c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-vscode/yaml-and-svgr/webpack--removed in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at ac1d5a7c Bump yaml and @svgr/webpack in /karavan-vscode No new revisions were added by this update.
[GitHub] [camel-karavan] dependabot[bot] opened a new pull request, #747: Bump yaml and @svgr/webpack in /karavan-vscode
dependabot[bot] opened a new pull request, #747: URL: https://github.com/apache/camel-karavan/pull/747 Removes [yaml](https://github.com/eemeli/yaml). It's no longer used after updating ancestor dependency [@svgr/webpack](https://github.com/gregberge/svgr). These dependencies need to be updated together. Removes `yaml` Updates `@svgr/webpack` from 6.2.1 to 7.0.0 Release notes Sourced from https://github.com/gregberge/svgr/releases;>@​svgr/webpack's releases. v7.0.0 Features allow specifying jsxRuntimeImport in config (https://github.com/gregberge/svgr/commit/86bb86f;>86bb86f), closes https://redirect.github.com/gregberge/svgr/issues/801;>#801 https://redirect.github.com/gregberge/svgr/issues/801;>#801 remove https://github.com/svgr;>@​svgr/plugin-jsx from core (https://github.com/gregberge/svgr/commit/a0f078d;>a0f078d) upgrade to svgo v3 (https://redirect.github.com/gregberge/svgr/issues/798;>#798) (https://github.com/gregberge/svgr/commit/21b6209;>21b6209) BREAKING CHANGES plugin-jsx is no longer included by default in core svgr now requires Node.js v14+ v6.5.1 No release notes provided. v6.5.0 Bug Fixes fix Yarn peer dependency warning from https://github.com/babel;>@​babel/core (https://redirect.github.com/gregberge/svgr/issues/786;>#786) (https://github.com/gregberge/svgr/commit/db35837;>db35837), closes https://redirect.github.com/gregberge/svgr/issues/785;>#785 Features babel-preset: fix 'role' attribute on svg element for react native (https://redirect.github.com/gregberge/svgr/issues/787;>#787) (https://github.com/gregberge/svgr/commit/35d85e0;>35d85e0) v6.4.0 Bug Fixes deps: add babel-preset to core dependencies (https://redirect.github.com/gregberge/svgr/issues/782;>#782) (https://github.com/gregberge/svgr/commit/464ec5f;>464ec5f) Features a11y: add attribute role=img to the svg element (https://redirect.github.com/gregberge/svgr/issues/750;>#750) (https://github.com/gregberge/svgr/commit/8b9edc4;>8b9edc4) support spaces in file names (https://redirect.github.com/gregberge/svgr/issues/779;>#779) (https://github.com/gregberge/svgr/commit/6ee639a;>6ee639a) v6.3.1 Bug Fixes fix duplicate plugin/preset detected error (https://redirect.github.com/gregberge/svgr/issues/747;>#747) (https://github.com/gregberge/svgr/commit/3c6a54c;>3c6a54c), closes https://redirect.github.com/gregberge/svgr/issues/746;>#746 fix exports compat with ESM (https://redirect.github.com/gregberge/svgr/issues/749;>#749) (https://github.com/gregberge/svgr/commit/f3e304c;>f3e304c) ... (truncated) Changelog Sourced from https://github.com/gregberge/svgr/blob/main/CHANGELOG.md;>@​svgr/webpack's changelog. https://github.com/gregberge/svgr/compare/v6.5.1...v7.0.0;>7.0.0 (2023-03-24) Features allow specifying jsxRuntimeImport in config (https://github.com/gregberge/svgr/commit/86bb86f47748618f729742e56199355d9c0bc518;>86bb86f), closes https://redirect.github.com/gregberge/svgr/issues/801;>#801 https://redirect.github.com/gregberge/svgr/issues/801;>#801 remove @​svgr/plugin-jsx from core (https://github.com/gregberge/svgr/commit/a0f078db13936800a32c14ade08b670a14b5a886;>a0f078d) upgrade to svgo v3 (https://redirect.github.com/gregberge/svgr/issues/798;>#798) (https://github.com/gregberge/svgr/commit/21b6209ef34c51cc0313901f31061afe587ab29b;>21b6209) BREAKING CHANGES plugin-jsx is no longer included by default in core svgr now requires Node.js v14+ https://github.com/gregberge/svgr/compare/v6.5.0...v6.5.1;>6.5.1 (2022-10-27) Reverts Revert feat(a11y): add attribute role=img to the svg element (https://redirect.github.com/gregberge/svgr/issues/750;>#750) (https://github.com/gregberge/svgr/commit/138223284ad9aebc5bbf94ed3ae7174a66dbc7f5;>1382232), closes https://redirect.github.com/gregberge/svgr/issues/750;>#750 https://github.com/gregberge/svgr/compare/v6.4.0...v6.5.0;>6.5.0 (2022-10-14) Bug Fixes fix Yarn peer dependency warning from @​babel/core (https://redirect.github.com/gregberge/svgr/issues/786;>#786) (https://github.com/gregberge/svgr/commit/db3583751474997dd72a0209ca61daddbac16c46;>db35837), closes https://redirect.github.com/gregberge/svgr/issues/785;>#785 Features babel-preset: fix 'role' attribute on svg element for react native (https://redirect.github.com/gregberge/svgr/issues/787;>#787) (https://github.com/gregberge/svgr/commit/35d85e069ebfef1b26ba181f443d9377a7bc003e;>35d85e0) https://github.com/gregberge/svgr/compare/v6.3.1...v6.4.0;>6.4.0 (2022-10-01) Bug Fixes deps: add babel-preset to core dependencies (https://redirect.github.com/gregberge/svgr/issues/782;>#782) (https://github.com/gregberge/svgr/commit/464ec5fe81c6ba98be5a26923f3ad19fc2ef7fc6;>464ec5f) Features a11y: add attribute role=img to
[camel-karavan] 01/02: Fix #746
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 commit c4cad503e5032ad24a809b1e273d290d97729411 Author: Marat Gubaidullin AuthorDate: Mon Apr 24 16:14:56 2023 -0400 Fix #746 --- karavan-builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile index 43580902..3b92f9b2 100644 --- a/karavan-builder/Dockerfile +++ b/karavan-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM jbangdev/jbang-action:0.105.2 +FROM jbangdev/jbang-action:0.106.3 # Add Camel-JBang RUN jbang trust add -o --fresh --quiet https://github.com/apache/camel/blob/HEAD/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
[camel-karavan] 02/02: Karavan space up to date
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 commit 386ae14dd1946b07f7b3627a363b3f3295654555 Author: Marat Gubaidullin AuthorDate: Mon Apr 24 16:15:13 2023 -0400 Karavan space up to date --- karavan-space/package-lock.json| 6 ++-- karavan-space/src/components/ComponentCard.tsx | 2 +- .../src/designer/route/DslConnections.tsx | 7 ++--- .../src/designer/route/RouteDesignerLogic.tsx | 3 +- .../route/property/ComponentParameterField.tsx | 32 -- .../designer/route/property/DslPropertyField.tsx | 2 +- karavan-space/src/designer/utils/CamelUi.tsx | 1 + 7 files changed, 34 insertions(+), 19 deletions(-) diff --git a/karavan-space/package-lock.json b/karavan-space/package-lock.json index 02882814..a4ab32fc 100644 --- a/karavan-space/package-lock.json +++ b/karavan-space/package-lock.json @@ -1,12 +1,12 @@ { "name": "karavan-space", - "version": "3.20.1", + "version": "3.20.2-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "karavan-space", - "version": "3.20.1", + "version": "3.20.2-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "4.4.6", @@ -43,7 +43,7 @@ } }, "../karavan-core": { - "version": "3.20.1-SNAPSHOT", + "version": "3.20.2-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", diff --git a/karavan-space/src/components/ComponentCard.tsx b/karavan-space/src/components/ComponentCard.tsx index c2a07924..9305a086 100644 --- a/karavan-space/src/components/ComponentCard.tsx +++ b/karavan-space/src/components/ComponentCard.tsx @@ -16,7 +16,7 @@ */ import React from 'react'; import { -CardHeader, Card, CardTitle, CardBody, CardFooter, Badge, Text +CardHeader, Card, CardTitle, CardBody, CardFooter, Badge } from '@patternfly/react-core'; import '../designer/karavan.css'; import {camelIcon, CamelUi} from "../designer/utils/CamelUi"; diff --git a/karavan-space/src/designer/route/DslConnections.tsx b/karavan-space/src/designer/route/DslConnections.tsx index 6dc1ced3..f18866e1 100644 --- a/karavan-space/src/designer/route/DslConnections.tsx +++ b/karavan-space/src/designer/route/DslConnections.tsx @@ -32,7 +32,6 @@ interface Props { interface State { integration: Integration -sub?: Subscription steps: Map } @@ -46,14 +45,14 @@ export class DslConnections extends React.Component { integration: this.props.integration, steps: new Map(), }; +sub?: Subscription; componentDidMount() { -const sub = EventBus.onPosition()?.subscribe((evt: DslPosition) => this.setPosition(evt)); -this.setState({sub: sub}); +this.sub = EventBus.onPosition()?.subscribe((evt: DslPosition) => this.setPosition(evt)); } componentWillUnmount() { -this.state.sub?.unsubscribe(); +this.sub?.unsubscribe(); } setPosition(evt: DslPosition) { diff --git a/karavan-space/src/designer/route/RouteDesignerLogic.tsx b/karavan-space/src/designer/route/RouteDesignerLogic.tsx index 92d1f414..7dc03980 100644 --- a/karavan-space/src/designer/route/RouteDesignerLogic.tsx +++ b/karavan-space/src/designer/route/RouteDesignerLogic.tsx @@ -301,7 +301,8 @@ export class RouteDesignerLogic { setDslDefaults(step: CamelElement): CamelElement { if (step.dslName === 'LogDefinition') { -(step as LogDefinition).message = '${body}' +// eslint-disable-next-line no-template-curly-in-string +(step as LogDefinition).message = "${body}"; } if (step.dslName === 'ChoiceDefinition') { (step as ChoiceDefinition).when?.push(CamelDefinitionApi.createStep('WhenDefinition', undefined)); diff --git a/karavan-space/src/designer/route/property/ComponentParameterField.tsx b/karavan-space/src/designer/route/property/ComponentParameterField.tsx index 67dd8165..faad51c8 100644 --- a/karavan-space/src/designer/route/property/ComponentParameterField.tsx +++ b/karavan-space/src/designer/route/property/ComponentParameterField.tsx @@ -39,6 +39,7 @@ import {KubernetesAPI} from "../../utils/KubernetesAPI"; import KubernetesIcon from "@patternfly/react-icons/dist/js/icons/openshift-icon"; import ShowIcon from "@patternfly/react-icons/dist/js/icons/eye-icon"; import HideIcon from "@patternfly/react-icons/dist/js/icons/eye-slash-icon"; +import PlusIcon from "@patternfly/react-icons/dist/esm/icons/plus-icon"; const prefix = "parameters"; const beanPrefix = "#bean:"; @@ -131,12 +132,17 @@ export class ComponentParameterField extends React.Component { getInternalUriSelect = (property: ComponentProperty, value: any) => { const selectOptions: JSX.Element[] = [];
[GitHub] [camel-karavan] mgubaidullin closed issue #746: Upgrade to JBang v0.106.3
mgubaidullin closed issue #746: Upgrade to JBang v0.106.3 URL: https://github.com/apache/camel-karavan/issues/746 -- 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 (872f5e6a -> 386ae14d)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from 872f5e6a Fix #734 new c4cad503 Fix #746 new 386ae14d Karavan space up to date 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: karavan-builder/Dockerfile | 2 +- karavan-space/package-lock.json| 6 ++-- karavan-space/src/components/ComponentCard.tsx | 2 +- .../src/designer/route/DslConnections.tsx | 7 ++--- .../src/designer/route/RouteDesignerLogic.tsx | 3 +- .../route/property/ComponentParameterField.tsx | 32 -- .../designer/route/property/DslPropertyField.tsx | 2 +- karavan-space/src/designer/utils/CamelUi.tsx | 1 + 8 files changed, 35 insertions(+), 20 deletions(-)
[camel-k-runtime] branch dependabot/maven/org.apache.maven.plugin-tools-maven-plugin-annotations-3.8.2 created (now 5029b4da)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugin-tools-maven-plugin-annotations-3.8.2 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at 5029b4da build(deps): bump maven-plugin-annotations from 3.8.1 to 3.8.2 No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #1014: build(deps): bump maven-plugin-annotations from 3.8.1 to 3.8.2
dependabot[bot] opened a new pull request, #1014: URL: https://github.com/apache/camel-k-runtime/pull/1014 Bumps [maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.8.1 to 3.8.2. Release notes Sourced from https://github.com/apache/maven-plugin-tools/releases;>maven-plugin-annotations's releases. 3.8.2 https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317820version=12352508;>Release Notes - Maven Plugin Tools - Version 3.8.2 Improvement [https://issues.apache.org/jira/browse/MPLUGIN-457;>MPLUGIN-457] - Use Resolver API, get rid of localRepository Dependency upgrade [https://issues.apache.org/jira/browse/MPLUGIN-458;>MPLUGIN-458] - Bump httpcore from 4.4.15 to 4.4.16 [https://issues.apache.org/jira/browse/MPLUGIN-459;>MPLUGIN-459] - Bump httpclient from 4.5.13 to 4.5.14 [https://issues.apache.org/jira/browse/MPLUGIN-460;>MPLUGIN-460] - Bump antVersion from 1.10.12 to 1.10.13 [https://issues.apache.org/jira/browse/MPLUGIN-461;>MPLUGIN-461] - Bump slf4jVersion from 1.7.5 to 1.7.36 [https://issues.apache.org/jira/browse/MPLUGIN-462;>MPLUGIN-462] - Bump plexus-java from 1.1.1 to 1.1.2 [https://issues.apache.org/jira/browse/MPLUGIN-463;>MPLUGIN-463] - Bump plexus-archiver from 4.6.1 to 4.6.3 [https://issues.apache.org/jira/browse/MPLUGIN-464;>MPLUGIN-464] - Bump jsoup from 1.15.3 to 1.15.4 [https://issues.apache.org/jira/browse/MPLUGIN-465;>MPLUGIN-465] - Bump asmVersion from 9.4 to 9.5 [https://issues.apache.org/jira/browse/MPLUGIN-466;>MPLUGIN-466] - Bump assertj-core from 3.23.1 to 3.24.2 Commits https://github.com/apache/maven-plugin-tools/commit/4722552814b93738b14248c3bec7d79fa280e2c3;>4722552 [maven-release-plugin] prepare release maven-plugin-tools-3.8.2 https://github.com/apache/maven-plugin-tools/commit/9b3c8f70de4661c958d5fa9997f291ae1e32afee;>9b3c8f7 [MPLUGIN-466] Bump assertj-core from 3.23.1 to 3.24.2 (https://redirect.github.com/apache/maven-plugin-tools/issues/206;>#206) https://github.com/apache/maven-plugin-tools/commit/e60a569d79e413dd8ba93fc7c7595b3b7fbb900a;>e60a569 [MPLUGIN-465] Bump asmVersion from 9.4 to 9.5 (https://redirect.github.com/apache/maven-plugin-tools/issues/204;>#204) https://github.com/apache/maven-plugin-tools/commit/6119bd116b7f47965b559321b4b588c8759a12b8;>6119bd1 auto link Jira MPLUGIN https://github.com/apache/maven-plugin-tools/commit/2ab622f6b1e10477bdd665d3569f44c8337dda22;>2ab622f [MPLUGIN-464] Bump jsoup from 1.15.3 to 1.15.4 (https://redirect.github.com/apache/maven-plugin-tools/issues/203;>#203) https://github.com/apache/maven-plugin-tools/commit/6815c7dc1fcdf780a2689099765c2109d6f9ee44;>6815c7d [MPLUGIN-463] Bump plexus-archiver from 4.6.1 to 4.6.3 (https://redirect.github.com/apache/maven-plugin-tools/issues/202;>#202) https://github.com/apache/maven-plugin-tools/commit/9f12d194830ef93af57010478418da84473845ca;>9f12d19 [MPLUGIN-461] Bump slf4jVersion from 1.7.5 to 1.7.36 (https://redirect.github.com/apache/maven-plugin-tools/issues/197;>#197) https://github.com/apache/maven-plugin-tools/commit/c4f464a920eb0d299572388efe045c8ca6707a0d;>c4f464a [MPLUGIN-462] Bump plexus-java from 1.1.1 to 1.1.2 (https://redirect.github.com/apache/maven-plugin-tools/issues/200;>#200) https://github.com/apache/maven-plugin-tools/commit/3b417bc11f45be43390f95319d070288a40d26fc;>3b417bc [MPLUGIN-460] Bump antVersion from 1.10.12 to 1.10.13 (https://redirect.github.com/apache/maven-plugin-tools/issues/196;>#196) https://github.com/apache/maven-plugin-tools/commit/49dad78362f779d13f279e8fdbe1246d751aa6ab;>49dad78 [MPLUGIN-459] Bump httpclient from 4.5.13 to 4.5.14 (https://redirect.github.com/apache/maven-plugin-tools/issues/186;>#186) Additional commits viewable in https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.8.1...maven-plugin-tools-3.8.2;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugin-tools:maven-plugin-annotations=maven=3.8.1=3.8.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after
[camel-k-runtime] branch dependabot/maven/org.apache.maven.plugins-maven-plugin-plugin-3.8.2 created (now fb8212fb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-plugin-plugin-3.8.2 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at fb8212fb build(deps): bump maven-plugin-plugin from 3.8.1 to 3.8.2 No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #1013: build(deps): bump maven-plugin-plugin from 3.8.1 to 3.8.2
dependabot[bot] opened a new pull request, #1013: URL: https://github.com/apache/camel-k-runtime/pull/1013 Bumps [maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.8.1 to 3.8.2. Release notes Sourced from https://github.com/apache/maven-plugin-tools/releases;>maven-plugin-plugin's releases. 3.8.2 https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12317820version=12352508;>Release Notes - Maven Plugin Tools - Version 3.8.2 Improvement [https://issues.apache.org/jira/browse/MPLUGIN-457;>MPLUGIN-457] - Use Resolver API, get rid of localRepository Dependency upgrade [https://issues.apache.org/jira/browse/MPLUGIN-458;>MPLUGIN-458] - Bump httpcore from 4.4.15 to 4.4.16 [https://issues.apache.org/jira/browse/MPLUGIN-459;>MPLUGIN-459] - Bump httpclient from 4.5.13 to 4.5.14 [https://issues.apache.org/jira/browse/MPLUGIN-460;>MPLUGIN-460] - Bump antVersion from 1.10.12 to 1.10.13 [https://issues.apache.org/jira/browse/MPLUGIN-461;>MPLUGIN-461] - Bump slf4jVersion from 1.7.5 to 1.7.36 [https://issues.apache.org/jira/browse/MPLUGIN-462;>MPLUGIN-462] - Bump plexus-java from 1.1.1 to 1.1.2 [https://issues.apache.org/jira/browse/MPLUGIN-463;>MPLUGIN-463] - Bump plexus-archiver from 4.6.1 to 4.6.3 [https://issues.apache.org/jira/browse/MPLUGIN-464;>MPLUGIN-464] - Bump jsoup from 1.15.3 to 1.15.4 [https://issues.apache.org/jira/browse/MPLUGIN-465;>MPLUGIN-465] - Bump asmVersion from 9.4 to 9.5 [https://issues.apache.org/jira/browse/MPLUGIN-466;>MPLUGIN-466] - Bump assertj-core from 3.23.1 to 3.24.2 Commits https://github.com/apache/maven-plugin-tools/commit/4722552814b93738b14248c3bec7d79fa280e2c3;>4722552 [maven-release-plugin] prepare release maven-plugin-tools-3.8.2 https://github.com/apache/maven-plugin-tools/commit/9b3c8f70de4661c958d5fa9997f291ae1e32afee;>9b3c8f7 [MPLUGIN-466] Bump assertj-core from 3.23.1 to 3.24.2 (https://redirect.github.com/apache/maven-plugin-tools/issues/206;>#206) https://github.com/apache/maven-plugin-tools/commit/e60a569d79e413dd8ba93fc7c7595b3b7fbb900a;>e60a569 [MPLUGIN-465] Bump asmVersion from 9.4 to 9.5 (https://redirect.github.com/apache/maven-plugin-tools/issues/204;>#204) https://github.com/apache/maven-plugin-tools/commit/6119bd116b7f47965b559321b4b588c8759a12b8;>6119bd1 auto link Jira MPLUGIN https://github.com/apache/maven-plugin-tools/commit/2ab622f6b1e10477bdd665d3569f44c8337dda22;>2ab622f [MPLUGIN-464] Bump jsoup from 1.15.3 to 1.15.4 (https://redirect.github.com/apache/maven-plugin-tools/issues/203;>#203) https://github.com/apache/maven-plugin-tools/commit/6815c7dc1fcdf780a2689099765c2109d6f9ee44;>6815c7d [MPLUGIN-463] Bump plexus-archiver from 4.6.1 to 4.6.3 (https://redirect.github.com/apache/maven-plugin-tools/issues/202;>#202) https://github.com/apache/maven-plugin-tools/commit/9f12d194830ef93af57010478418da84473845ca;>9f12d19 [MPLUGIN-461] Bump slf4jVersion from 1.7.5 to 1.7.36 (https://redirect.github.com/apache/maven-plugin-tools/issues/197;>#197) https://github.com/apache/maven-plugin-tools/commit/c4f464a920eb0d299572388efe045c8ca6707a0d;>c4f464a [MPLUGIN-462] Bump plexus-java from 1.1.1 to 1.1.2 (https://redirect.github.com/apache/maven-plugin-tools/issues/200;>#200) https://github.com/apache/maven-plugin-tools/commit/3b417bc11f45be43390f95319d070288a40d26fc;>3b417bc [MPLUGIN-460] Bump antVersion from 1.10.12 to 1.10.13 (https://redirect.github.com/apache/maven-plugin-tools/issues/196;>#196) https://github.com/apache/maven-plugin-tools/commit/49dad78362f779d13f279e8fdbe1246d751aa6ab;>49dad78 [MPLUGIN-459] Bump httpclient from 4.5.13 to 4.5.14 (https://redirect.github.com/apache/maven-plugin-tools/issues/186;>#186) Additional commits viewable in https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.8.1...maven-plugin-tools-3.8.2;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-plugin-plugin=maven=3.8.1=3.8.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
[camel] branch regen_bot updated (259f1f844a8 -> 696aaf1ee8d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 259f1f844a8 CAMEL-19292: camel-core - Remove experimental LightweightCamelContext add 696aaf1ee8d Polished doc No new revisions were added by this update. Summary of changes: .../camel-sql/src/main/docs/sql-component.adoc | 107 + 1 file changed, 45 insertions(+), 62 deletions(-)
[camel] branch regen_bot updated (7b46bffed6c -> 259f1f844a8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7b46bffed6c Upgrade CycloneDX Maven Plugin to version 2.7.7 add ac4b5cf638e CAMEL-19292: camel-core - Remove experimental LightweightCamelContext add 259f1f844a8 CAMEL-19292: camel-core - Remove experimental LightweightCamelContext No new revisions were added by this update. Summary of changes: .../camel/impl/lw/LightweightCamelContext.java | 1480 .../impl/lw/LightweightCamelContextExtension.java | 600 .../impl/lw/LightweightRuntimeCamelContext.java| 1350 -- .../java/org/apache/camel/ContextTestSupport.java | 20 +- .../camel/impl/lw/EnricherLightweightTest.java | 59 - .../camel/impl/lw/LightweightContextTest.java | 82 -- .../camel/impl/lw/PollEnricherLightweightTest.java | 154 -- .../camel/impl/lw/SplitterLightweightTest.java | 326 - .../dsl/jbang/core/commands/CodeRestGenerator.java |4 +- .../apache/camel/dsl/jbang/core/commands/Init.java |6 +- .../apache/camel/dsl/jbang/core/commands/Run.java |4 +- 11 files changed, 8 insertions(+), 4077 deletions(-) delete mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java delete mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java delete mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/EnricherLightweightTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/LightweightContextTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/PollEnricherLightweightTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/SplitterLightweightTest.java
[GitHub] [camel-k] christophd commented on pull request #4233: fix: Limit parallel builds on operator
christophd commented on PR #4233: URL: https://github.com/apache/camel-k/pull/4233#issuecomment-1520686357 @squakez I finally managed to add an E2E test, could you please trigger the workflow once more? thx -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Polished doc
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 696aaf1ee8d Polished doc 696aaf1ee8d is described below commit 696aaf1ee8dcea24084a949a6b53b934e8197074 Author: Claus Ibsen AuthorDate: Mon Apr 24 20:45:22 2023 +0200 Polished doc --- .../camel-sql/src/main/docs/sql-component.adoc | 107 + 1 file changed, 45 insertions(+), 62 deletions(-) diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc index 301e477a739..74388dabc70 100644 --- a/components/camel-sql/src/main/docs/sql-component.adoc +++ b/components/camel-sql/src/main/docs/sql-component.adoc @@ -36,11 +36,8 @@ for this component: The SQL component also supports: -* a JDBC based repository for the -Idempotent Consumer EIP pattern. See -further below. -* a JDBC based repository for the Aggregator EIP -pattern. See further below. +* a JDBC based repository for the Idempotent Consumer EIP pattern. See further below. +* a JDBC based repository for the Aggregator EIP pattern. See further below. == URI format @@ -56,8 +53,7 @@ The SQL component uses the following endpoint URI notation: sql:select * from table where id=# order by name[?options] -You can use named parameters by using -:`#name_of_the_parameter` style as shown: +You can use named parameters by using `:#name_of_the_parameter` style as shown: sql:select * from table where id=:#myId order by name[?options] @@ -66,13 +62,13 @@ sql:select * from table where id=:#myId order by name[?options] When using named parameters, Camel will lookup the names from, in the given precedence: -1. from message body if its a `java.util.Map` -2. from message headers +1. from a xref:languages:simple-language.adoc[Simple] expressions +2. from message body if its a `java.util.Map` +3. from message headers If a named parameter cannot be resolved, then an exception is thrown. -You can use Simple expressions as parameters as -shown: +You can use xref:languages:simple-language.adoc[Simple] expressions as parameters as shown: sql:select * from table where id=:#${exchangeProperty.myId} order by name[?options] @@ -83,14 +79,13 @@ SQL query is substituted with the `pass:[#]` symbol, because the `?` symbol is used to specify options for the endpoint. The `?` symbol replacement can be configured on endpoint basis. -You can externalize your SQL queries to files -in the classpath or file system as shown: +You can externalize your SQL queries to files in the classpath or file system as shown: sql:classpath:sql/myquery.sql[?options] -And the myquery.sql file is in the classpath and is just a plain text +And the `myquery.sql` file is in the classpath and is just a plain text [source,sql] @@ -107,7 +102,6 @@ In the file you can use multilines and format the SQL as you wish. And also use comments such as the – dash line. - // component-configure options: START // component-configure options: END @@ -156,7 +150,7 @@ depending on the presence of query parameters. For `select` operations, the result is an instance of `List>` type, as returned by the -http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/jdbc/core/JdbcTemplate.html#queryForList(java.lang.String,%20java.lang.Object%91%93)[JdbcTemplate.queryForList()] +http://static.springframework.org/spring/docs/6.0.x/api/org/springframework/jdbc/core/JdbcTemplate.html#queryForList(java.lang.String,%20java.lang.Object%91%93)[JdbcTemplate.queryForList()] method. For `update` operations, a `NULL` body is returned as the `update` operation is only set as a header and never as a body. By default, the result is placed in the message body. If the @@ -175,7 +169,7 @@ from("jms:order.inbox") == Using StreamList -The producer supports outputType=StreamList +The producer supports `outputType=StreamList` that uses an iterator to stream the output of the query. This allows to process the data in a streaming fashion which for example can be used by the Splitter EIP to process each row one at a time, @@ -184,32 +178,28 @@ and load data from the database as needed. [source,java] from("direct:withSplitModel") -.to("sql:select * from projects order by id?outputType=StreamList=org.apache.camel.component.sql.ProjectModel") -.to("log:stream") -.split(body()).streaming() -.to("log:row") -.to("mock:result") -.end(); +.to("sql:select * from projects order by id?outputType=StreamList=org.apache.camel.component.sql.ProjectModel") +.to("log:stream") +.split(body()).streaming() +.to("log:row") +.to("mock:result") +.end(); == Generated keys -*Since Camel 2.12.4, 2.13.1 and 2.14* - If
[camel] 02/02: CAMEL-19292: camel-core - Remove experimental LightweightCamelContext
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 259f1f844a848b0597913b34d0fc63e2c40a3ad7 Author: Claus Ibsen AuthorDate: Mon Apr 24 20:11:55 2023 +0200 CAMEL-19292: camel-core - Remove experimental LightweightCamelContext --- .../camel/impl/lw/EnricherLightweightTest.java | 59 .../camel/impl/lw/LightweightContextTest.java | 82 -- .../camel/impl/lw/PollEnricherLightweightTest.java | 154 -- .../camel/impl/lw/SplitterLightweightTest.java | 326 - .../dsl/jbang/core/commands/CodeRestGenerator.java | 4 +- .../apache/camel/dsl/jbang/core/commands/Init.java | 6 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 4 +- 7 files changed, 7 insertions(+), 628 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/lw/EnricherLightweightTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/lw/EnricherLightweightTest.java deleted file mode 100644 index 4cbc5a15dbb..000 --- a/core/camel-core/src/test/java/org/apache/camel/impl/lw/EnricherLightweightTest.java +++ /dev/null @@ -1,59 +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.impl.lw; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -public class EnricherLightweightTest extends ContextTestSupport { - -@Override -@BeforeEach -public void setUp() throws Exception { -setUseLightweightContext(true); -super.setUp(); -} - -@Test -public void testEnrich() throws Exception { -MockEndpoint mock = getMockEndpoint("mock:enriched"); -mock.expectedBodiesReceived("res-1", "res-2", "res-3"); - -template.sendBody("direct:start", 1); -template.sendBody("direct:start", 2); -template.sendBody("direct:start", 3); - -mock.assertIsSatisfied(); -} - -@Override -protected RouteBuilder createRouteBuilder() throws Exception { -return new RouteBuilder() { -@Override -public void configure() throws Exception { -from("direct:start").enrichWith("direct:resource") -.body(Integer.class, String.class, (o, n) -> n + o).to("mock:enriched"); - -// set an empty message -from("direct:resource").transform().body(b -> "res-"); -} -}; -} -} diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/lw/LightweightContextTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/lw/LightweightContextTest.java deleted file mode 100644 index a63b990c300..000 --- a/core/camel-core/src/test/java/org/apache/camel/impl/lw/LightweightContextTest.java +++ /dev/null @@ -1,82 +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.impl.lw; - -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -public class LightweightContextTest extends ContextTestSupport { - -@Override -@BeforeEach -public void setUp() throws Exception { -
[camel] branch main updated (7b46bffed6c -> 259f1f844a8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 7b46bffed6c Upgrade CycloneDX Maven Plugin to version 2.7.7 new ac4b5cf638e CAMEL-19292: camel-core - Remove experimental LightweightCamelContext new 259f1f844a8 CAMEL-19292: camel-core - Remove experimental LightweightCamelContext 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: .../camel/impl/lw/LightweightCamelContext.java | 1480 .../impl/lw/LightweightCamelContextExtension.java | 600 .../impl/lw/LightweightRuntimeCamelContext.java| 1350 -- .../java/org/apache/camel/ContextTestSupport.java | 20 +- .../camel/impl/lw/EnricherLightweightTest.java | 59 - .../camel/impl/lw/LightweightContextTest.java | 82 -- .../camel/impl/lw/PollEnricherLightweightTest.java | 154 -- .../camel/impl/lw/SplitterLightweightTest.java | 326 - .../dsl/jbang/core/commands/CodeRestGenerator.java |4 +- .../apache/camel/dsl/jbang/core/commands/Init.java |6 +- .../apache/camel/dsl/jbang/core/commands/Run.java |4 +- 11 files changed, 8 insertions(+), 4077 deletions(-) delete mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java delete mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java delete mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/EnricherLightweightTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/LightweightContextTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/PollEnricherLightweightTest.java delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/lw/SplitterLightweightTest.java
[camel] 01/02: CAMEL-19292: camel-core - Remove experimental LightweightCamelContext
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit ac4b5cf638e765a55c47b336c01fcda700b789d0 Author: Claus Ibsen AuthorDate: Mon Apr 24 20:06:09 2023 +0200 CAMEL-19292: camel-core - Remove experimental LightweightCamelContext --- .../camel/impl/lw/LightweightCamelContext.java | 1480 .../impl/lw/LightweightCamelContextExtension.java | 600 .../impl/lw/LightweightRuntimeCamelContext.java| 1350 -- .../java/org/apache/camel/ContextTestSupport.java | 20 +- 4 files changed, 1 insertion(+), 3449 deletions(-) diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java deleted file mode 100644 index aa6423fc0fb..000 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java +++ /dev/null @@ -1,1480 +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.impl.lw; - -import java.io.IOException; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; - -import org.apache.camel.CamelContext; -import org.apache.camel.CatalogCamelContext; -import org.apache.camel.Component; -import org.apache.camel.ConsumerTemplate; -import org.apache.camel.Endpoint; -import org.apache.camel.Experimental; -import org.apache.camel.Expression; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.FluentProducerTemplate; -import org.apache.camel.GlobalEndpointConfiguration; -import org.apache.camel.NoSuchLanguageException; -import org.apache.camel.Predicate; -import org.apache.camel.Processor; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.RouteConfigurationsBuilder; -import org.apache.camel.RouteTemplateContext; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.ServiceStatus; -import org.apache.camel.ShutdownRoute; -import org.apache.camel.ShutdownRunningTask; -import org.apache.camel.StartupListener; -import org.apache.camel.StartupSummaryLevel; -import org.apache.camel.TypeConverter; -import org.apache.camel.ValueHolder; -import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.model.FaultToleranceConfigurationDefinition; -import org.apache.camel.model.ModelCamelContext; -import org.apache.camel.model.ModelLifecycleStrategy; -import org.apache.camel.model.ProcessorDefinition; -import org.apache.camel.model.Resilience4jConfigurationDefinition; -import org.apache.camel.model.RouteConfigurationDefinition; -import org.apache.camel.model.RouteDefinition; -import org.apache.camel.model.RouteTemplateDefinition; -import org.apache.camel.model.TemplatedRouteDefinition; -import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; -import org.apache.camel.model.language.ExpressionDefinition; -import org.apache.camel.model.rest.RestDefinition; -import org.apache.camel.model.transformer.TransformerDefinition; -import org.apache.camel.model.validator.ValidatorDefinition; -import org.apache.camel.spi.BeanRepository; -import org.apache.camel.spi.CamelContextNameStrategy; -import org.apache.camel.spi.ClassResolver; -import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.DataType; -import org.apache.camel.spi.Debugger; -import org.apache.camel.spi.EndpointRegistry; -import org.apache.camel.spi.ExecutorServiceManager; -import org.apache.camel.spi.InflightRepository; -import org.apache.camel.spi.Injector; -import org.apache.camel.spi.Language; -import org.apache.camel.spi.LifecycleStrategy; -import org.apache.camel.spi.ManagementNameStrategy; -import org.apache.camel.spi.ManagementStrategy; -import org.apache.camel.spi.MessageHistoryFactory; -import org.apache.camel.spi.ModelReifierFactory; -import org.apache.camel.spi.PropertiesComponent; -import org.apache.camel.spi.Registry; -import
[GitHub] [camel] davsclaus commented on pull request #9921: doc: Add default camel metrics to micrometer component
davsclaus commented on PR #9921: URL: https://github.com/apache/camel/pull/9921#issuecomment-1520603045 |camel.message.history| Timer.Sample | Sample of performance of each node in the route when message history is enabled -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] mertdotcc commented on issue #4192: Startup times take way longer than advertised numbers
mertdotcc commented on issue #4192: URL: https://github.com/apache/camel-k/issues/4192#issuecomment-1520585220 Thanks for the replies! Yes, @essobedo, you are right. I have been using the JVM mode all along. @squakez This is super strange... What might be causing me to have 39 seconds of startup time while you have 3.15 seconds? Camel startup time in your example output is also much faster at 140ms while mine is 1.8 seconds. I want to get to the bottom of this and if there is anything (any difference between our clusters, etc) you think might be causing this discrepancy please let me know and I'll try it on my end. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] gansheer commented on pull request #9921: doc: Add default camel metrics to micrometer component
gansheer commented on PR #9921: URL: https://github.com/apache/camel/pull/9921#issuecomment-1520569518 > Hmm we should check what that message history metric really output I did not actually manage to see this one, if you have any idea what it does don't hesitate. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #9921: doc: Add default camel metrics to micrometer component
davsclaus commented on PR #9921: URL: https://github.com/apache/camel/pull/9921#issuecomment-1520545661 Hmm we should check what that message history metric really output -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #9921: doc: Add default camel metrics to micrometer component
github-actions[bot] commented on PR #9921: URL: https://github.com/apache/camel/pull/9921#issuecomment-1520538113 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 2 | 2 | 0 | 2 | -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] gansheer commented on pull request #9921: doc: Add default camel metrics to micrometer component
gansheer commented on PR #9921: URL: https://github.com/apache/camel/pull/9921#issuecomment-1520471387 Some metrics might still be missing, if anyone see one missing please feel free to tell me. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #9921: doc: Add default camel metrics to micrometer component
github-actions[bot] commented on PR #9921: URL: https://github.com/apache/camel/pull/9921#issuecomment-1520470626 :star2: Thank you for your contribution to the Apache Camel project! :star2: :warning: Please note that the changes on this PR may be **tested automatically**. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] gansheer opened a new pull request, #9921: doc: Add default camel metrics to micrometer component
gansheer opened a new pull request, #9921: URL: https://github.com/apache/camel/pull/9921 # Description Add the default Camel metrics on the micrometer component documentation. # Target - [X] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [X] I checked that each commit in the pull request has a meaningful subject line and body. - [X] I formatted the code using `mvn -Pformat,fastinstall install && mvn -Psourcecheck` -- 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 (1e8cd803627 -> 7b46bffed6c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 1e8cd803627 CAMEL-19294: do use the configured Zookeeper container add 397bb163024 CAMEL-19293: set dn only once (#9914) add 7b46bffed6c Upgrade CycloneDX Maven Plugin to version 2.7.7 No new revisions were added by this update. Summary of changes: .../camel/component/springldap/SpringLdapProducer.java | 12 +++- pom.xml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-)
[GitHub] [camel-karavan] davsclaus commented on issue #743: How can I get more documentations on using and configuring karavan?
davsclaus commented on issue #743: URL: https://github.com/apache/camel-karavan/issues/743#issuecomment-1520455829 What kind of documentation are you looking for? A goal of karavan is to make the UI designer intuitive so users can start learning to use it by reading a little bit of docs, and then try some examples, play on their own etc. And watch existing videos etc. Apache Camel in general is a large framework, and if you need to go deeper, then it takes time to master. For that the documentation on the Camel website can help, or for some users then buying one of the recent Camel books makes them get a lot more out of Camel than users whom dont do that. ASF is an open community so help is very welcome. https://camel.apache.org/community/contributing/ If you get more experienced with Karavan, then what others have done in the past, is to write their own blog post about their journey and share this with the internet. Its also possible to have a blog post published on the Camel website. https://github.com/apache/camel-website However back to your question. Can you elaborate a bit more what specific documentation you are looking for, with Karavan -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] davsclaus commented on issue #745: Run or export integration failed on VS code (windows)
davsclaus commented on issue #745: URL: https://github.com/apache/camel-karavan/issues/745#issuecomment-1520446895 @trickMin its hard to read your responses via email. Do you mind typing/pasting the working command here on github as a 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
[GitHub] [camel-k] essobedo commented on issue #4192: Startup times take way longer than advertised numbers
essobedo commented on issue #4192: URL: https://github.com/apache/camel-k/issues/4192#issuecomment-1520415463 AFAIU this ticket is about the JVM mode -- 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_3x updated (3f602cadbac -> 00c85607857)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 3f602cadbac CAMEL-19294: do use the configured Zookeeper container add 00c85607857 CAMEL-19293: set dn only once (#9914) No new revisions were added by this update. Summary of changes: .../camel/component/springldap/SpringLdapProducer.java | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-)
[camel-quarkus] branch main updated: Upgrade Cyclonedx Maven Plugin to version 2.7.7
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-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e48dcbe74f Upgrade Cyclonedx Maven Plugin to version 2.7.7 e48dcbe74f is described below commit e48dcbe74faaaefc78f26a1c78e2cd03c96a09cd Author: Andrea Cosentino AuthorDate: Mon Apr 24 17:23:19 2023 +0200 Upgrade Cyclonedx Maven Plugin to version 2.7.7 Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e35115051..1f3f2fb852 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ 3.5.5 -2.7.6 +2.7.7 3.1.0 3.0.0 2.17.1
[GitHub] [camel-quarkus] oscerd merged pull request #4824: Upgrade Cyclonedx Maven Plugin to version 2.7.7
oscerd merged PR #4824: URL: https://github.com/apache/camel-quarkus/pull/4824 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek commented on pull request #4721: Cxf ws-rm tests coverage - JVM only
JiriOndrusek commented on PR #4721: URL: https://github.com/apache/camel-quarkus/pull/4721#issuecomment-1520393672 The failure is JVM only. - I built quarkus-cxf based on tag 2.0.1 with cherry-picked commit 6da272f1e30bfca24056c836b7c59934affc2aa6 - I run test [CxfSoapWsrmTest](https://github.com/JiriOndrusek/camel-quarkus/blob/CQ4689-cxf-wsrm-coverage-PR/integration-test-groups/cxf-soap/cxf-soap-ws-rm/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wsrm/it/CxfSoapWsrmTest.java) in JVM mode. The result is the same failure as without fix. ``` [ERROR] CxfSoapWsrmTest.testWSRM:66 1 expectation failed. Response body doesn't match expectation. Expected: "Hello wsrm2!" Actual: Hello wsrm1! ``` Here is the test scenario. I hope it is correct. 1. Send msg01 2. receive msg01 3. Send msg02 -> lost by MessageLossSimulator 4. receive msg02 (because of reliable messaging - the second attempt) Failure is caused by the fact that message in the step 4 is `msg01`, Which was happening because RM does not acknowledge that the message `msg01` is received therefore it is send for the second time -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Upgrade CycloneDX Maven Plugin to version 2.7.7
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 7b46bffed6c Upgrade CycloneDX Maven Plugin to version 2.7.7 7b46bffed6c is described below commit 7b46bffed6cb4178ab2469f4ccf28d6215740f95 Author: Andrea Cosentino AuthorDate: Mon Apr 24 17:09:54 2023 +0200 Upgrade CycloneDX Maven Plugin to version 2.7.7 Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e3cfb020e9..e2b0baf6c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 3.0 2.1.0 4.0.11 -2.7.6 +2.7.7 false
[GitHub] [camel-quarkus] oscerd opened a new pull request, #4824: Upgrade Cyclonedx Maven Plugin to version 2.7.7
oscerd opened a new pull request, #4824: URL: https://github.com/apache/camel-quarkus/pull/4824 -- 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] 01/01: Upgrade Cyclonedx Maven Plugin to version 2.7.7
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch cyclonedx-maven-plugin-2.7.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9b7e25ce6db940653d39f82cce2fe55d20b326d5 Author: Andrea Cosentino AuthorDate: Mon Apr 24 17:23:19 2023 +0200 Upgrade Cyclonedx Maven Plugin to version 2.7.7 Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e35115051..1f3f2fb852 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ 3.5.5 -2.7.6 +2.7.7 3.1.0 3.0.0 2.17.1
[camel-quarkus] branch cyclonedx-maven-plugin-2.7.7 created (now 9b7e25ce6d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch cyclonedx-maven-plugin-2.7.7 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 9b7e25ce6d Upgrade Cyclonedx Maven Plugin to version 2.7.7 This branch includes the following new commits: new 9b7e25ce6d Upgrade Cyclonedx Maven Plugin to version 2.7.7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-kamelets] branch regen_bot updated (20866f7e -> 8eaa13ad)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 20866f7e Regen SBOM from commit 52a77a269561e660b81af41dd2dcac815be92a6e add 8eaa13ad Upgrade CycloneDX Maven Plugin to version 2.7.7 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot updated (397bb163024 -> 1e8cd803627)
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 397bb163024 CAMEL-19293: set dn only once (#9914) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (1e8cd803627) \ O -- O -- O (397bb163024) 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/component/springldap/SpringLdapProducer.java | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-)
[camel-kamelets] branch main updated: Upgrade CycloneDX Maven Plugin to version 2.7.7
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 8eaa13ad Upgrade CycloneDX Maven Plugin to version 2.7.7 8eaa13ad is described below commit 8eaa13ad45e0f8038ef99376b4e685974bf6c56b Author: Andrea Cosentino AuthorDate: Mon Apr 24 17:20:31 2023 +0200 Upgrade CycloneDX Maven Plugin to version 2.7.7 Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7cbe1b7..00f0fc15 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 3.1.0 2.1.1 0.14 - 2.7.6 + 2.7.7 4.0.0-M2 2.0.6
[GitHub] [camel-kamelets] oscerd merged pull request #1454: Upgrade CycloneDX Maven Plugin to version 2.7.7
oscerd merged PR #1454: URL: https://github.com/apache/camel-kamelets/pull/1454 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch cyclonedx-maven-plugin-2.7.7 created (now adec4086)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch cyclonedx-maven-plugin-2.7.7 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at adec4086 Upgrade CycloneDX Maven Plugin to version 2.7.7 This branch includes the following new commits: new adec4086 Upgrade CycloneDX Maven Plugin to version 2.7.7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-kamelets] 01/01: Upgrade CycloneDX Maven Plugin to version 2.7.7
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch cyclonedx-maven-plugin-2.7.7 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit adec4086fa88838c1bd6a4496e13f059c939795c Author: Andrea Cosentino AuthorDate: Mon Apr 24 17:20:31 2023 +0200 Upgrade CycloneDX Maven Plugin to version 2.7.7 Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7cbe1b7..00f0fc15 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 3.1.0 2.1.1 0.14 - 2.7.6 + 2.7.7 4.0.0-M2 2.0.6
[GitHub] [camel-k] squakez commented on issue #4192: Startup times take way longer than advertised numbers
squakez commented on issue #4192: URL: https://github.com/apache/camel-k/issues/4192#issuecomment-1520375255 I start having the feeling that the problem is that we do not include the openapi generated route in the sources required at build time. Wdyt @essobedo ? -- 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: Fix #734
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 872f5e6a Fix #734 872f5e6a is described below commit 872f5e6a50ea03b38eb97a152ebd3e6f209f57bb Author: Marat Gubaidullin AuthorDate: Mon Apr 24 11:15:52 2023 -0400 Fix #734 --- karavan-core/src/core/api/CamelUtil.ts| 9 + karavan-core/src/core/api/ComponentApi.ts | 22 +++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/karavan-core/src/core/api/CamelUtil.ts b/karavan-core/src/core/api/CamelUtil.ts index 831b38e6..aa63af27 100644 --- a/karavan-core/src/core/api/CamelUtil.ts +++ b/karavan-core/src/core/api/CamelUtil.ts @@ -176,13 +176,14 @@ export class CamelUtil { } static getComponentProperties = (element: any): ComponentProperty[] => { -const dslName: string = (element as any).dslName; -if (['ToDynamicDefinition', 'ToDefinition'].includes(dslName)){ +const dslName: string = (element as any).dslName; const component = ComponentApi.findByName(dslName); -return component ? ComponentApi.getComponentProperties(component?.component.name,'producer') : []; -} else { const uri: string = (element as any).uri; const name = ComponentApi.getComponentNameFromUri(uri); +if (['ToDynamicDefinition'].includes(dslName)){ +const component = ComponentApi.findByName(dslName); +return component ? ComponentApi.getComponentProperties(component?.component.name,'producer') : []; +} else { if (name){ const component = ComponentApi.findByName(name); return component ? ComponentApi.getComponentProperties(component?.component.name, element.dslName === 'FromDefinition' ? 'consumer' : 'producer') : []; diff --git a/karavan-core/src/core/api/ComponentApi.ts b/karavan-core/src/core/api/ComponentApi.ts index 4176ffcc..a50a00a3 100644 --- a/karavan-core/src/core/api/ComponentApi.ts +++ b/karavan-core/src/core/api/ComponentApi.ts @@ -87,19 +87,27 @@ export const ComponentApi = { }, getComponentNameFromUri: (uri: string): string | undefined => { -return uri.split(":")[0]; +return uri !== undefined ? uri.split(":")[0] : undefined; }, getComponentTitleFromUri: (uri: string): string | undefined => { -const componentName = uri.split(":")[0]; -const title = ComponentApi.findByName(componentName)?.component.title; -return title ? title : componentName; +if (uri !== undefined) { +const componentName = uri.split(":")[0]; +const title = ComponentApi.findByName(componentName)?.component.title; +return title ? title : componentName; +} else { +return undefined; +} }, getComponentDescriptionFromUri: (uri: string): string | undefined => { -const componentName = uri.split(":")[0]; -const description = ComponentApi.findByName(componentName)?.component.description; -return description ? description : componentName; +if (uri !== undefined) { +const componentName = uri.split(":")[0]; +const description = ComponentApi.findByName(componentName)?.component.description; +return description ? description : componentName; +} else { +return undefined; +} }, getUriParts: (uri: string): Map => {
[camel] branch regen_bot updated (b67f6142884 -> 397bb163024)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from b67f6142884 Regen for commit 42519b8ee3d70c99352ad7ef3fc8343c1b920275 add 5a996736918 (chores) ci: do builds for PRs on Camel 3.20.x branch add 1f1ae1efa86 (chores) ci: fixed incorrect step name add 1e8cd803627 CAMEL-19294: do use the configured Zookeeper container add 397bb163024 CAMEL-19293: set dn only once (#9914) No new revisions were added by this update. Summary of changes: .github/workflows/generic-pr.yaml| 2 +- .github/workflows/pr-build-camel-3.yml | 2 +- .../camel/component/springldap/SpringLdapProducer.java | 12 +++- .../test/infra/zookeeper/services/ZooKeeperContainer.java| 2 +- 4 files changed, 10 insertions(+), 8 deletions(-)
[camel] branch regen_bot_3x updated (3fe748c4ddf -> 3f602cadbac)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 3fe748c4ddf camel-jbang - Upgrade to newer camel-kamelets release add 3f602cadbac CAMEL-19294: do use the configured Zookeeper container No new revisions were added by this update. Summary of changes: .../apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel-k] squakez commented on issue #4192: Startup times take way longer than advertised numbers
squakez commented on issue #4192: URL: https://github.com/apache/camel-k/issues/4192#issuecomment-1520344271 I am testing this locally and I cannot see any deviation from what we expect when we run it in JVM mode: ``` [2] 2023-04-24 14:41:25,734 INFO [org.apa.cam.k.Runtime] (main) Apache Camel K Runtime 1.17.0 [2] 2023-04-24 14:41:25,753 INFO [org.apa.cam.qua.cor.CamelBootstrapRecorder] (main) Bootstrap runtime: org.apache.camel.quarkus.main.CamelMainRuntime [2] 2023-04-24 14:41:25,756 INFO [org.apa.cam.mai.MainSupport] (main) Apache Camel (Main) 3.20.1 is starting [2] 2023-04-24 14:41:25,798 INFO [org.apa.cam.k.lis.SourcesConfigurer] (main) Loading routes from: SourceDefinition{name='TestOne', language='java', type='source', location='file:/etc/camel/sources/TestOne.java', } [2] 2023-04-24 14:41:26,698 INFO [org.apa.cam.k.lis.SourcesConfigurer] (main) Loading routes from: SourceDefinition{name='test-one-openapi', language='xml', type='source', location='file:/etc/camel/sources/test-one-openapi.xml', } [2] 2023-04-24 14:41:27,006 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Apache Camel 3.20.1 (camel-1) is starting [2] 2023-04-24 14:41:27,023 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Routes startup (started:4) [2] 2023-04-24 14:41:27,023 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started mertGet (direct://mertGet) [2] 2023-04-24 14:41:27,023 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started mertPost (direct://mertPost) [2] 2023-04-24 14:41:27,024 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started route1 (rest://get:/mert) [2] 2023-04-24 14:41:27,024 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started route2 (rest://post:/mert) [2] 2023-04-24 14:41:27,024 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Apache Camel 3.20.1 (camel-1) started in 140ms (build:0ms init:123ms start:17ms) [2] 2023-04-24 14:41:27,117 INFO [io.quarkus] (main) camel-k-integration 1.12.0 on JVM (powered by Quarkus 2.16.0.Final) started in 3.159s. Listening on: http://0.0.0.0:8080 [2] 2023-04-24 14:41:27,118 INFO [io.quarkus] (main) Profile prod activated. [2] 2023-04-24 14:41:27,118 INFO [io.quarkus] (main) Installed features: [camel-attachments, camel-bean, camel-core, camel-direct, camel-java-joor-dsl, camel-k-core, camel-k-runtime, camel-kubernetes, camel-platform-http, camel-rest, camel-xml-io-dsl, cdi, kubernetes-client, security, smallrye-context-propagation, vertx] ``` However, something strange happens when I am running in native mode (which is what you may be experiencing): ``` [2] 2023-04-24 14:43:36,452 INFO [org.apa.cam.k.Runtime] (main) Apache Camel K Runtime 1.17.0 [2] 2023-04-24 14:43:36,966 INFO [org.apa.cam.qua.cor.CamelBootstrapRecorder] (main) Bootstrap runtime: org.apache.camel.quarkus.main.CamelMainRuntime [2] 2023-04-24 14:43:37,056 INFO [org.apa.cam.mai.MainSupport] (main) Apache Camel (Main) 3.20.1 is starting [2] 2023-04-24 14:43:37,356 INFO [org.apa.cam.k.lis.SourcesConfigurer] (main) Loading routes from: SourceDefinition{name='TestOne', language='java', type='source', location='file:/etc/camel/sources/TestOne.java', } [2] 2023-04-24 14:43:50,771 INFO [org.apa.cam.k.lis.SourcesConfigurer] (main) Loading routes from: SourceDefinition{name='test-one-openapi', language='xml', type='source', location='file:/etc/camel/sources/test-one-openapi.xml', } [2] 2023-04-24 14:43:53,956 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Apache Camel 3.20.1 (camel-1) is starting [2] 2023-04-24 14:43:54,052 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Routes startup (started:4) [2] 2023-04-24 14:43:54,053 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started mertGet (direct://mertGet) [2] 2023-04-24 14:43:54,053 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started mertPost (direct://mertPost) [2] 2023-04-24 14:43:54,054 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started route1 (rest://get:/mert) [2] 2023-04-24 14:43:54,055 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Started route2 (rest://post:/mert) [2] 2023-04-24 14:43:54,056 INFO [org.apa.cam.imp.eng.AbstractCamelContext] (main) Apache Camel 3.20.1 (camel-1) started in 1s396ms (build:0ms init:1s297ms start:99ms) [2] 2023-04-24 14:43:54,858 INFO [io.quarkus] (main) camel-k-integration 1.12.0 on JVM (powered by Quarkus 2.16.0.Final) started in 42.794s. Listening on: http://0.0.0.0:8080 [2] 2023-04-24 14:43:54,858 INFO [io.quarkus] (main) Profile prod activated. [2] 2023-04-24 14:43:54,859 INFO [io.quarkus] (main) Installed features: [camel-attachments, camel-bean, camel-core, camel-direct, camel-java-joor-dsl, camel-k-core, camel-k-runtime, camel-kubernetes, camel-microprofile-health, camel-platform-http, camel-rest,
[GitHub] [camel-quarkus] ffang commented on pull request #4721: Cxf ws-rm tests coverage - JVM only
ffang commented on PR #4721: URL: https://github.com/apache/camel-quarkus/pull/4721#issuecomment-1520343491 > Hi @ffang , I tried this PR changes with quarkiverse-cxf with commit 6da272f1e30bfca24056c836b7c59934affc2aa6 The result is still the same - failure. Is there any configuration required for your change? Hi @JiriOndrusek , Could you please clarify that the failure is native or JVM? My fix in quarkus-cxf is to enable VertxDestination for the decoupled endpoint and so fix up the "piggybacked" WARN message from the log, it doesn't touch native thing. Thanks! Freeman -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek commented on issue #1705: SNMP native support
JiriOndrusek commented on issue #1705: URL: https://github.com/apache/camel-quarkus/issues/1705#issuecomment-1520340842 I started working on this issue, but get stuck. See [comment](https://github.com/apache/camel-quarkus/issues/4820#issuecomment-1520284262). -- 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