[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-1518489466 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 4770392627-1094-2d31f8f2-08f6-4820-9629-2949c3409630 * Camel Quarkus Commit: cb83eb3b5e64744168bd7caec109c1b148a06921 * Quarkus Main Commit: 1c3faa0303e67a0ffe7260669eb15da54c03b49d * Link to build: https://github.com/apache/camel-quarkus/actions/runs/4770392627 -- 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 c46181432a Updated CHANGELOG.md c46181432a is described below commit c46181432a7bcb59a6d29ff1b100eedc99d2330f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Apr 22 03:16:53 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97aa1b3099..1daa55e515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,15 +7,22 @@ **Closed issues:** - \[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) +- CXF generates different WSDL files with JVM/Native modes [\#4746](https://github.com/apache/camel-quarkus/issues/4746) - Add Build-Date in MANIFEST.MF in Camel Quarkus release JARs [\#4711](https://github.com/apache/camel-quarkus/issues/4711) - Olingo4 olingo4endpointPropertyNames are missing queryParams for read method [\#4654](https://github.com/apache/camel-quarkus/issues/4654) +- Camel 3.19 - Add camel-cli-connector extension [\#4051](https://github.com/apache/camel-quarkus/issues/4051) **Merged pull requests:** +- 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)) - 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)) - Add OpenTelemetry documentation for CDI bean instrumentation [\#4802](https://github.com/apache/camel-quarkus/pull/4802) ([jamesnetherton](https://github.com/jamesnetherton)) - release: complete release process to be more explicit [\#4800](https://github.com/apache/camel-quarkus/pull/4800) ([aldettinger](https://github.com/aldettinger)) - Restore maven.wagon.http.retryHandler.count to CQ\_MAVEN\_ARGS [\#4795](https://github.com/apache/camel-quarkus/pull/4795) ([jamesnetherton](https://github.com/jamesnetherton))
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #822: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4)
github-actions[bot] opened a new pull request, #822: URL: https://github.com/apache/camel-spring-boot/pull/822 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on pull request #4818: Bump quarkiverse-pooled-jms.version from 2.0.0.CR2 to 2.0.0
github-actions[bot] commented on PR #4818: URL: https://github.com/apache/camel-quarkus/pull/4818#issuecomment-1518388156 Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/4769244625 -- 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 dependabot/maven/quarkiverse-pooled-jms.version-2.0.0 updated (c05cff3aa1 -> e70009b726)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.0.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from c05cff3aa1 Bump quarkiverse-pooled-jms.version from 2.0.0.CR2 to 2.0.0 add e70009b726 Auto generated changes for dependabot commit c05cff3aa1f862d92a092bc96476ec8749ecaeda No new revisions were added by this update. Summary of changes: 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 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
[camel-quarkus] branch dependabot/maven/quarkiverse-pooled-jms.version-2.0.0 created (now c05cff3aa1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.0.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at c05cff3aa1 Bump quarkiverse-pooled-jms.version from 2.0.0.CR2 to 2.0.0 No new revisions were added by this update.
[GitHub] [camel-quarkus] dependabot[bot] opened a new pull request, #4818: Bump quarkiverse-pooled-jms.version from 2.0.0.CR2 to 2.0.0
dependabot[bot] opened a new pull request, #4818: URL: https://github.com/apache/camel-quarkus/pull/4818 Bumps `quarkiverse-pooled-jms.version` from 2.0.0.CR2 to 2.0.0. Updates `quarkus-pooled-jms` from 2.0.0.CR2 to 2.0.0 Updates `quarkus-pooled-jms-deployment` from 2.0.0.CR2 to 2.0.0 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
[camel-spring-boot] annotated tag camel-spring-boot-3.20.4 created (now c446f01270d)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-spring-boot-3.20.4 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at c446f01270d (tag) tagging 489411d88ecafe950cb51fa76ec76b3cceef68f5 (commit) replaces camel-spring-boot-3.20.2 by Gregor Zurowski on Fri Apr 21 19:15:58 2023 + - Log - [maven-release-plugin] copy for tag camel-spring-boot-3.20.4 --- No new revisions were added by this update.
[camel-spring-boot] 01/02: Target Camel 3.20.4 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.20.4 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 050e17ff90e99eca50a6adc5c711d625ede633f6 Author: Gregor Zurowski AuthorDate: Fri Apr 21 18:45:53 2023 + Target Camel 3.20.4 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0ae704df54d..5fc253891f8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.20.4-SNAPSHOT +3.20.4 org.apache.camel.springboot @@ -111,7 +111,7 @@ 2.7.11 -3.20.4-SNAPSHOT +3.20.4 1.0.2.v20150114 @@ -453,7 +453,7 @@ dev -3.20.4-SNAPSHOT +3.20.4
[camel-spring-boot] branch release/3.20.4 created (now 489411d88ec)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.20.4 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 489411d88ec [maven-release-plugin] prepare release camel-spring-boot-3.20.4 This branch includes the following new commits: new 050e17ff90e Target Camel 3.20.4 for release new 489411d88ec [maven-release-plugin] prepare release camel-spring-boot-3.20.4 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot updated (0734e92b015 -> 511b04f25a7)
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 0734e92b015 Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 add 511b04f25a7 CAMEL-18943: Migrate to saxon 12.1 and change the detection method of… (#9912) No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../camel/component/xquery/XQueryBuilder.java | 8 ++- .../apache/camel/converter/jaxp/XmlConverter.java | 68 +++--- .../support/builder/xml/XMLConverterHelper.java| 65 +++-- parent/pom.xml | 2 +- 5 files changed, 103 insertions(+), 42 deletions(-)
[camel] branch main updated (0734e92b015 -> 511b04f25a7)
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 0734e92b015 Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 add 511b04f25a7 CAMEL-18943: Migrate to saxon 12.1 and change the detection method of… (#9912) No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../camel/component/xquery/XQueryBuilder.java | 8 ++- .../apache/camel/converter/jaxp/XmlConverter.java | 68 +++--- .../support/builder/xml/XMLConverterHelper.java| 65 +++-- parent/pom.xml | 2 +- 5 files changed, 103 insertions(+), 42 deletions(-)
[GitHub] [camel] davsclaus merged pull request #9912: CAMEL-18943: Migrate to saxon 12.1 and change the detection method of…
davsclaus merged PR #9912: URL: https://github.com/apache/camel/pull/9912 -- 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] annotated tag camel-3.20.4 created (now ac62dcd5984)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-3.20.4 in repository https://gitbox.apache.org/repos/asf/camel.git at ac62dcd5984 (tag) tagging b7d934f8c3c434939126f41dffcab0d3903bda8b (commit) replaces camel-3.20.2 by Gregor Zurowski on Fri Apr 21 16:03:59 2023 + - Log - [maven-release-plugin] copy for tag camel-3.20.4 --- No new revisions were added by this update.
[camel] branch release/3.20.4 created (now b7d934f8c3c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.20.4 in repository https://gitbox.apache.org/repos/asf/camel.git at b7d934f8c3c [maven-release-plugin] prepare release camel-3.20.4 This branch includes the following new commits: new b7d934f8c3c [maven-release-plugin] prepare release camel-3.20.4 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-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-1518027733 Hi @JiriOndrusek , Could you please run your test here in camel-quarkus against my patch(https://github.com/quarkiverse/quarkus-cxf/pull/835) from quarkus-cxf to see if it addresses the issue? 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] github-actions[bot] commented on pull request #9912: CAMEL-18943: Migrate to saxon 12.1 and change the detection method of…
github-actions[bot] commented on PR #9912: URL: https://github.com/apache/camel/pull/9912#issuecomment-1517953904 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 3 | 3 | 0 | 4 | -- 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] pintomic commented on issue #4158: Error creating Integration with Kaniko build strategy and Docker Desktop
pintomic commented on issue #4158: URL: https://github.com/apache/camel-k/issues/4158#issuecomment-1517861345 Looks like we're running into the same issue on AKS after upgrading to kubernetes version 1.25. We're running camel k in version 1.10.4. Upgrading the operator to 1.12.0 didn't solve the problem. Looking forward for any advice on how to fix the issue. -- 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 #9912: CAMEL-18943: Migrate to saxon 12.1 and change the detection method of…
github-actions[bot] commented on PR #9912: URL: https://github.com/apache/camel/pull/9912#issuecomment-1517834728 :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] alex-nt opened a new pull request, #9912: CAMEL-18943: Migrate to saxon 12.1 and change the detection method of…
alex-nt opened a new pull request, #9912: URL: https://github.com/apache/camel/pull/9912 # Description From saxon 11.1 [a feature was removed that we use](https://www.saxonica.com/documentation12/index.html#!configuration/config-features). > MESSAGE_EMITTER_CLASS > http://saxon.sf.net/feature/messageEmitterClass > From Saxon 11.1, this option has no effect. On 11.x it runs and it ignores that option. On 12.x it starts throwing an exception: ``` Caused by: java.lang.IllegalArgumentException: Unknown configuration property http://saxon.sf.net/feature/messageEmitterClass at net.sf.saxon.Configuration.setFeature(Configuration.java:4865) at net.sf.saxon.Configuration.setConfigurationProperty(Configuration.java:4303) at net.sf.saxon.jaxp.SaxonTransformerFactory.setAttribute(SaxonTransformerFactory.java:340) at org.apache.camel.converter.jaxp.XmlConverter.configureSaxonTransformerFactory(XmlConverter.java:1109) at org.apache.camel.converter.jaxp.XmlConverter.createTransformerFactory(XmlConverter.java:1070) ``` This approach uses the [version class from a saxon](https://www.saxonica.com/html/documentation10/javadoc/net/sf/saxon/Version.html#getStructuredVersionNumber()), (available at least since version 8 - on a quick search I was unable to find older docs) to decide on whether to apply or not the setting. # 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 - [CAMEL-18943](https://issues.apache.org/jira/browse/CAMEL-18943) # 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-quarkus] 01/02: Snmp: Extend test coverage #4797
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.13.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1d4be4b6b0b65e83e79959d260faec1b05c1b700 Author: JiriOndrusek AuthorDate: Thu Apr 20 15:31:01 2023 +0200 Snmp: Extend test coverage #4797 --- integration-tests-jvm/snmp/pom.xml | 5 + .../quarkus/component/snmp/it/SnmpResource.java| 120 -- .../camel/quarkus/component/snmp/it/SnmpRoute.java | 66 ++ .../camel/quarkus/component/snmp/it/SnmpTest.java | 67 +- .../component/snmp/it/SnmpTestResource.java| 135 + 5 files changed, 377 insertions(+), 16 deletions(-) diff --git a/integration-tests-jvm/snmp/pom.xml b/integration-tests-jvm/snmp/pom.xml index 2249e2ef99..2bab5bbb6c 100644 --- a/integration-tests-jvm/snmp/pom.xml +++ b/integration-tests-jvm/snmp/pom.xml @@ -46,6 +46,11 @@ quarkus-junit5 test + +org.awaitility +awaitility +test + io.rest-assured rest-assured diff --git a/integration-tests-jvm/snmp/src/main/java/org/apache/camel/quarkus/component/snmp/it/SnmpResource.java b/integration-tests-jvm/snmp/src/main/java/org/apache/camel/quarkus/component/snmp/it/SnmpResource.java index 1bacfd172f..50ffa07c0e 100644 --- a/integration-tests-jvm/snmp/src/main/java/org/apache/camel/quarkus/component/snmp/it/SnmpResource.java +++ b/integration-tests-jvm/snmp/src/main/java/org/apache/camel/quarkus/component/snmp/it/SnmpResource.java @@ -16,36 +16,130 @@ */ package org.apache.camel.quarkus.component.snmp.it; +import java.util.Deque; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import javax.inject.Named; import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.camel.CamelContext; -import org.jboss.logging.Logger; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.component.snmp.SnmpMessage; +import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.snmp4j.PDU; +import org.snmp4j.PDUv1; +import org.snmp4j.mp.SnmpConstants; +import org.snmp4j.smi.OID; +import org.snmp4j.smi.OctetString; +import org.snmp4j.smi.TimeTicks; +import org.snmp4j.smi.Variable; +import org.snmp4j.smi.VariableBinding; @Path("/snmp") @ApplicationScoped public class SnmpResource { -private static final Logger LOG = Logger.getLogger(SnmpResource.class); +@ConfigProperty(name = "snmpListenAddress") +String snmpListenAddress; + +@Inject +@Named("snmpTrapResults") +Map> snmpResults; -private static final String COMPONENT_SNMP = "snmp"; @Inject -CamelContext context; +ProducerTemplate producerTemplate; -@Path("/load/component/snmp") +@Path("/producePDU") @GET @Produces(MediaType.TEXT_PLAIN) -public Response loadComponentSnmp() throws Exception { -/* This is an autogenerated test */ -if (context.getComponent(COMPONENT_SNMP) != null) { -return Response.ok().build(); -} -LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_SNMP); -return Response.status(500, COMPONENT_SNMP + " could not be loaded from the Camel context").build(); +public Response producePDU() { +String url = String.format("snmp://%s?retries=1", snmpListenAddress); +SnmpMessage pdu = producerTemplate.requestBody(url, "", SnmpMessage.class); + +String response = pdu.getSnmpMessage().getVariableBindings().stream() +.filter(vb -> vb.getOid().equals(SnmpConstants.sysDescr)) +.map(vb -> vb.getVariable().toString()) +.collect(Collectors.joining()); + +return Response.ok(response).build(); +} + +@Path("/sendPoll") +@GET +@Produces(MediaType.TEXT_PLAIN) +public Response sendPoll() { +SnmpMessage pdu = producerTemplate.requestBody("direct:producePoll", "", SnmpMessage.class); + +String response = pdu.getSnmpMessage().getVariableBindings().stream() +.filter(vb -> vb.getOid().equals(SnmpConstants.sysDescr)) +.map(vb -> vb.getVariable().toString()) +.collect(Collectors.joining()); + +return Response.ok(response).build(); +} + +@Path("/getNext") +@POST +@Produces(MediaType.TEXT_PLAIN) +public Response getNext(String payload) { +String url = String.format("snmp://%s?type=GET_NEXT&retries=1&protocol=udp&oids=%s", snmpListenAddress, +SnmpConstants.sysDescr); +List pdu = producerTemplate.requestBody(url, "", List.class); + +St
[camel-quarkus] branch 2.13.x updated (9f1a5ffaf5 -> 0abb742b53)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 2.13.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 9f1a5ffaf5 Add a limitation doc about pooling support for camel-quarkus-amqp (#4809) new 1d4be4b6b0 Snmp: Extend test coverage #4797 new 0abb742b53 Regen poms 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: integration-tests-jvm/snmp/pom.xml | 5 + .../quarkus/component/snmp/it/SnmpResource.java| 120 -- .../camel/quarkus/component/snmp/it/SnmpRoute.java | 45 --- .../camel/quarkus/component/snmp/it/SnmpTest.java | 67 +- .../component/snmp/it/SnmpTestResource.java| 135 + poms/bom/pom.xml | 6 + poms/bom/src/main/generated/flattened-full-pom.xml | 6 + .../src/main/generated/flattened-reduced-pom.xml | 6 + .../generated/flattened-reduced-verbose-pom.xml| 6 + 9 files changed, 361 insertions(+), 35 deletions(-) copy integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java => integration-tests-jvm/snmp/src/main/java/org/apache/camel/quarkus/component/snmp/it/SnmpRoute.java (50%) create mode 100644 integration-tests-jvm/snmp/src/test/java/org/apache/camel/quarkus/component/snmp/it/SnmpTestResource.java
[camel-quarkus] 02/02: Regen poms
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.13.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0abb742b539b5bbd310c5e069d940a5f9dcc58a4 Author: JiriOndrusek AuthorDate: Fri Apr 21 09:22:04 2023 +0200 Regen poms --- poms/bom/pom.xml | 6 ++ poms/bom/src/main/generated/flattened-full-pom.xml| 6 ++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 ++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 ++ 4 files changed, 24 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index d87386205c..efe48c43de 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6891,6 +6891,12 @@ org.asynchttpclient async-http-client ${ahc.version} + + +jakarta.activation +jakarta.activation-api + + org.bouncycastle diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index f2d4b7cd7f..a543030885 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6827,6 +6827,12 @@ org.asynchttpclient async-http-client 2.12.3 + + +jakarta.activation +jakarta.activation-api + + org.bouncycastle diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index f15c0f5d3a..7e69255a5b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6822,6 +6822,12 @@ org.asynchttpclient async-http-client 2.12.3 + + +jakarta.activation +jakarta.activation-api + + org.bouncycastle 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 a4615d0cdb..51ac6d2007 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6822,6 +6822,12 @@ org.asynchttpclient async-http-client 2.12.3 + + +jakarta.activation +jakarta.activation-api + + org.bouncycastle
[GitHub] [camel-quarkus] jamesnetherton merged pull request #4816: Snmp: Extend test coverage for 2.13.x
jamesnetherton merged PR #4816: URL: https://github.com/apache/camel-quarkus/pull/4816 -- 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 #4816: Snmp: Extend test coverage for 2.13.x
JiriOndrusek commented on PR #4816: URL: https://github.com/apache/camel-quarkus/pull/4816#issuecomment-1517711662 Failure is not related to this PR (error happens in `mail` tests) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba merged pull request #4815: Upgrade cassandra-quarkus to 1.2.0
zbendhiba merged PR #4815: URL: https://github.com/apache/camel-quarkus/pull/4815 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Upgrade cassandra-quarkus to 1.2.0
This is an automated email from the ASF dual-hosted git repository. zbendhiba 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 1c3faa0303 Upgrade cassandra-quarkus to 1.2.0 1c3faa0303 is described below commit 1c3faa0303e67a0ffe7260669eb15da54c03b49d Author: James Netherton AuthorDate: Fri Apr 21 07:44:50 2023 +0100 Upgrade cassandra-quarkus to 1.2.0 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 78 +++--- .../src/main/generated/flattened-reduced-pom.xml | 4 +- .../generated/flattened-reduced-verbose-pom.xml| 26 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index b971819623..dac248bb7d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ ${camel.docs.components.version}@components camel-${camel.major.minor}.x camel-spring-boot-${camel.major.minor}.x - 1.2.0-alpha1 +1.2.0 2.1.2.Final 8.31.0.Final 2.0.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7f64650076..243a4b19f4 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -20096,9 +20096,9 @@ 12.15.2 -com.datastax.oss -java-driver-core -4.15.0 +com.datastax.oss +java-driver-core +4.15.0 com.github.stephenc.jcip @@ -20109,70 +20109,70 @@ jsr305 -io.dropwizard.metrics -metrics-core +io.dropwizard.metrics +metrics-core -org.hdrhistogram -HdrHistogram +org.hdrhistogram +HdrHistogram -org.apache.tinkerpop -gremlin-core -3.5.3 +org.apache.tinkerpop +gremlin-core +3.5.3 -org.yaml -snakeyaml +org.yaml +snakeyaml -com.carrotsearch -hppc +com.carrotsearch +hppc -com.jcabi -* +com.jcabi +* -net.objecthunter -exp4j +net.objecthunter +exp4j -true +true -org.apache.tinkerpop -tinkergraph-gremlin -3.5.3 -true +org.apache.tinkerpop +tinkergraph-gremlin +3.5.3 +true -com.esri.geometry -esri-geometry-api -1.2.1 -true +com.esri.geometry +esri-geometry-api +1.2.1 +true -com.datastax.oss.quarkus -cassandra-quarkus-client -1.2.0-alpha1 +com.datastax.oss.quarkus +cassandra-quarkus-client +1.2.0 -com.datastax.oss.quarkus -cassandra-quarkus-client-deployment -1.2.0-alpha1 +com.datastax.oss.quarkus +cassandra-quarkus-client-deployment +1.2.0 -com.datastax.oss.quarkus -cassandra-quarkus-test-framework -1.2.0-alpha1 +com.datastax.oss.quarkus +cassandra-quarkus-test-framework +1.2.0 -com.datastax.oss.quarkus -cassandra-quarkus-mapper-processor -1.2.0-alpha1 +com.datastax.oss.quarkus +cassandra-quarkus-mapper-processor +1.2.0 com.datastax.oss diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 89d90a6567..79bb7146f6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7384,12 +7384,12 @@ com.datastax.oss.quarkus cassandra-quarkus-client -1.2.0-alpha1 +1.2.0 com.datastax.oss.quarkus cassandra-quarkus-client-deployment -1.2.0-alpha1 +1.2.0 com.datastax.oss 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 19a4d3bf70..35a28bde45 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7359,9 +7359,9 @@ 12.15.2 -com.datastax.oss -java-driver-core -4.15.0 +com.datastax.oss +java-driver-core
[camel] branch camel-3.20.x updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.20.x by this push: new 61ba2c64860 Regen 61ba2c64860 is described below commit 61ba2c648602a471c92bcf4a07360a22e35c6551 Author: Claus Ibsen AuthorDate: Fri Apr 21 13:35:05 2023 +0200 Regen --- .../resources/org/apache/camel/catalog/components/aws2-ec2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json index ed7f20c96f5..525afecfbcd 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json @@ -41,7 +41,7 @@ }, "headers": { "CamelAwsEC2ImageId": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "An image ID of the AWS marketplace", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" }, -"CamelAwsEC2InstanceType": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [ "a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge" [...] +"CamelAwsEC2InstanceType": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [ "a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge" [...] "CamelAwsEC2Operation": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation we want to perform", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" }, "CamelAwsEC2InstanceMinCount": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The minimum number of instances we want to run.", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" }, "CamelAwsEC2InstanceMaxCount": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The maximum number of instances we want to run.", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" },
[camel] branch camel-3.20.x updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.20.x by this push: new 067d05e3b83 Regen 067d05e3b83 is described below commit 067d05e3b83ad4380421b33b3f935c47f2cc5d34 Author: Claus Ibsen AuthorDate: Fri Apr 21 13:11:28 2023 +0200 Regen --- .../salesforce/RestApiIntegrationTest.java | 3 +- .../salesforce/dto/generated/ContentVersion.java | 177 + 2 files changed, 110 insertions(+), 70 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java index 9a5d1048c88..68a98e4e8d5 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java @@ -473,8 +473,7 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase { cv.setVersionDataUrl(enc); cv.setPathOnClient("camel-test-doc.pdf"); cv.setTitle("Camel Test Doc"); -final CreateSObjectResult result = -template.requestBody("salesforce:createSObject", cv, CreateSObjectResult.class); +final CreateSObjectResult result = template.requestBody("salesforce:createSObject", cv, CreateSObjectResult.class); assertNotNull(result.getId()); } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java index c3e622010e5..da2f3738fd4 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java @@ -24,20 +24,14 @@ import java.util.List; import javax.annotation.Generated; -import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; -import org.apache.camel.component.salesforce.api.dto.Attributes; -import org.apache.camel.component.salesforce.api.dto.ChildRelationShip; -import org.apache.camel.component.salesforce.api.dto.InfoUrls; -import org.apache.camel.component.salesforce.api.dto.NamedLayoutInfo; -import org.apache.camel.component.salesforce.api.dto.RecordTypeInfo; -import org.apache.camel.component.salesforce.api.dto.SObjectDescription; -import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; -import org.apache.camel.component.salesforce.api.dto.SObjectField; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; +import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; +import org.apache.camel.component.salesforce.api.dto.SObjectDescription; +import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; +import org.apache.camel.component.salesforce.api.dto.SObjectField; import org.apache.camel.component.salesforce.api.utils.AsNestedPropertyResolver; /** @@ -64,17 +58,17 @@ public class ContentVersion extends AbstractDescribedSObjectBase { this.ContentDocumentId = ContentDocumentId; } -//private ContentDocument ContentDocument; -// -//@JsonProperty("ContentDocument") -//public ContentDocument getContentDocument() { -//return this.ContentDocument; -//} -// -//@JsonProperty("ContentDocument") -//public void setContentDocument(ContentDocument ContentDocument) { -//this.ContentDocument = ContentDocument; -//} +//private ContentDocument ContentDocument; +// +//@JsonProperty("ContentDocument") +//public ContentDocument getContentDocument() { +//return this.ContentDocument; +//} +// +//@JsonProperty("ContentDocument") +//public void setContentDocument(ContentDocument ContentDocument) { +//this.ContentDocument = ContentDocument; +//} private Boolean IsLatest; @JsonProperty("IsLatest") @@ -122,6 +116,7 @@ public class ContentVersion extends AbstractDescribedSObjectBase { public void setContentBody(AbstractDescribedSObjectBase ContentBody) { this.ContentBody = ContentBody; } +
[GitHub] [camel] davsclaus commented on pull request #9896: Bump jetty-server from 9.4.44.v20210927 to 10.0.14 in /components/camel-solr
davsclaus commented on PR #9896: URL: https://github.com/apache/camel/pull/9896#issuecomment-1517615368 this is used for testing only, and our current version of solr only works with 9.4.44, and cannot be upgraded -- 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 (2339379ceaa -> 0734e92b015)
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 2339379ceaa Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 add e99f4035a7c Regen for commit 308dc6b2f021e025fa09447116451eecd02a80d3 add 0734e92b015 Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 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 (2339379ceaa) \ N -- N -- N refs/heads/regen_bot (0734e92b015) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel] github-actions[bot] closed pull request #9911: Generated sources regen
github-actions[bot] closed pull request #9911: Generated sources regen URL: https://github.com/apache/camel/pull/9911 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request, #9911: Generated sources regen
github-actions[bot] opened a new pull request, #9911: URL: https://github.com/apache/camel/pull/9911 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.20.x updated: [Minor] Apply formatter
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.20.x by this push: new d9256a0564b [Minor] Apply formatter d9256a0564b is described below commit d9256a0564b5e410a82f47cc0a949cef10b94ed9 Author: Gregor Zurowski AuthorDate: Fri Apr 21 11:28:21 2023 +0200 [Minor] Apply formatter --- .../camel/component/azure/storage/blob/integration/BlobConsumerIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobConsumerIT.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobConsumerIT.java index 18c570c4643..bb7ebc37c41 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobConsumerIT.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobConsumerIT.java @@ -67,7 +67,6 @@ class BlobConsumerIT extends Base { batchContainerClient = serviceClient.getBlobContainerClient(batchContainerName); prefixContainerClient = serviceClient.getBlobContainerClient(prefixContainerName); - // create test container containerClient.create(); batchContainerClient.create(); @@ -189,7 +188,7 @@ class BlobConsumerIT extends Base { } } - @Test +@Test void testPrefixBasedPolling() throws InterruptedException { final MockEndpoint mockEndpoint = getMockEndpoint("mock:resultPrefix"); mockEndpoint.expectedMessageCount(1);
[GitHub] [camel-k] fhossfel commented on issue #4266: [Regrassion] javax.xml.parsers.FactoryConfigurationError: Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found
fhossfel commented on issue #4266: URL: https://github.com/apache/camel-k/issues/4266#issuecomment-1517539025 For what it is worth: This is the dependency list from the build log {"level":"info","ts":1682067527.7278018,"logger":"camel-k.builder","msg":"artifacts: [camel-k-integration-1.12.0.jar io.github.crac.org-crac-0.1.3.jar io.quarkus.quarkus-bootstrap-runner-2.16.0.Final.jar io.quarkus.quarkus-development-mode-spi-2.16.0.Final.jar io.smallrye.common.smallrye-common-io-1.13.2.jar org.glassfish.jakarta.json-1.1.6.jar org.graalvm.sdk.graal-sdk-22.3.0.jar org.jboss.logging.jboss-logging-3.5.0.Final.jar org.jboss.logmanager.jboss-logmanager-embedded-1.0.11.jar org.wildfly.common.wildfly-common-1.5.4.Final-format-001.jar com.fasterxml.jackson.core.jackson-annotations-2.14.1.jar com.fasterxml.jackson.core.jackson-core-2.14.1.jar com.fasterxml.jackson.core.jackson-databind-2.14.1.jar com.fasterxml.jackson.dataformat.jackson-dataformat-yaml-2.14.1.jar com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.14.1.jar com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.14.1.jar com.fasterxml.jackson.module.jackson-module-parameter-names-2.14.1.jar com.github. mifmif.generex-1.0.2.jar com.squareup.okhttp3.logging-interceptor-3.14.9.jar com.squareup.okhttp3.okhttp-3.14.9.jar com.squareup.okio.okio-1.17.2.jar commons-codec.commons-codec-1.15.jar dk.brics.automaton.automaton-1.11-8.jar io.fabric8.kubernetes-client-6.3.1.jar io.fabric8.kubernetes-client-api-6.3.1.jar io.fabric8.kubernetes-httpclient-okhttp-6.3.1.jar io.fabric8.kubernetes-model-admissionregistration-6.3.1.jar io.fabric8.kubernetes-model-apiextensions-6.3.1.jar io.fabric8.kubernetes-model-apps-6.3.1.jar io.fabric8.kubernetes-model-autoscaling-6.3.1.jar io.fabric8.kubernetes-model-batch-6.3.1.jar io.fabric8.kubernetes-model-certificates-6.3.1.jar io.fabric8.kubernetes-model-common-6.3.1.jar io.fabric8.kubernetes-model-coordination-6.3.1.jar io.fabric8.kubernetes-model-core-6.3.1.jar io.fabric8.kubernetes-model-discovery-6.3.1.jar io.fabric8.kubernetes-model-events-6.3.1.jar io.fabric8.kubernetes-model-extensions-6.3.1.jar io.fabric8.kubernetes-model-flowcontrol-6.3.1.jar io.fabr ic8.kubernetes-model-gatewayapi-6.3.1.jar io.fabric8.kubernetes-model-metrics-6.3.1.jar io.fabric8.kubernetes-model-networking-6.3.1.jar io.fabric8.kubernetes-model-node-6.3.1.jar io.fabric8.kubernetes-model-policy-6.3.1.jar io.fabric8.kubernetes-model-rbac-6.3.1.jar io.fabric8.kubernetes-model-scheduling-6.3.1.jar io.fabric8.kubernetes-model-storageclass-6.3.1.jar io.fabric8.openshift-client-6.3.1.jar io.fabric8.openshift-client-api-6.3.1.jar io.fabric8.openshift-model-6.3.1.jar io.fabric8.openshift-model-clusterautoscaling-6.3.1.jar io.fabric8.openshift-model-config-6.3.1.jar io.fabric8.openshift-model-console-6.3.1.jar io.fabric8.openshift-model-hive-6.3.1.jar io.fabric8.openshift-model-installer-6.3.1.jar io.fabric8.openshift-model-machine-6.3.1.jar io.fabric8.openshift-model-machineconfig-6.3.1.jar io.fabric8.openshift-model-miscellaneous-6.3.1.jar io.fabric8.openshift-model-monitoring-6.3.1.jar io.fabric8.openshift-model-operator-6.3.1.jar io.fabric8.openshift-model-operatorhu b-6.3.1.jar io.fabric8.openshift-model-storageversionmigrator-6.3.1.jar io.fabric8.openshift-model-tuned-6.3.1.jar io.fabric8.openshift-model-whereabouts-6.3.1.jar io.fabric8.zjsonpatch-0.3.0.jar io.quarkus.arc.arc-2.16.0.Final.jar io.quarkus.quarkus-arc-2.16.0.Final.jar io.quarkus.quarkus-core-2.16.0.Final.jar io.quarkus.quarkus-fs-util-0.0.9.jar io.quarkus.quarkus-jackson-2.16.0.Final.jar io.quarkus.quarkus-jsonp-2.16.0.Final.jar io.quarkus.quarkus-kubernetes-client-2.16.0.Final.jar io.quarkus.quarkus-kubernetes-client-internal-2.16.0.Final.jar io.quarkus.quarkus-logging-json-2.16.0.Final.jar io.quarkus.quarkus-security-2.16.0.Final.jar io.quarkus.quarkus-security-runtime-spi-2.16.0.Final.jar io.quarkus.security.quarkus-security-1.1.4.Final.jar io.smallrye.common.smallrye-common-annotation-1.13.2.jar io.smallrye.common.smallrye-common-classloader-1.13.2.jar io.smallrye.common.smallrye-common-constraint-1.13.2.jar io.smallrye.common.smallrye-common-expression-1.13.2.jar io.smallrye .common.smallrye-common-function-1.13.2.jar io.smallrye.config.smallrye-config-2.13.1.jar io.smallrye.config.smallrye-config-common-2.13.1.jar io.smallrye.config.smallrye-config-core-2.13.1.jar io.smallrye.config.smallrye-config-source-yaml-2.13.1.jar io.smallrye.reactive.mutiny-1.8.0.jar jakarta.annotation.jakarta.annotation-api-1.3.5.jar jakarta.el.jakarta.el-api-3.0.3.jar jakarta.enterprise.jakarta.enterprise.cdi-api-2.0.2.jar jakarta.inject.jakarta.inject-api-1.0.jar jakarta.interceptor.jakarta.interceptor-api-1.2.5.jar jakarta.transaction.jakarta.transaction-api-1.3.3.jar net.sf.saxon.Saxon-HE-11.4.jar org.apache.camel.camel-api-3.20.1.jar org.apache.camel.camel-base-3.20.1.jar org.apache.camel.camel-base-engine-
[camel] branch main updated: Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716
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 0734e92b015 Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 0734e92b015 is described below commit 0734e92b0155c798573a5775387b19f6cafc648f Author: oscerd AuthorDate: Fri Apr 21 09:15:43 2023 + Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 Signed-off-by: GitHub --- .../dsl/DebeziumDb2ComponentBuilderFactory.java| 64 -- .../DebeziumMongodbComponentBuilderFactory.java| 138 +++-- .../dsl/DebeziumMysqlComponentBuilderFactory.java | 64 -- .../dsl/DebeziumOracleComponentBuilderFactory.java | 69 +-- .../DebeziumPostgresComponentBuilderFactory.java | 43 ++-- .../DebeziumSqlserverComponentBuilderFactory.java | 82 ++-- .../dsl/DebeziumDb2EndpointBuilderFactory.java | 99 + .../dsl/DebeziumMongodbEndpointBuilderFactory.java | 223 +++-- .../dsl/DebeziumMySqlEndpointBuilderFactory.java | 99 + .../dsl/DebeziumOracleEndpointBuilderFactory.java | 109 ++ .../DebeziumPostgresEndpointBuilderFactory.java| 58 +++--- .../DebeziumSqlserverEndpointBuilderFactory.java | 133 .../dsl/IgniteCacheEndpointBuilderFactory.java | 7 +- 13 files changed, 605 insertions(+), 583 deletions(-) diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java index 52add2705bc..fdb77fb03aa 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java @@ -715,22 +715,6 @@ public interface DebeziumDb2ComponentBuilderFactory { doSetProperty("retriableRestartConnectorWaitMs", retriableRestartConnectorWaitMs); return this; } -/** - * Whether field names will be sanitized to Avro naming conventions. - * - * The option is a:boolean
type. - * - * Default: false - * Group: db2 - * - * @param sanitizeFieldNames the value to set - * @return the dsl builder - */ -default DebeziumDb2ComponentBuilder sanitizeFieldNames( -boolean sanitizeFieldNames) { -doSetProperty("sanitizeFieldNames", sanitizeFieldNames); -return this; -} /** * The name of the SchemaHistory class that should be used to store and * recover database schema changes. The configuration properties for the @@ -785,6 +769,26 @@ public interface DebeziumDb2ComponentBuilderFactory { doSetProperty("schemaHistoryInternalSkipUnparseableDdl", schemaHistoryInternalSkipUnparseableDdl); return this; } +/** + * Controls what DDL will Debezium store in database schema history. By + * default (true) only DDL that manipulates a table from captured + * schema/database will be stored. If set to false, then Debezium will + * store all incoming DDL statements. + * + * The option is a:boolean
type. + * + * Default: false + * Group: db2 + * + * @param schemaHistoryInternalStoreOnlyCapturedDatabasesDdl the value + * to set + * @return the dsl builder + */ +default DebeziumDb2ComponentBuilder schemaHistoryInternalStoreOnlyCapturedDatabasesDdl( +boolean schemaHistoryInternalStoreOnlyCapturedDatabasesDdl) { + doSetProperty("schemaHistoryInternalStoreOnlyCapturedDatabasesDdl", schemaHistoryInternalStoreOnlyCapturedDatabasesDdl); +return this; +} /** * Controls what DDL will Debezium store in database schema history. By * default (false) Debezium will store all incoming DDL statements. If @@ -809,7 +813,10 @@ public interface DebeziumDb2ComponentBuilderFactory { * Specify how schema names should be adjusted for compatibility with * the message converter used by the connector, including: 'avro' * replaces the characters that cannot be used in the Avro type name - * with underscore; 'none' does not apply any adjustment (default). + * with underscore; 'avro_unicode' replaces the underscore or characters + * that cannot be used in the Avro type name with corresponding unicode + * like _u. Note: _ is an escape sequence like backslash in + * Java;'none' does not apply any adju
[GitHub] [camel] oscerd merged pull request #9910: Generated sources regen
oscerd merged PR #9910: URL: https://github.com/apache/camel/pull/9910 -- 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] fhossfel opened a new issue, #4266: [Regrassion] javax.xml.parsers.FactoryConfigurationError: Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found
fhossfel opened a new issue, #4266: URL: https://github.com/apache/camel-k/issues/4266 I am not sure what changed but since yesterday I am suddenly getting an error when trying to run a saxon-xslt: // camel-k: resource=file:common_json2xml.xslt from('timer:saxontest?period=1') .setBody(constant("{\"name\":\"John\", \"age\":30, \"car\":null}")) .to('xslt-saxon:file:/etc/camel/resources/common_json2xml.xslt') .to("log:info?showBody=true&showHeaders=true") ` The XSLT `common_json2xml.xslt` has the following content: http://www.w3.org/1999/XSL/Transform"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:fn="http://www.w3.org/2005/xpath-functions"; xsi:schemaLocation="http://www.w3.org/1999/XSL/Transform https://www.w3.org/2007/schema-for-xslt20.xsd"; exclude-result-prefixes="xs fn xsi"> I get the following error: [1] 2023-04-21 09:00:38,513 ERROR [io.qua.run.Application] (main) Failed to start application (with profile [prod]): javax.xml.parsers.FactoryConfigurationError: Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found [1] at javax.xml.parsers.SAXParserFactory.newInstance(Unknown Source) [1] at org.xmlresolver.ResolverFeature.lambda$static$0(ResolverFeature.java:408) [1] at org.xmlresolver.cache.ResourceCache.reset(ResourceCache.java:208) [1] at org.xmlresolver.cache.ResourceCache.(ResourceCache.java:145) [1] at org.xmlresolver.XMLResolverConfiguration.getFeature(XMLResolverConfiguration.java:1098) [1] at org.xmlresolver.CatalogResolver.(CatalogResolver.java:51) [1] at org.xmlresolver.Resolver.(Resolver.java:68) [1] at net.sf.saxon.lib.CatalogResourceResolver.(CatalogResourceResolver.java:46) [1] at net.sf.saxon.Configuration.init(Configuration.java:367) [1] at net.sf.saxon.Configuration.(Configuration.java:230) [1] at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) [1] at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) [1] at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) [1] at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) [1] at java.base/java.lang.Class.newInstance(Class.java:584) [1] at net.sf.saxon.Configuration.newConfiguration(Configuration.java:246) [1] at net.sf.saxon.s9api.Processor.(Processor.java:69) [1] at net.sf.saxon.jaxp.SaxonTransformerFactory.(SaxonTransformerFactory.java:59) [1] at net.sf.saxon.TransformerFactoryImpl.(TransformerFactoryImpl.java:42) [1] at org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint.createXsltBuilder(XsltSaxonEndpoint.java:202) [1] at org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint.doInit(XsltSaxonEndpoint.java:168) This was still working yesterday morning. Not sure what has changed. I have not upgraded Camel-K. Bot CLI and operator are a 1.12.0. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request, #9910: Generated sources regen
github-actions[bot] opened a new pull request, #9910: URL: https://github.com/apache/camel/pull/9910 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (e0e9c1cd890 -> 2339379ceaa)
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 e0e9c1cd890 Regen for commit 308dc6b2f021e025fa09447116451eecd02a80d3 add d78512652a7 CAMEL-19287 - camel-debezium - Upgrade to 2.2 add 7a21dcf5b11 CAMEL-19267 - camel-debezium - Upgrade to 2.2 add 2339379ceaa Regen for commit 7a21dcf5b117936a7bd81c5a1f575faef72bb716 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 (e0e9c1cd890) \ N -- N -- N refs/heads/regen_bot (2339379ceaa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../camel/catalog/components/debezium-db2.json | 10 +- .../camel/catalog/components/debezium-mongodb.json | 18 +- .../camel/catalog/components/debezium-mysql.json | 10 +- .../camel/catalog/components/debezium-oracle.json | 14 +- .../catalog/components/debezium-postgres.json | 8 +- .../catalog/components/debezium-sqlserver.json | 12 +- .../debezium/DebeziumDb2ComponentConfigurer.java | 18 +- .../debezium/DebeziumDb2EndpointConfigurer.java| 18 +- .../debezium/DebeziumDb2EndpointUriFactory.java| 5 +- .../Db2ConnectorEmbeddedDebeziumConfiguration.java | 43 +- .../camel/component/debezium/debezium-db2.json | 10 +- .../DebeziumMongodbComponentConfigurer.java| 42 +- .../DebeziumMongodbEndpointConfigurer.java | 42 +- .../DebeziumMongodbEndpointUriFactory.java | 9 +- ...goDbConnectorEmbeddedDebeziumConfiguration.java | 723 + .../camel/component/debezium/debezium-mongodb.json | 18 +- .../debezium/DebeziumMongodbComponentTest.java | 4 +- ...ConnectorEmbeddedDebeziumConfigurationTest.java | 6 +- .../debezium/DebeziumMySqlComponentConfigurer.java | 18 +- .../debezium/DebeziumMySqlEndpointConfigurer.java | 18 +- .../debezium/DebeziumMySqlEndpointUriFactory.java | 5 +- ...ySqlConnectorEmbeddedDebeziumConfiguration.java | 43 +- .../camel/component/debezium/debezium-mysql.json | 10 +- .../DebeziumOracleComponentConfigurer.java | 18 +- .../debezium/DebeziumOracleEndpointConfigurer.java | 18 +- .../debezium/DebeziumOracleEndpointUriFactory.java | 5 +- ...acleConnectorEmbeddedDebeziumConfiguration.java | 50 +- .../camel/component/debezium/debezium-oracle.json | 14 +- .../DebeziumPostgresComponentConfigurer.java | 12 +- .../DebeziumPostgresEndpointConfigurer.java| 12 +- .../DebeziumPostgresEndpointUriFactory.java| 2 +- ...gresConnectorEmbeddedDebeziumConfiguration.java | 25 +- .../component/debezium/debezium-postgres.json | 8 +- .../DebeziumSqlserverComponentConfigurer.java | 24 +- .../DebeziumSqlserverEndpointConfigurer.java | 24 +- .../DebeziumSqlserverEndpointUriFactory.java | 6 +- ...rverConnectorEmbeddedDebeziumConfiguration.java | 58 +- .../component/debezium/debezium-sqlserver.json | 12 +- .../dsl/DebeziumDb2ComponentBuilderFactory.java| 64 +- .../DebeziumMongodbComponentBuilderFactory.java| 138 +--- .../dsl/DebeziumMysqlComponentBuilderFactory.java | 64 +- .../dsl/DebeziumOracleComponentBuilderFactory.java | 69 +- .../DebeziumPostgresComponentBuilderFactory.java | 43 +- .../DebeziumSqlserverComponentBuilderFactory.java | 82 ++- .../dsl/DebeziumDb2EndpointBuilderFactory.java | 99 ++- .../dsl/DebeziumMongodbEndpointBuilderFactory.java | 223 +-- .../dsl/DebeziumMySqlEndpointBuilderFactory.java | 99 ++- .../dsl/DebeziumOracleEndpointBuilderFactory.java | 109 ++-- .../DebeziumPostgresEndpointBuilderFactory.java| 58 +- .../DebeziumSqlserverEndpointBuilderFactory.java | 133 +++- .../dsl/IgniteCacheEndpointBuilderFactory.java | 7 +- parent/pom.xml | 2 +- 53 files changed, 1326 insertions(+), 1258 deletions(-)
[GitHub] [camel-quarkus] ppalaga commented on pull request #4803: Upgrade to quarkus-cxf 2.0.1, test for #4746
ppalaga commented on PR #4803: URL: https://github.com/apache/camel-quarkus/pull/4803#issuecomment-1517524794 The backport to 2.13.x is merged already: https://github.com/apache/camel-quarkus/pull/4806 -- 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 (8d701b27059 -> e04d1acd8ab)
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 8d701b27059 CAMEL-19275: Upgrade dependency for SB 2.7.11 add e04d1acd8ab Upgrade json-path 2.8.0 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-quarkus] 01/03: Upgrade to quarkus-cxf 2.0.1
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit fdc23d49adf8bb727024b387687020b0d172f79d Author: Peter Palaga AuthorDate: Wed Apr 19 20:23:25 2023 +0200 Upgrade to quarkus-cxf 2.0.1 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 449 +++-- .../src/main/generated/flattened-reduced-pom.xml | 61 +-- .../generated/flattened-reduced-verbose-pom.xml| 449 +++-- 4 files changed, 503 insertions(+), 458 deletions(-) diff --git a/pom.xml b/pom.xml index d48a12d02b..b971819623 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 8.31.0.Final 2.0.1 3.0.0 -2.0.0.CR1 +2.0.1 1.0.0 2.0.0.Alpha 3.0.0 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index cf2f84216e..7f64650076 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6611,381 +6611,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 +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -io.quarkiverse.cxf -quarkus-cxf -2.0.0.CR1 +io.quarkiverse.cxf +quarkus-cxf +2.0.1 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -2.0.0.CR1 +io.quarkiverse.cxf +quarkus-cxf-axiom-api-stub +2.0.1 -io.quarkiverse.cxf -quarkus-cxf-deployment -2.0.0.CR1 +io.quarkiverse.cxf +quarkus-cxf-deployment +2.0.1 -io.quarkiverse.cxf -qu
[camel-quarkus] 03/03: Avoid stale resources from previous builds and older branches in grouped modules
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit dc5c8c5b2fc8ab7168e248628c7e956aaa057e4e Author: Peter Palaga AuthorDate: Thu Apr 20 02:01:45 2023 +0200 Avoid stale resources from previous builds and older branches in grouped modules --- tooling/scripts/group-tests.groovy | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tooling/scripts/group-tests.groovy b/tooling/scripts/group-tests.groovy index 509dc07744..565e1df4bd 100644 --- a/tooling/scripts/group-tests.groovy +++ b/tooling/scripts/group-tests.groovy @@ -43,6 +43,15 @@ final Set commaConcatenatePropertyNames = ["quarkus.native.resources.inc final Map mergedFiles = new HashMap<>() concatRelPaths.each {relPath -> mergedFiles.put(relPath, new ResourceConcatenator(commaConcatenatePropertyNames)) } +def srcDestMap = [ +'src/main/java': destinationModuleDir.resolve('src/main/java'), +'src/test/java': destinationModuleDir.resolve('src/test/java'), +'src/main/resources': destinationModuleDir.resolve('src/main/resources'), +'src/test/resources': destinationModuleDir.resolve('src/test/resources') +] + +srcDestMap.forEach { src, dest -> new AntBuilder().delete(dir: dest)} + Files.list(sourceDir) .filter(p -> !fileExcludes.contains(p.getFileName().toString())) .filter { p -> Files.exists(p.resolve('pom.xml')) } @@ -51,10 +60,7 @@ Files.list(sourceDir) mergedFiles.each { relPath, cat -> cat.append(p.resolve(relPath)) } -copyResources(p.resolve('src/main/java'), destinationModuleDir.resolve('src/main/java')) -copyResources(p.resolve('src/test/java'), destinationModuleDir.resolve('src/test/java')) -copyResources(p.resolve('src/main/resources'), destinationModuleDir.resolve('src/main/resources')) -copyResources(p.resolve('src/test/resources'), destinationModuleDir.resolve('src/test/resources')) +srcDestMap.forEach { src, dest -> copyResources(p.resolve(src), dest) } } String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent
[camel-quarkus] 02/03: Test that WSDLs served in JVM and native modes are the same #4746
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit fcc04efbdbc2fa67ae281cf73f3cac0c709c9bef Author: Peter Palaga AuthorDate: Wed Apr 19 20:24:11 2023 +0200 Test that WSDLs served in JVM and native modes are the same #4746 --- .../src/main/resources/application.properties | 4 + .../component/cxf/soap/server/it/Java2wsIT.java| 24 .../component/cxf/soap/server/it/Java2wsTest.java | 126 + 3 files changed, 154 insertions(+) diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties index 4a1cfd60e5..9b23797edf 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties +++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/resources/application.properties @@ -23,3 +23,7 @@ quarkus.cxf.codegen.wsdl2java.includes = none.wsdl # ... and do everything with named parameter sets so that it works in the grouped module quarkus.cxf.codegen.wsdl2java.server.includes = wsdl/HelloService.wsdl quarkus.cxf.codegen.wsdl2java.server.additional-params = -wsdlLocation,classpath:wsdl/HelloService.wsdl,-xjc-Xts + +# java2ws +quarkus.cxf.java2ws.includes=org.apache.camel.quarkus.component.cxf.soap.server.it.CodeFirstService +quarkus.cxf.java2ws.wsdl-name-template=%TARGET_DIR%/Java2wsTest/%SIMPLE_CLASS_NAME%-from-java2ws.wsdl diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsIT.java b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsIT.java new file mode 100644 index 00..7c8d7ae1f7 --- /dev/null +++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsIT.java @@ -0,0 +1,24 @@ +/* + * 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 io.quarkiverse.cxf.it.server; + +import io.quarkus.test.junit.QuarkusIntegrationTest; + +@QuarkusIntegrationTest +public class Java2wsIT extends Java2wsTest { + +} diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsTest.java b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsTest.java new file mode 100644 index 00..e2ff935ef5 --- /dev/null +++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsTest.java @@ -0,0 +1,126 @@ +/* + * 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 io.quarkiverse.cxf.it.server; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.trans
[camel-quarkus] branch main updated (2f3dbfb2b9 -> dc5c8c5b2f)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 2f3dbfb2b9 Add camel-cli-connector extension. Fixes #4051 new fdc23d49ad Upgrade to quarkus-cxf 2.0.1 new fcc04efbdb Test that WSDLs served in JVM and native modes are the same #4746 new dc5c8c5b2f Avoid stale resources from previous builds and older branches in grouped modules The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/application.properties | 4 + .../component/cxf/soap/server/it/Java2wsIT.java} | 4 +- .../component/cxf/soap/server/it/Java2wsTest.java | 126 ++ pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 449 +++-- .../src/main/generated/flattened-reduced-pom.xml | 61 +-- .../generated/flattened-reduced-verbose-pom.xml| 449 +++-- tooling/scripts/group-tests.groovy | 14 +- 8 files changed, 645 insertions(+), 464 deletions(-) copy integration-test-groups/{foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/EipIT.java => cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsIT.java} (91%) create mode 100644 integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsTest.java
[GitHub] [camel-quarkus] ppalaga closed issue #4746: CXF generates different WSDL files with JVM/Native modes
ppalaga closed issue #4746: CXF generates different WSDL files with JVM/Native modes URL: https://github.com/apache/camel-quarkus/issues/4746 -- 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] ppalaga merged pull request #4803: Upgrade to quarkus-cxf 2.0.1, test for #4746
ppalaga merged PR #4803: URL: https://github.com/apache/camel-quarkus/pull/4803 -- 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] ppalaga commented on pull request #4803: Upgrade to quarkus-cxf 2.0.1, test for #4746
ppalaga commented on PR #4803: URL: https://github.com/apache/camel-quarkus/pull/4803#issuecomment-1517522760 Rebased again, not going to wait for the CI because it was green once already. -- 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_3.14.x updated (d0b1af7f2a0 -> 7db806dc02c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git from d0b1af7f2a0 CAMEL-19162: camel-ehcache - Should ignore exception when shutting down cache manager, which prevents from the component to be restarted again. add 31c33676680 camel-core - AdviceWithBuilder.maxDeep fix using 0 to disable depth. Thanks to Dmitrii Kriukov for reporting add e68adf32383 Camel-Graphql: Fixed code section in docs add 7db806dc02c Upgrade json-path 2.8.0 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- components/camel-graphql/src/main/docs/graphql-component.adoc | 2 +- .../src/main/java/org/apache/camel/builder/AdviceWithBuilder.java | 3 ++- parent/pom.xml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-)
[camel] branch main updated: Regen for commit 308dc6b2f021e025fa09447116451eecd02a80d3
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 e99f4035a7c Regen for commit 308dc6b2f021e025fa09447116451eecd02a80d3 e99f4035a7c is described below commit e99f4035a7cc088e6cffeb52cfd8d3aff39a233f Author: davsclaus AuthorDate: Fri Apr 21 09:04:18 2023 + Regen for commit 308dc6b2f021e025fa09447116451eecd02a80d3 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/components/ignite-cache.json | 6 +++--- .../org/apache/camel/component/ignite/cache/ignite-cache.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json index ba3e7bedde5..fa5002561e4 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json @@ -32,11 +32,11 @@ "headers": { "CamelIgniteCacheKey": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Object", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The cache key for the entry value in the message body.", "constantName": "org.apache.camel.component.ignite.IgniteConstants#IGNITE_CACHE_KEY" }, "CamelIgniteCacheQuery": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.apache.ignite.cache.query.Query", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The query to run when invoking the QUERY operation.", "constantName": "org.apache.camel.component.ignite.IgniteConstants#IGNITE_CACHE_QUERY" }, -"CamelIgniteCacheOperation": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheOperation", "enum": [ "GET", "PUT", "REMOVE", "SIZE", "REBALANCE", "QUERY", "CLEAR" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Allows you to dynamically change the cache operation to execute.", "constantName": "org.apache.camel.component. [...] +"CamelIgniteCacheOperation": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheOperation", "enum": [ "GET", "PUT", "REMOVE", "SIZE", "REBALANCE", "QUERY", "CLEAR", "REPLACE" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Allows you to dynamically change the cache operation to execute.", "constantName": "org.apache.camel [...] "CamelIgniteCachePeekMode": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.apache.ignite.cache.CachePeekMode", "enum": [ "ALL", "NEAR", "PRIMARY", "BACKUP", "ONHEAP", "OFFHEAP" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Allows you to dynamically change the cache peek mode when running the SIZE operation.", "constantName": "org.apache.camel.component.ignite.Ig [...] "CamelIgniteCacheEventType": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "javax.cache.event.EventType", "enum": [ "CREATED", "UPDATED", "REMOVED", "EXPIRED" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "This header carries the received event type when using the continuous query consumer.", "constantName": "org.apache.camel.component.ignite.IgniteConstants#IGNITE_C [...] "CamelIgniteCacheName": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "This header carries the cache name for which a continuous query event was received (consumer). It does not allow you to dynamically change the cache against which a producer operation is performed. Use EIPs for that (e.g. recipient list, dynamic [...] -"CamelIgniteCacheOldValue": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "Object", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "This header carries the old cache value when passed in the incoming cache event.", "constantName": "org.apache.camel.com
[GitHub] [camel] oscerd merged pull request #9909: Generated sources regen
oscerd merged PR #9909: URL: https://github.com/apache/camel/pull/9909 -- 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 (b34ec583d91 -> e0e9c1cd890)
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 b34ec583d91 CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version. add 6e87bb72797 CAMEL-19286: camel-ignite - Support the REPLACE operation in the Ignite Cache Producer (#9908) add 308dc6b2f02 Upgrade json-path 2.8.0 add e0e9c1cd890 Regen for commit 308dc6b2f021e025fa09447116451eecd02a80d3 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../camel/catalog/components/ignite-cache.json | 6 +++--- .../camel/component/ignite/cache/ignite-cache.json | 6 +++--- .../camel/component/ignite/IgniteConstants.java| 4 ++-- .../ignite/cache/IgniteCacheOperation.java | 3 ++- .../ignite/cache/IgniteCacheProducer.java | 22 +++ .../camel/component/ignite/IgniteCacheTest.java| 25 ++ parent/pom.xml | 2 +- 8 files changed, 59 insertions(+), 11 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #9909: Generated sources regen
github-actions[bot] opened a new pull request, #9909: URL: https://github.com/apache/camel/pull/9909 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] 31/31: Regenerate poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 00dbc8c5e4c53eb000ef86c58032653bb403c3f4 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] 22/31: Regen poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1a87ef843cbeb7aa3cdf633650bddb2081238a20 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 b77a2e77e7..de689da5f8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6558,6 +6558,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 @@ -6574,6 +6579,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 @@ -6584,6 +6600,11 @@ cxf-rt-ws-security 4.0.0 + +org.apache.cxf +cxf-rt-ws-rm +4.0.0 + org.apache.cxf cxf-rt-wsdl @@ -6844,6 +6865,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] 15/31: Disabled several foundation tests + fixin runtinme because of CAMEL-15105
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9570e396a3939b7b030bd6fee835cea344a99dea 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 b/integration-test-groups/foundation
[camel-quarkus] 23/31: Regen poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 132f092652dc265a605cb9efbf059cc57ee48ff3 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 de689da5f8..796c697e40 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6855,6 +6855,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 @@ -6865,6 +6870,11 @@ cxf-rt-frontend-simple 4.0.0 + +org.apache.cxf +cxf-rt-javascript +4.0.0 + org.apache.cxf cxf-rt-management @@ -6905,6 +6915,11 @@ cxf-tools-common 4.0.0 + +org.apache.cxf +cxf-tools-java2ws +4.0.0 + org.apache.cxf cxf-tools-validator
[camel-quarkus] 05/31: Ref #1746: Groovy language native support
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 689619efc8fc877408848e063f40690939cc6e6a 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 b/extensions-jvm/groovy/deployment/src/main/java/org/apache/camel/q
[camel-quarkus] 09/31: Fuxed Cxf-soap-client:missing licence in wsdl
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9cf6b09eff12707639f68b812d9adb801bee87c3 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] 29/31: Fixed jackson-jq-extra (CAMEL-19276)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0cf60a94bc0eda01baeee6b134e5440da662bd06 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 8db300950a..5f2641419c 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 8b28e8b380..1a1e86d999 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-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-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 +1.0.0-preview.2023
[camel-quarkus] 04/31: Add support of expressions referring an external resource
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f6a7e101a6b636a0bfd6686bbc2feb72327f96f1 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()) { -scripts.produ
[camel-quarkus] 06/31: Fix in http component (caused by upgrade of httpclient)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c49ce4d78d319b31d5bc15365cfec0a53fb7b958 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] 10/31: Generated flattened pom + add more information into cxf-soap-client assert
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6e832becc322342f240f79def74ccde742161463 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 ce8957e32b..aec0148809 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -840,7 +840,7 @@ org.apache.camel camel-elasticsearch -4.0.0-M2 +4.0.0-SNAPSHOT com.google.code.findbugs @@ -1717,7 +1717,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 b3b7abe00f..94358e4252 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -840,7 +840,7 @@ org.apache.camel camel-elasticsearch -4.0.0-M2 +4.0.0-SNAPSHOT com.google.code.findbugs @@ -1717,7 +1717,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 546f3c7af9..4b5c27f36b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -840,7 +840,7 @@ org.apache.camel camel-elasticsearch -4.0.0-M2 +4.0.0-SNAPSHOT com.google.code.findbugs @@ -1717,7 +1717,7 @@ org.apache.camel camel-mapstruct -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel
[camel-quarkus] 30/31: Fix of Opentelemetry test
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit a23d7f7dd71aee0a9358f0b2ffee6bf27a3b9185 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] 21/31: 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. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit e40a6d207b11ea5ab78ecf0c80a4e1c1b3346c8b 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] 28/31: Fix of upgrade jackson-jq
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d788d7e1e545b41f6492c00a76fbd32b5e138e5c 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 d4a3bfd95a..8db300950a 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 582bfbc0b7..8b28e8b380 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-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-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] 27/31: Regen poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 00ffdb4fbcbad6b666eae8f0fcd210be5a6bb12b 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 4d065e0212..582bfbc0b7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-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 @@ org.springframework spring-messaging -6.0.6 +6.0.8 org.springframework @@ -6480,7 +6480,7 @@ org.springframework spring-orm -6.0.6 +6.0.8 org.springframework @@ -6495,7 +6495,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] 19/31: Ref #4745: Add context plugins for the dry mode as expected
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f9a1c94fb5747835bb923a4005545c84c00071bd 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] 20/31: Regen poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 96cc5dd29ca695f16778eaede61d8f7f0d8b7b0c 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 796c697e40..b77a2e77e7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6558,11 +6558,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 @@ -6579,17 +6574,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 @@ -6600,11 +6584,6 @@ cxf-rt-ws-security 4.0.0 - -org.apache.cxf -cxf-rt-ws-rm -4.0.0 - org.apache.cxf cxf-rt-wsdl @@ -6855,11 +6834,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 @@ -6870,16 +6844,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 @@ -6915,11 +6879,6 @@ cxf-tools-common 4.0.0 - -org.apache.cxf -cxf-tools-java2ws -4.0.0 - org.apache.cxf cxf-tools-validator
[camel-quarkus] 14/31: Fixed compilation failures because of CAMEL-15105
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6b2fffd6884551aff26aaf2ddacded23d2631f3d 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()); +extendedCamelContext.addContextPlugin(ComponentNameResolver.cl
[camel-quarkus] 17/31: Fixed compilation error linked to getModelToXMLDumper()
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6d893900fe71a5c8da2b7a693e41622825d9ea3d 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 aec0148809..fdd985b6df 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2462,7 +2462,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 94358e4252..eed700a137 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2462,7 +2462,7 @@ org.apach
[camel-quarkus] 18/31: Fixed #4735 and auto-generated changes
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ec6a2e0ddd9a6e335d46c660e31ce289536b00b4 Author: JiriOndrusek AuthorDate: Wed Apr 5 15:49:11 2023 +0200 Fixed #4735 and auto-generated changes --- .../apache/camel/quarkus/component/bean/BeanRoutes.java | 2 +- .../apache/camel/quarkus/component/bean/BeanTest.java | 2 -- poms/bom/src/main/generated/flattened-reduced-pom.xml | 17 - 3 files changed, 17 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 eed700a137..796c697e40 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2289,7 +2289,7 @@ org.apache.camel camel-tika -4.0.0-M2 +4.0.0-SNAPSHOT org.apache.camel @@ -6855,6 +6855,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 @@ -6865,6 +6870,11 @@ cxf-rt-frontend-simple 4.0.0 + +org.apache.cxf +cxf-rt-javascript +4.0.0 + org.apache.cxf cxf-rt-management @@ -6905,6 +6915,11 @@ cxf-tools-common 4.0.0 + +org.apache.cxf +cxf-tools-java2ws +4.0.0 + org.apache.cxf cxf-tools-validator
[camel-quarkus] 12/31: [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 4b3a40474e83b67aa1067bb8128f885347f2be59 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 { .po
[camel-quarkus] 13/31: Fixed getter/setter on ExtendedCamelContext - CAMEL-15105
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5d0830963316204b21a7f8debf9838b3f2a40099 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 --- a/extensions/microprofile-health/runtime/src/main/java/
[camel-quarkus] 07/31: Fix in cxf-soap-client
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d7581fe08c35776867dd19208bffdee20f4827a3 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 442d916f0b..9aadd21138 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2114,6 +2114,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 ea5e98094c..ce8957e32b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2047,6 +2047,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 cb6da3e49b..b3b7abe00f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2047,6 +2047,24 @@ org.apache.camel camel-salesforce 4.0.0-SNAPSHOT + + +com.google.android +annotations + + +com.google.code.findbugs +jsr305 + + +org.checkerframework +
[camel-quarkus] 11/31: Revert "Temporarily disable dataformat integration tests due to #4662"
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 086b8544a6e1d167b2e76f5d6681576db3d3d1a6 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] 08/31: Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d2197d6b92ba2fbe0bc1baaa9d70bcc3977c 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 spa
[camel-quarkus] 16/31: Fixed KameletProcessor.java compilation error
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9b043c67b573090904c20e13137a10be7d610f45 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] 01/31: Ref #4384: Groovy DSL - Add support of Groovy extensions
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit dbf3558ba51e048219f54811c7ec2edef17dba53 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] branch camel-main updated (d6ed6dc863 -> 00dbc8c5e4)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard d6ed6dc863 Regenerate poms discard 9c3863d978 Fix of Opentelemetry test discard 9ea4068871 Fixed jackson-jq-extra (CAMEL-19276) discard 96412efa36 Fix of upgrade jackson-jq discard d008c67cf2 Regen poms discard b5a5cfa6c4 Fixed Tika compilation issue discard 6e742e20c6 Regen poms discard 195b4b6046 Regen poms discard 880aaf39d7 Regen poms discard 29244b7b1b Regen poms discard 6af160f26b camel-java-joor-dsl - Ease the way to get all the compiled classes discard a24c52163e Regen poms discard 529a969df9 Ref #4745: Add context plugins for the dry mode as expected discard 712ddefd8e Fixed #4735 and auto-generated changes discard 010cace2cb Fixed compilation error linked to getModelToXMLDumper() discard 5922e4f421 Fixed KameletProcessor.java compilation error discard 9ed35fbc77 Disabled several foundation tests + fixin runtinme because of CAMEL-15105 discard a55c8b0414 Fixed compilation failures because of CAMEL-15105 discard af533a28d9 Fixed getter/setter on ExtendedCamelContext - CAMEL-15105 discard 598a466316 [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image) discard 63341cd228 Revert "Temporarily disable dataformat integration tests due to #4662" discard f2cb772031 Generated flattened pom + add more information into cxf-soap-client assert discard 415ad1eb51 Fuxed Cxf-soap-client:missing licence in wsdl discard ae9eade2f8 Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193 discard c8db53ba1a Fix in cxf-soap-client discard 2cd039f7a7 Fix in http component (caused by upgrade of httpclient) discard cf8566575f Ref #1746: Groovy language native support discard 67eed0100e Add support of expressions referring an external resource discard 2e7f9bf85f Upgrade Camel to 4.0.0-M3 discard 6a11caa332 Ref #4624: Upgrade to Groovy 4.x discard 03362f0693 Ref #4384: Groovy DSL - Add support of Groovy extensions add 47796118a5 release: complete release process to be more explicit add ceb5b9d81e Enabling Google BigQuery and Google PubSub integration tests Fixes #4502 add 4fd90bf238 Enabling back Zendesk integration tests Fixes #4514 add 4b0634a902 Enabling Stax Integration tests add a837249c0f Add OpenTelemetry documentation for CDI bean instrumentation add 85b7870f36 Updated CHANGELOG.md add f3757a625b Add a limitation doc about pooling support for camel-quarkus-amqp (#4809) add 1930a3ca88 Bump quarkiverse-freemarker.version from 1.0.0.Alpha2 to 1.0.0 (#4804) add 1bc34d1f13 Bump quarkus-artemis-bom from 3.0.0.CR1 to 3.0.0 (#4814) add a63bf897a1 Updated CHANGELOG.md add ee6cadb250 Snmp: Extend test coverage #4797 new dbf3558ba5 Ref #4384: Groovy DSL - Add support of Groovy extensions new aa90dfbd2d Ref #4624: Upgrade to Groovy 4.x new e0dc4a4882 Upgrade Camel to 4.0.0-M3 new f6a7e101a6 Add support of expressions referring an external resource new 689619efc8 Ref #1746: Groovy language native support new c49ce4d78d Fix in http component (caused by upgrade of httpclient) new d7581fe08c Fix in cxf-soap-client new d2197d6b92 Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193 new 9cf6b09eff Fuxed Cxf-soap-client:missing licence in wsdl new 6e832becc3 Generated flattened pom + add more information into cxf-soap-client assert new 086b8544a6 Revert "Temporarily disable dataformat integration tests due to #4662" new 4b3a40474e [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image) new 5d08309633 Fixed getter/setter on ExtendedCamelContext - CAMEL-15105 new 6b2fffd688 Fixed compilation failures because of CAMEL-15105 new 9570e396a3 Disabled several foundation tests + fixin runtinme because of CAMEL-15105 new 9b043c67b5 Fixed KameletProcessor.java compilation error new 6d893900fe Fixed compilation error linked to getModelToXMLDumper() new ec6a2e0ddd Fixed #4735 and auto-generated changes new f9a1c94fb5 Ref #4745: Add context plugins for the dry mode as expected new 96cc5dd29c Regen poms new e40a6d207b camel-java-joor-dsl - Ease the way to get all the compiled classes new 1a87ef843c Regen poms new 132f092652 Regen poms new dc559a2617 Regen poms new 1bb300ebb5 Regen poms new 45648e85de Fixed Tika compilation issue new 00ffdb4fbc Regen poms new d788d7e1e5 Fix of upgrade jackson-jq new 0cf60a94bc Fixed jackson-jq-extra (CAMEL-19276) new a23d7f7dd7 Fix of Opentelemetry test new 00dbc8c5e4 Regenerate 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 u
[camel-quarkus] 02/31: Ref #4624: Upgrade to Groovy 4.x
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit aa90dfbd2d1d4a0d16c77ca813a00871b8983f7c 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
[camel] branch regen_bot updated (746b6660df8 -> b34ec583d91)
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 746b6660df8 CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version. add b34ec583d91 CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 1 + 1 file changed, 1 insertion(+)
[camel-quarkus] branch main updated: Add camel-cli-connector extension. Fixes #4051
This is an automated email from the ASF dual-hosted git repository. zbendhiba 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 2f3dbfb2b9 Add camel-cli-connector extension. Fixes #4051 2f3dbfb2b9 is described below commit 2f3dbfb2b91c9b16df86c1df02105d40a8ed55fc Author: Zineb Bendhiba AuthorDate: Tue Mar 14 16:57:02 2023 +0100 Add camel-cli-connector extension. Fixes #4051 Signed-off-by: Souvik Ghosh Co-authored-by: Souvik Ghosh --- catalog/pom.xml| 13 +++ .../modules/ROOT/examples/others/cli-connector.yml | 13 +++ docs/modules/ROOT/nav.adoc | 1 + .../pages/reference/extensions/cli-connector.adoc | 41 + extensions-jvm/cli-connector/deployment/pom.xml| 63 + .../deployment/CliConnectorProcessor.java | 46 ++ extensions-jvm/cli-connector/pom.xml | 39 extensions-jvm/cli-connector/runtime/pom.xml | 100 + .../main/resources/META-INF/quarkus-extension.yaml | 32 +++ extensions-jvm/pom.xml | 1 + integration-tests-jvm/cli-connector/pom.xml| 100 + .../cli/connector/it/CliConnectorResource.java | 47 ++ .../cli/connector/it/CliConnectorTest.java | 34 +++ integration-tests-jvm/pom.xml | 1 + poms/bom/pom.xml | 15 poms/bom/src/main/generated/flattened-full-pom.xml | 15 .../src/main/generated/flattened-reduced-pom.xml | 15 .../generated/flattened-reduced-verbose-pom.xml| 15 18 files changed, 591 insertions(+) diff --git a/catalog/pom.xml b/catalog/pom.xml index cfa41b13a1..3fe2dcb3a3 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -747,6 +747,19 @@ + +org.apache.camel.quarkus +camel-quarkus-cli-connector +${project.version} +pom +test + + +* +* + + + org.apache.camel.quarkus camel-quarkus-cloudevents diff --git a/docs/modules/ROOT/examples/others/cli-connector.yml b/docs/modules/ROOT/examples/others/cli-connector.yml new file mode 100644 index 00..a2fb896cfa --- /dev/null +++ b/docs/modules/ROOT/examples/others/cli-connector.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-cli-connector +cqArtifactIdBase: cli-connector +cqNativeSupported: false +cqStatus: Preview +cqDeprecated: false +cqJvmSince: 3.0.0 +cqNativeSince: n/a +cqCamelPartName: cli-connector +cqCamelPartTitle: CLI Connector +cqCamelPartDescription: Runtime adapter connecting with Camel CLI +cqExtensionPageTitle: CLI Connector diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 480beb1590..db85342613 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -74,6 +74,7 @@ *** xref:reference/extensions/braintree.adoc[Braintree] *** xref:reference/extensions/browse.adoc[Browse] *** xref:reference/extensions/cbor.adoc[CBOR] +*** xref:reference/extensions/cli-connector.adoc[CLI Connector] *** xref:reference/extensions/cm-sms.adoc[CM SMS Gateway] *** xref:reference/extensions/csv.adoc[CSV] *** xref:reference/extensions/csimple.adoc[CSimple] diff --git a/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc b/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc new file mode 100644 index 00..6c051bb8bf --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/cli-connector.adoc @@ -0,0 +1,41 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +[id="extensions-cli-connector"] += CLI Connector +:linkattrs: +:cq-artifact-id: camel-quarkus-cli-connector +:cq-native-supported: false +:cq-status: Preview +:cq-status-deprecation: Preview +:cq-description: Runtime adapter connecting with Camel CLI +:cq-deprecated: false +:cq-jvm-since: 3.0.0 +:cq-native-since: n/a + +ifeval::[{doc-show-badges} == true] +[.badges] +[.badge-key]##JVM since##[.badge-supported]##3.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +endif::[] + +Runtime adapter connecting with Camel CLI + +[id="extensions-cli-connector-whats-inside"] +== What's inside + +* xref:{cq-camel-components}:others:cli-connector.adoc[CLI Connector] + +Please refer to the above link for usage and configuration details. + +[id="extensions-cli-connector-maven-coordinates"] +== Maven coordinates + +[source,xml] + + +org.apache.camel.quarkus +camel-quarkus-cli-connector + + +ifeval
[GitHub] [camel-quarkus] zbendhiba closed issue #4051: Camel 3.19 - Add camel-cli-connector extension
zbendhiba closed issue #4051: Camel 3.19 - Add camel-cli-connector extension URL: https://github.com/apache/camel-quarkus/issues/4051 -- 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] zbendhiba merged pull request #4812: Add camel-cli-connector extension.
zbendhiba merged PR #4812: URL: https://github.com/apache/camel-quarkus/pull/4812 -- 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 (a6a5044653a -> 746b6660df8)
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 a6a5044653a Sync deps add 746b6660df8 CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version. No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 3 --- .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java| 1 - 2 files changed, 4 deletions(-)
[camel] branch regen_bot updated (5dd5dc6f47e -> a6a5044653a)
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 5dd5dc6f47e Dependency upgrades add 5bb2325d834 Upgrade AWS SDK v2 to version 2.20.50 add a6a5044653a Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel-website] zregvart commented on a diff in pull request #995: Updated rules.js
zregvart commented on code in PR #995: URL: https://github.com/apache/camel-website/pull/995#discussion_r1173472140 ## rules.js: ## @@ -36,15 +40,14 @@ class RelativeLinks extends Rule { setup() { this.on("dom:ready", event => { const anchors = event.document.getElementsByTagName('a'); - if (anchors === null) { -return; - } - anchors.forEach(a => { -const href = a.getAttribute("href"); -if (href && href.value.startsWith("https://camel.apache.org";)) { - this.report(a, `For links within camel.apache.org use relative links, found: ${href.value}`); + if (anchors !== null) { Review Comment: I prefer the non-nested variant, i.e. ```javascript if (anchors === null) { return; } ``` This [blog post](https://testing.googleblog.com/2017/06/code-health-reduce-nesting-reduce.html) articulates the reasons why. ## rules.js: ## @@ -6,26 +6,30 @@ class HtmlTitle extends Rule { description: "Title of the page must be defined" }; } + validateTitle(title) { Review Comment: If we're going with this approach, I'd prefer putting all the logic in the `validateTitle` function. ```javascript validateTitle(event) { //... } ``` And below we would have: ```javascript this.on("dom:ready", validateTitle) ``` ## rules.js: ## @@ -36,15 +40,14 @@ class RelativeLinks extends Rule { setup() { this.on("dom:ready", event => { const anchors = event.document.getElementsByTagName('a'); - if (anchors === null) { -return; - } - anchors.forEach(a => { -const href = a.getAttribute("href"); -if (href && href.value.startsWith("https://camel.apache.org";)) { - this.report(a, `For links within camel.apache.org use relative links, found: ${href.value}`); + if (anchors !== null) { +for (let i = 0; i < anchors.length; i++) { + const href = anchors[i].getAttribute("href"); + if (href && href.startsWith("https://camel.apache.org";)) { Review Comment: Missing `href.value` here ```suggestion if (href && href.value.startsWith("https://camel.apache.org";)) { ``` ## rules.js: ## @@ -56,21 +59,12 @@ class StructuredData extends Rule { }; } - setup() { -let start = -1; - -this.on('tag:open', event => { - if (event.target.nodeName === 'script') { -start = event.target.location.offset; - } -}); - -this.on('tag:close', async event => { - const tag = event.previous; - if (event.target.nodeName === 'script' && tag.hasAttribute('type') && tag.getAttribute('type').value === 'application/ld+json') { -const startIdx = data.indexOf('>', start) + 1; -const endIdx = event.target.location.offset - 1; // omit the opening tag angled bracket -const content = data.substring(startIdx, endIdx); + +setup() { +this.on('tag:close', event => { + const tag = event.target; Review Comment: For `tag:close` the event doesn't have a `target` property and that's why we need to remember the offset location of when the tag was opened. In the `tag:open` we also don't have access to attributes. This is why the logic here how it is. -- 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 (308dc6b2f02 -> 7a21dcf5b11)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 308dc6b2f02 Upgrade json-path 2.8.0 add d78512652a7 CAMEL-19287 - camel-debezium - Upgrade to 2.2 add 7a21dcf5b11 CAMEL-19267 - camel-debezium - Upgrade to 2.2 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../camel/catalog/components/debezium-db2.json | 10 +- .../camel/catalog/components/debezium-mongodb.json | 18 +- .../camel/catalog/components/debezium-mysql.json | 10 +- .../camel/catalog/components/debezium-oracle.json | 14 +- .../catalog/components/debezium-postgres.json | 8 +- .../catalog/components/debezium-sqlserver.json | 12 +- .../debezium/DebeziumDb2ComponentConfigurer.java | 18 +- .../debezium/DebeziumDb2EndpointConfigurer.java| 18 +- .../debezium/DebeziumDb2EndpointUriFactory.java| 5 +- .../Db2ConnectorEmbeddedDebeziumConfiguration.java | 43 +- .../camel/component/debezium/debezium-db2.json | 10 +- .../DebeziumMongodbComponentConfigurer.java| 42 +- .../DebeziumMongodbEndpointConfigurer.java | 42 +- .../DebeziumMongodbEndpointUriFactory.java | 9 +- ...goDbConnectorEmbeddedDebeziumConfiguration.java | 723 + .../camel/component/debezium/debezium-mongodb.json | 18 +- .../debezium/DebeziumMongodbComponentTest.java | 4 +- ...ConnectorEmbeddedDebeziumConfigurationTest.java | 6 +- .../debezium/DebeziumMySqlComponentConfigurer.java | 18 +- .../debezium/DebeziumMySqlEndpointConfigurer.java | 18 +- .../debezium/DebeziumMySqlEndpointUriFactory.java | 5 +- ...ySqlConnectorEmbeddedDebeziumConfiguration.java | 43 +- .../camel/component/debezium/debezium-mysql.json | 10 +- .../DebeziumOracleComponentConfigurer.java | 18 +- .../debezium/DebeziumOracleEndpointConfigurer.java | 18 +- .../debezium/DebeziumOracleEndpointUriFactory.java | 5 +- ...acleConnectorEmbeddedDebeziumConfiguration.java | 50 +- .../camel/component/debezium/debezium-oracle.json | 14 +- .../DebeziumPostgresComponentConfigurer.java | 12 +- .../DebeziumPostgresEndpointConfigurer.java| 12 +- .../DebeziumPostgresEndpointUriFactory.java| 2 +- ...gresConnectorEmbeddedDebeziumConfiguration.java | 25 +- .../component/debezium/debezium-postgres.json | 8 +- .../DebeziumSqlserverComponentConfigurer.java | 24 +- .../DebeziumSqlserverEndpointConfigurer.java | 24 +- .../DebeziumSqlserverEndpointUriFactory.java | 6 +- ...rverConnectorEmbeddedDebeziumConfiguration.java | 58 +- .../component/debezium/debezium-sqlserver.json | 12 +- parent/pom.xml | 2 +- 40 files changed, 721 insertions(+), 675 deletions(-)
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4810: Upgrade quarkus-qpid-jms to 2.0.0
zhfeng commented on code in PR #4810: URL: https://github.com/apache/camel-quarkus/pull/4810#discussion_r1173484008 ## pom.xml: ## @@ -81,6 +81,7 @@ 1.0.0-beta.3 3.7.1 1.72 +1.70 Review Comment: Let't me check it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.14.x updated: Upgrade json-path 2.8.0
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.14.x by this push: new 7db806dc02c Upgrade json-path 2.8.0 7db806dc02c is described below commit 7db806dc02c617dd2e120f652eb31b78ba023210 Author: Claus Ibsen AuthorDate: Fri Apr 21 10:13:30 2023 +0200 Upgrade json-path 2.8.0 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e01b77b20f8..39823140b50 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -352,7 +352,7 @@ 2.3.11 1.0 1.13 -2.6.0 +2.8.0 2.2.14 1.1.1 1.5.1 diff --git a/parent/pom.xml b/parent/pom.xml index 529408b2be3..4f106ffec89 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -336,7 +336,7 @@ 0.2.1 1.0 1.5.1 -2.6.0 +2.8.0 1.13 1.1.1 1.5.8
[camel] branch camel-3.18.x updated: Upgrade json-path 2.8.0
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.18.x by this push: new 55e7ef687f8 Upgrade json-path 2.8.0 55e7ef687f8 is described below commit 55e7ef687f80e707c646dd02359f5ff1ff0f77f6 Author: Claus Ibsen AuthorDate: Fri Apr 21 10:10:29 2023 +0200 Upgrade json-path 2.8.0 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 2eb8c116b88..d6f7a9fb22f 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -348,7 +348,7 @@ 2.3.11 1.0 1.13 -2.7.0 +2.8.0 2.2.14 2.32.0 1.5.1 diff --git a/parent/pom.xml b/parent/pom.xml index b57c9303007..a2a9a7e09f2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -334,7 +334,7 @@ 0.2.1 1.0 1.5.1 -2.7.0 +2.8.0 1.13 1.5.8 2.2.14
[camel] branch camel-3.20.x updated: Upgrade json-path 2.8.0
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.20.x by this push: new 59a9d24f283 Upgrade json-path 2.8.0 59a9d24f283 is described below commit 59a9d24f28315d6ada1cff68fdcefedd65807d4d Author: Claus Ibsen AuthorDate: Fri Apr 21 10:10:29 2023 +0200 Upgrade json-path 2.8.0 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 70556b33d82..4d4b608cf6c 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -348,7 +348,7 @@ 2.3.11 1.0 1.13 -2.7.0 +2.8.0 2.2.14 2.32.0 1.5.1 diff --git a/parent/pom.xml b/parent/pom.xml index 5df5d1f8abe..baf16c90df5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -332,7 +332,7 @@ 0.2.1 1.0 1.5.1 -2.7.0 +2.8.0 1.13 2.2.4 2.2.14
[camel] branch camel-3.x updated: Upgrade json-path 2.8.0
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.x by this push: new e04d1acd8ab Upgrade json-path 2.8.0 e04d1acd8ab is described below commit e04d1acd8abb7400cbfb7a2f4975cec144505f2e Author: Claus Ibsen AuthorDate: Fri Apr 21 10:08:43 2023 +0200 Upgrade json-path 2.8.0 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index bc2f48cbca5..0cc4d84d48d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -336,7 +336,7 @@ 0.2.1 1.0 1.5.1 -2.7.0 +2.8.0 1.13 2.2.4 2.2.14 diff --git a/parent/pom.xml b/parent/pom.xml index 1645b4cd267..b6c14ff77fe 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -331,7 +331,7 @@ 0.2.1 1.0 1.5.1 -2.7.0 +2.8.0 1.13 2.2.4 2.2.14
[camel] branch main updated (6e87bb72797 -> 308dc6b2f02)
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 6e87bb72797 CAMEL-19286: camel-ignite - Support the REPLACE operation in the Ignite Cache Producer (#9908) add 308dc6b2f02 Upgrade json-path 2.8.0 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot_3x updated (ccb3be3c458 -> 8d701b27059)
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 ccb3be3c458 Bump mybatis to 3.5.13 (#9905) add 8d701b27059 CAMEL-19275: Upgrade dependency for SB 2.7.11 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 10 +- parent/pom.xml | 10 +- 2 files changed, 10 insertions(+), 10 deletions(-)
[GitHub] [camel] davsclaus merged pull request #9908: CAMEL-19286: camel-ignite - Support the REPLACE operation in the Ignite Cache Producer
davsclaus merged PR #9908: URL: https://github.com/apache/camel/pull/9908 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-19286: camel-ignite - Support the REPLACE operation in the Ignite Cache Producer (#9908)
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 6e87bb72797 CAMEL-19286: camel-ignite - Support the REPLACE operation in the Ignite Cache Producer (#9908) 6e87bb72797 is described below commit 6e87bb72797b297cef7402908fd0ba3e470d7465 Author: Kengo Seki AuthorDate: Fri Apr 21 17:02:32 2023 +0900 CAMEL-19286: camel-ignite - Support the REPLACE operation in the Ignite Cache Producer (#9908) --- .../camel/component/ignite/IgniteConstants.java| 4 ++-- .../ignite/cache/IgniteCacheOperation.java | 3 ++- .../ignite/cache/IgniteCacheProducer.java | 22 +++ .../camel/component/ignite/IgniteCacheTest.java| 25 ++ 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java index 5c7dc92df2c..2ab7b75d15f 100644 --- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java +++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/IgniteConstants.java @@ -55,8 +55,8 @@ public final class IgniteConstants { "It does not allow you to dynamically change the cache against which a producer operation is performed. Use EIPs for that (e.g. recipient list, dynamic router).", javaType = "String", applicableFor = SCHEME_CACHE) public static final String IGNITE_CACHE_NAME = "CamelIgniteCacheName"; -@Metadata(label = "consumer", - description = "This header carries the old cache value when passed in the incoming cache event.", +@Metadata(description = "(producer) The old cache value to be replaced when invoking the REPLACE operation. \n" + +"(consumer) This header carries the old cache value when passed in the incoming cache event.", javaType = "Object", applicableFor = SCHEME_CACHE) public static final String IGNITE_CACHE_OLD_VALUE = "CamelIgniteCacheOldValue"; diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheOperation.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheOperation.java index 1ca66304be3..ce76db93250 100644 --- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheOperation.java +++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheOperation.java @@ -27,6 +27,7 @@ public enum IgniteCacheOperation { SIZE, REBALANCE, QUERY, -CLEAR +CLEAR, +REPLACE, } diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheProducer.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheProducer.java index ebcb4f5552b..afdab7542a0 100644 --- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheProducer.java +++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheProducer.java @@ -85,6 +85,10 @@ public class IgniteCacheProducer extends DefaultAsyncProducer { doRebalance(in, out); break; +case REPLACE: +doReplace(in, out); +break; + default: break; } @@ -196,6 +200,24 @@ public class IgniteCacheProducer extends DefaultAsyncProducer { out.setBody(result); } +private void doReplace(Message in, Message out) { +Object cacheKey = in.getHeader(IgniteConstants.IGNITE_CACHE_KEY); + +if (cacheKey == null) { +throw new RuntimeCamelException( +"Cache REPLACE operation requires the cache key in the CamelIgniteCacheKey header"); +} + +Object oldValue = in.getHeader(IgniteConstants.IGNITE_CACHE_OLD_VALUE); +if (oldValue == null) { +cache.replace(cacheKey, in.getBody()); +} else { +cache.replace(cacheKey, oldValue, in.getBody()); +} + +IgniteHelper.maybePropagateIncomingBody(endpoint, in, out); +} + private Object cacheKey(Message msg) { Object cacheKey = msg.getHeader(IgniteConstants.IGNITE_CACHE_KEY); if (cacheKey == null) { diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.java index b55984d89f3..6e077553b22 100644 --- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.
[camel] branch main updated: CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version.
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 b34ec583d91 CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version. b34ec583d91 is described below commit b34ec583d91da77029077c6e95d18da408d89c1a Author: Claus Ibsen AuthorDate: Fri Apr 21 10:01:19 2023 +0200 CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version. --- .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 0238e3c6d2a..0e18d1ff481 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -600,6 +600,7 @@ public class Run extends CamelCommand { openapi = answer.getProperty("camel.jbang.open-api", openapi); download = "true".equals(answer.getProperty("camel.jbang.download", download ? "true" : "false")); background = "true".equals(answer.getProperty("camel.jbang.background", background ? "true" : "false")); +camelVersion = answer.getProperty("camel.jbang.camel-version", camelVersion); } return answer; }