[camel-quarkus] branch quarkus-main updated (3e3538d -> 1ebe43d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 3e3538d Upgrade to Quarkus 2.8.0.CR1 add a1157e6 Updated CHANGELOG.md new 1ebe43d Upgrade to Quarkus 2.8.0.CR1 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 (3e3538d) \ N -- N -- N refs/heads/quarkus-main (1ebe43d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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. Summary of changes: CHANGELOG.md | 1 + 1 file changed, 1 insertion(+)
[camel-quarkus] 01/01: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1ebe43d6c5c4293f4f70a4f62ed533c2e32c1767 Author: James Netherton AuthorDate: Thu Jan 20 07:52:37 2022 + Upgrade to Quarkus 2.8.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 168241c..7974faf 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,7 +31,7 @@ asciidoc: target-maven-version: 3.8.4 # replace ${target-maven-version} camel-version: 3.14.0 # replace ${camel.version} camel-docs-version: 3.14.x # replace ${camel.docs.components.version} -quarkus-version: 2.7.0.CR1 # replace ${quarkus.version} +quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} # attributes used in xrefs to other Antora components cq-camel-components: 3.14.x@components # replace ${camel.docs.components.xref} quarkus-examples-version: latest diff --git a/pom.xml b/pom.xml index 30fa249..9d915f2 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 1.0.0 2.3.0 1.0.3 -2.7.0.CR1 +999-SNAPSHOT 2.0.0 0.30.0
[GitHub] [camel-quarkus] djencks opened a new pull request #3480: camel-website #701 camel-quarkus RI table setup (2.4.x)
djencks opened a new pull request #3480: URL: https://github.com/apache/camel-quarkus/pull/3480 See apache/camel-website#701 -- 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] djencks opened a new pull request #3479: camel-website #701 camel-quarkus RI table setup (2.5.x)
djencks opened a new pull request #3479: URL: https://github.com/apache/camel-quarkus/pull/3479 See apache/camel-website#701 -- 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] djencks opened a new pull request #3478: camel-website #701 camel-quarkus RI table setup (2.6.x)
djencks opened a new pull request #3478: URL: https://github.com/apache/camel-quarkus/pull/3478 See apache/camel-website#701 -- 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] djencks opened a new pull request #3477: camel-website #701 camel-quarkus RI table setup (main)
djencks opened a new pull request #3477: URL: https://github.com/apache/camel-quarkus/pull/3477 See apache/camel-website#701 -- 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-kafka-connector] djencks opened a new pull request #1329: camel-website #701 camel-kafka-connector RI table improvement (0.11.x)
djencks opened a new pull request #1329: URL: https://github.com/apache/camel-kafka-connector/pull/1329 See apache/camel-website#701 -- 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-kafka-connector] djencks opened a new pull request #1328: camel-website #701 camel-kafka-connector RI table improvement (1.0.x)
djencks opened a new pull request #1328: URL: https://github.com/apache/camel-kafka-connector/pull/1328 See apache/camel-website#701 -- 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-kafka-connector] djencks opened a new pull request #1327: camel-website #701 camel-kafka-connector RI table improvement (main)
djencks opened a new pull request #1327: URL: https://github.com/apache/camel-kafka-connector/pull/1327 See apache/camel-website#701 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] djencks opened a new pull request #728: camel-website #701 camel-kamelets RI table setup (0.5.x)
djencks opened a new pull request #728: URL: https://github.com/apache/camel-kamelets/pull/728 See apache/camel-website#701 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] djencks opened a new pull request #727: camel-website #701 camel-kamelets RI table setup (0.6.x)
djencks opened a new pull request #727: URL: https://github.com/apache/camel-kamelets/pull/727 See apache/camel-website#701 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] djencks opened a new pull request #726: camel-website #701 camel-kamelets RI table setup (0.7.x)
djencks opened a new pull request #726: URL: https://github.com/apache/camel-kamelets/pull/726 See apache/camel-website#701 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] djencks opened a new pull request #725: camel-website #701 camel-kamelets RI table setup (main)
djencks opened a new pull request #725: URL: https://github.com/apache/camel-kamelets/pull/725 See apache/camel-website#701 -- 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] djencks opened a new pull request #2910: camel-website #701 camel-k RI table setup (1.4.x)
djencks opened a new pull request #2910: URL: https://github.com/apache/camel-k/pull/2910 See apache/camel-website#701 -- 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] djencks opened a new pull request #2909: camel-website #701 camel-k RI table setup (1.6.x)
djencks opened a new pull request #2909: URL: https://github.com/apache/camel-k/pull/2909 See apache/camel-website#701 -- 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] djencks opened a new pull request #2908: camel-website #701 camel-k RI table setup (1.7.x)
djencks opened a new pull request #2908: URL: https://github.com/apache/camel-k/pull/2908 See apache/camel-website#701 -- 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] djencks opened a new pull request #2907: camel-website #701 camel-k RI table setup (1.8.x)
djencks opened a new pull request #2907: URL: https://github.com/apache/camel-k/pull/2907 See apache/camel-website#701 -- 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] djencks opened a new pull request #2906: camel-website #701 camel-k RI table setup (main)
djencks opened a new pull request #2906: URL: https://github.com/apache/camel-k/pull/2906 See https://github.com/apache/camel-website/issues/701 -- 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-runtime] djencks opened a new pull request #782: set camel-k docs version
djencks opened a new pull request #782: URL: https://github.com/apache/camel-k-runtime/pull/782 Set up for new camel-k 1.8.x doc version. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] djencks opened a new pull request #763: Main 701 ri tables
djencks opened a new pull request #763: URL: https://github.com/apache/camel-website/pull/763 This must be merged in coordination with several other PRs. This sets up some global helper functions for the RI tables and adds the new branches for camel-k 1.8.x,camel-k-runtime 1.11.x, and kamelets 0.7.x releases. As of this PR creation, the vote has gone on for more than 72 hours but has not concluded. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1019403926 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1734427097-536-87857d94-e82a-4c22-825e-c0a2524ad8fb * Camel Quarkus Commit: 5ea28ea1708e577429f8a75366b86852115e4fea * Camel Main Commit: a1157e61e0366a304c25fd7db142512fef473421 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1734427097 -- 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-website] github-actions[bot] commented on pull request #747: DO NOT MERGE PREVIEW ONLY preview playbook for RI work
github-actions[bot] commented on pull request #747: URL: https://github.com/apache/camel-website/pull/747#issuecomment-1019391546 Preview is available at https://pr-747--camel.netlify.app -- 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-karaf] oscerd commented on pull request #110: Update features.xml
oscerd commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019364812 For 3.15.0 i just removed the repo and used the exact same set of bundles in the two related components. This PR is good, but I think we should avoid external features repository where it is possible. For 3.14.x, as LTS we need to maintain the feature repo from hibernate validator -- 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-karaf] davsclaus merged pull request #110: Update features.xml
davsclaus merged pull request #110: URL: https://github.com/apache/camel-karaf/pull/110 -- 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-karaf] davsclaus commented on pull request #110: Update features.xml
davsclaus commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019364320 Merging so gregor can cut the release tomorrow -- 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-karaf] branch camel-karaf-3.14.x updated: Update features.xml (#110)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-karaf-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/camel-karaf-3.14.x by this push: new d50e04e Update features.xml (#110) d50e04e is described below commit d50e04e3bacb29f71208629f03ba806ffd7a4d31 Author: ReLS972 AuthorDate: Sat Jan 22 22:52:59 2022 +0100 Update features.xml (#110) change range [6.2,6.2] to [6.2,6.3) make it work with karaf-assembly --- platforms/karaf/features/src/main/resources/features.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 6181016..13c4d01 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -20,7 +20,7 @@ http://karaf.apache.org/xmlns/features/v1.5.0; name='camel-${project.version}'> mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version-range}/xml/features mvn:org.ops4j.pax.cdi/pax-cdi-features/[1,2)/xml/features - mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/[6.2,6.2]/xml/features + mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/[6.2,6.3)/xml/features mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}
[GitHub] [camel-karaf] davsclaus commented on pull request #110: Update features.xml
davsclaus commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019364280 @oscerd do we need this for 3.15 onwards, if its removed and not really in use then I think this is okay. But for 3.14.x we have a 3.14.0 release where this feature is already there https://github.com/apache/camel-karaf/blob/camel-karaf-3.14.0/platforms/karaf/features/src/main/resources/features.xml#L23 -- 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-karaf] davsclaus commented on pull request #110: Update features.xml
davsclaus commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019364103 Okay so on 3.14.x then this PR seems okay in case it makes maven happy to download 6.2.x. However we should likely avoid this feature ranges in the first place and use known versions with what we test and release together. -- 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-karaf] oscerd commented on pull request #110: Update features.xml
oscerd commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019362724 On main i removed the feature repository directly -- 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-karaf] ReLS972 commented on pull request #110: Update features.xml
ReLS972 commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019362050 when i try to build a custom distribution using org.apache.karaf.tooling:karaf-maven-plugin, it's fail because maven unable to get the rigth version of the repository. -- 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-karaf] ReLS972 commented on pull request #110: Update features.xml
ReLS972 commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019361015 it produce this : `2022-01-22T20:25:54,730 | WARN | FelixStartLevel | AetherBasedResolver | 2 - org.ops4j.pax.url.mvn - 2.6.10 | Error resolving artifact org.hibernate.validator:hibernate-validator-osgi-karaf-features:xml:features:[6.2,6.2]: [Could not find metadata org.hibernate.validator:hibernate-validator-osgi-karaf-features/maven-metadata.xml in local (C:\Users\---\.m2\repository), Could not find metadata org.hibernate.validator:hibernate-validator-osgi-karaf-features/maven-metadata.xml in apache (https://repository.apache.org/content/groups/snapshots-group/), Could not find metadata org.hibernate.validator:hiberna java.io.IOException: Error resolving artifact org.hibernate.validator:hibernate-validator-osgi-karaf-features:xml:features:[6.2,6.2]: [Could not find metadata org.hibernate.validator:hibernate-validator-osgi-karaf-features/maven-metadata.xml in local (C:\Users\---\.m2\repository), Could not find metadata org.hibernate.validator:hibernate-validator-osgi-karaf-features/maven-metadata.xml in apache (https://repository.apache.org/content/groups/snapshots-group/), Could not find metadata org.hibernate.validator:hibernate-validator-osgi-karaf-features/maven-metadata.xml in ops4j.sonatype.snapshots.deploy (https://oss.sonatype.org/content/repositories/ops4j-snapshots/)] at org.ops4j.pax.url.mvn.internal.AetherBasedResolver.configureIOException(AetherBasedResolver.java:803) [!/:?] at org.ops4j.pax.url.mvn.internal.AetherBasedResolver.resolve(AetherBasedResolver.java:780) [!/:?] at org.ops4j.pax.url.mvn.internal.AetherBasedResolver.resolve(AetherBasedResolver.java:657) [!/:?] at org.ops4j.pax.url.mvn.internal.AetherBasedResolver.resolve(AetherBasedResolver.java:598) [!/:?] at org.ops4j.pax.url.mvn.internal.AetherBasedResolver.resolve(AetherBasedResolver.java:565) [!/:?] at org.ops4j.pax.url.mvn.internal.AetherBasedResolver.resolve(AetherBasedResolver.java:555) [!/:?] at org.ops4j.pax.url.mvn.internal.Connection.getInputStream(Connection.java:123) [!/:?] at java.net.URL.openStream(URL.java:1140) [?:?] at org.apache.karaf.features.internal.service.RepositoryImpl.load(RepositoryImpl.java:114) [!/:?] at org.apache.karaf.features.internal.service.RepositoryImpl.(RepositoryImpl.java:51) [!/:?] at org.apache.karaf.features.internal.service.RepositoryCacheImpl.create(RepositoryCacheImpl.java:51) [!/:?] at org.apache.karaf.features.internal.service.FeaturesServiceImpl.getFeatureCache(FeaturesServiceImpl.java:611) [!/:?] at org.apache.karaf.features.internal.service.FeaturesServiceImpl.ensureCacheLoaded(FeaturesServiceImpl.java:582) [!/:?] at org.apache.karaf.features.internal.service.FeaturesServiceImpl.listRequiredRepositories(FeaturesServiceImpl.java:514) [!/:?] at org.apache.karaf.deployer.features.FeatureDeploymentListener.bundleChanged(FeatureDeploymentListener.java:247) [!/:?] at org.apache.karaf.deployer.features.FeatureDeploymentListener.init(FeatureDeploymentListener.java:90) [!/:?] at org.apache.karaf.deployer.features.osgi.Activator$DeploymentFinishedListener.deploymentEvent(Activator.java:86) [!/:?] at org.apache.karaf.features.internal.service.FeaturesServiceImpl.registerListener(FeaturesServiceImpl.java:296) [!/:?] at org.apache.karaf.deployer.features.osgi.Activator.doStart(Activator.java:53) [!/:?] at org.apache.karaf.util.tracker.BaseActivator.start(BaseActivator.java:92) [!/:?] at org.apache.felix.framework.util.SecureAction.startActivator(SecureAction.java:698) [org.apache.felix.framework-6.0.5.jar:?] at org.apache.felix.framework.Felix.activateBundle(Felix.java:2402) [org.apache.felix.framework-6.0.5.jar:?] at org.apache.felix.framework.Felix.startBundle(Felix.java:2308) [org.apache.felix.framework-6.0.5.jar:?] at org.apache.felix.framework.Felix.setActiveStartLevel(Felix.java:1539) [org.apache.felix.framework-6.0.5.jar:?] at org.apache.felix.framework.FrameworkStartLevelImpl.run(FrameworkStartLevelImpl.java:308) [org.apache.felix.framework-6.0.5.jar:?] at java.lang.Thread.run(Thread.java:834) [?:?] Suppressed: shaded.org.eclipse.aether.transfer.MetadataNotFoundException: Could not find metadata org.hibernate.validator:hibernate-validator-osgi-karaf-features/maven-metadata.xml in local (C:\Users\---\.m2\repository) at shaded.org.eclipse.aether.internal.impl.DefaultMetadataResolver.resolve(DefaultMetadataResolver.java:220) ~[!/:?] at shaded.org.eclipse.aether.internal.impl.DefaultMetadataResolver.resolveMetadata(DefaultMetadataResolver.java:178) ~[!/:?] at
[GitHub] [camel-karaf] davsclaus commented on pull request #110: Update features.xml
davsclaus commented on pull request #110: URL: https://github.com/apache/camel-karaf/pull/110#issuecomment-1019360295 What problem do you have, and what does karaf-assembly complain about? -- 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-karaf] ReLS972 opened a new pull request #110: Update features.xml
ReLS972 opened a new pull request #110: URL: https://github.com/apache/camel-karaf/pull/110 change range [6.2,6.2] to [6.2,6.3) make it work with karaf-assembly -- 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 (a76f778 -> 9134d00)
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 a76f778 Regen add 0037da0 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add da482b6 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add 9134d00 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. No new revisions were added by this update. Summary of changes: .../apache/camel/impl/engine/MDCUnitOfWork.java| 10 +++- .../errorhandler/DeadLetterChannelReifier.java | 6 +-- .../errorhandler/DefaultErrorHandlerReifier.java | 6 +-- .../reifier/errorhandler/ErrorHandlerReifier.java | 17 ++- .../MDCErrorHandlerTest.java} | 57 ++ 5 files changed, 56 insertions(+), 40 deletions(-) copy core/camel-core/src/test/java/org/apache/camel/{issues/SameRouteAndContextScopedErrorHandlerIssueTest.java => processor/MDCErrorHandlerTest.java} (51%)
[camel] branch regen_bot updated (d592232 -> 9548385)
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 d592232 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add 9548385 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. No new revisions were added by this update. Summary of changes: .../test/java/org/apache/camel/processor/MDCErrorHandlerTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (e1b8a1f -> d592232)
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 e1b8a1f Regen add 3b2d68c CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add d592232 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. No new revisions were added by this update. Summary of changes: .../apache/camel/impl/engine/MDCUnitOfWork.java| 10 +++- .../errorhandler/DeadLetterChannelReifier.java | 6 +-- .../errorhandler/DefaultErrorHandlerReifier.java | 6 +-- .../reifier/errorhandler/ErrorHandlerReifier.java | 17 ++- .../MDCErrorHandlerTest.java} | 57 ++ 5 files changed, 55 insertions(+), 41 deletions(-) copy core/camel-core/src/test/java/org/apache/camel/{issues/SameRouteAndContextScopedErrorHandlerIssueTest.java => processor/MDCErrorHandlerTest.java} (52%)
[camel] branch regen_bot_3.14.x updated (215a545 -> a76f778)
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 215a545 [CAMEL-17526]camel-fhir: the serverUrl configuration on camel-fhir endpoint shouldn't be ignored (#6796) add d3a0d30 CAMEL-17524 fix resource loading so it works in OSGi (#6807) add a76f778 Regen No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/graphql/GraphqlEndpoint.java| 2 +- .../apache/camel/component/jbpm/server/CamelKieServerExtension.java | 6 -- .../component/jira/oauth/OAuthAsynchronousHttpClientFactory.java| 3 ++- .../camel/component/schematron/processor/ClassPathURIResolver.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-)
[camel] branch regen_bot updated (5d13131 -> e1b8a1f)
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 5d13131 Remove misleading docs (#6802) add 01f5b57 CAMEL-17524 fix resource loading so it works in OSGi (#6807) add e1b8a1f Regen No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/graphql/GraphqlEndpoint.java| 2 +- .../apache/camel/component/jbpm/server/CamelKieServerExtension.java | 6 -- .../component/jira/oauth/OAuthAsynchronousHttpClientFactory.java| 3 ++- .../camel/component/schematron/processor/ClassPathURIResolver.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-)
[camel] branch camel-3.14.x updated: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.
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 9134d00 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. 9134d00 is described below commit 9134d00742c8d64b5f321466e64267e6c006469f Author: Claus Ibsen AuthorDate: Sat Jan 22 19:07:56 2022 +0100 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. --- .../test/java/org/apache/camel/processor/MDCErrorHandlerTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java index bea130e..ded7bac 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.processor; +import java.util.Map; + import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -42,7 +44,7 @@ public class MDCErrorHandlerTest extends ContextTestSupport { errorHandler(deadLetterChannel("direct:dead").onExceptionOccurred(new Processor() { @Override public void process(Exchange exchange) throws Exception { -var m = MDC.getCopyOfContextMap(); +Map m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId")); @@ -58,7 +60,7 @@ public class MDCErrorHandlerTest extends ContextTestSupport { .process(new Processor() { @Override public void process(Exchange exchange) throws Exception { -var m = MDC.getCopyOfContextMap(); +Map m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId"));
[camel] branch main updated: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.
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 9548385 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. 9548385 is described below commit 95483853aa99e1b8266e3591d66638eba34b721d Author: Claus Ibsen AuthorDate: Sat Jan 22 19:07:56 2022 +0100 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. --- .../test/java/org/apache/camel/processor/MDCErrorHandlerTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java index bea130e..ded7bac 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.processor; +import java.util.Map; + import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -42,7 +44,7 @@ public class MDCErrorHandlerTest extends ContextTestSupport { errorHandler(deadLetterChannel("direct:dead").onExceptionOccurred(new Processor() { @Override public void process(Exchange exchange) throws Exception { -var m = MDC.getCopyOfContextMap(); +Map m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId")); @@ -58,7 +60,7 @@ public class MDCErrorHandlerTest extends ContextTestSupport { .process(new Processor() { @Override public void process(Exchange exchange) throws Exception { -var m = MDC.getCopyOfContextMap(); +Map m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId"));
[camel] branch camel-3.14.x updated (a76f778 -> da482b6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from a76f778 Regen new 0037da0 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. new da482b6 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. 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: .../apache/camel/impl/engine/MDCUnitOfWork.java| 10 +++- .../errorhandler/DeadLetterChannelReifier.java | 6 +-- .../errorhandler/DefaultErrorHandlerReifier.java | 6 +-- .../reifier/errorhandler/ErrorHandlerReifier.java | 17 ++- .../MDCErrorHandlerTest.java} | 57 ++ 5 files changed, 55 insertions(+), 41 deletions(-) copy core/camel-core/src/test/java/org/apache/camel/{issues/SameRouteAndContextScopedErrorHandlerIssueTest.java => processor/MDCErrorHandlerTest.java} (52%)
[camel] 01/02: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.
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 commit 0037da02e9322681dbd0387a346107552d1aa411 Author: Claus Ibsen AuthorDate: Sat Jan 22 18:45:40 2022 +0100 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. --- .../apache/camel/impl/engine/MDCUnitOfWork.java| 10 +++- .../errorhandler/DeadLetterChannelReifier.java | 6 +- .../errorhandler/DefaultErrorHandlerReifier.java | 6 +- .../reifier/errorhandler/ErrorHandlerReifier.java | 17 +- .../camel/processor/MDCErrorHandlerTest.java | 70 ++ 5 files changed, 99 insertions(+), 10 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java index 797e181..074521d 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java @@ -65,6 +65,10 @@ public class MDCUnitOfWork extends DefaultUnitOfWork implements Service { this.originalCamelContextId = MDC.get(MDC_CAMEL_CONTEXT_ID); this.originalTransactionKey = MDC.get(MDC_TRANSACTION_KEY); +prepareMDC(exchange); +} + +protected void prepareMDC(Exchange exchange) { // must add exchange and message id in constructor MDC.put(MDC_EXCHANGE_ID, exchange.getExchangeId()); String msgId = exchange.getMessage().getMessageId(); @@ -133,11 +137,14 @@ public class MDCUnitOfWork extends DefaultUnitOfWork implements Service { @Override public AsyncCallback beforeProcess(Processor processor, Exchange exchange, AsyncCallback callback) { +// prepare MDC before processing +prepareMDC(exchange); // add optional step id String stepId = exchange.getProperty(ExchangePropertyKey.STEP_ID, String.class); if (stepId != null) { MDC.put(MDC_STEP_ID, stepId); } +// return callback with after processing work return new MDCCallback(callback, pattern); } @@ -148,8 +155,7 @@ public class MDCUnitOfWork extends DefaultUnitOfWork implements Service { if (stepId == null) { MDC.remove(MDC_STEP_ID); } - -// clear to avoid leaking to current thread when +// clear MDC to avoid leaking to current thread when // the exchange is continued routed asynchronously clear(); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java index 8cb6a59..7fb4f12 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java @@ -47,14 +47,14 @@ public class DeadLetterChannelReifier extends DefaultErrorHandlerReifier DefaultErrorHandler answer = new DefaultErrorHandler( camelContext, processor, logger, -getBean(Processor.class, definition.getOnRedelivery(), definition.getOnRedeliveryRef()), +getProcessor(definition.getOnRedelivery(), definition.getOnRedeliveryRef()), redeliveryPolicy, getPredicate(definition.getRetryWhile(), definition.getRetryWhileRef()), getExecutorService(definition.getExecutorService(), definition.getExecutorServiceRef()), -getBean(Processor.class, definition.getOnPrepareFailure(), definition.getOnPrepareFailureRef()), -getBean(Processor.class, definition.getOnExceptionOccurred(), definition.getOnExceptionOccurredRef())); +getProcessor(definition.getOnPrepareFailure(), definition.getOnPrepareFailureRef()), +getProcessor(definition.getOnExceptionOccurred(), definition.getOnExceptionOccurredRef())); // configure error handler before we can use it configure(answer); return answer; diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java index 1bfeb16..7ac9428 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java @@ -25,6 +25,7 @@ import java.util.function.BiFunction; import org.apache.camel.CamelContext; import
[camel] 02/02: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.
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 commit da482b6f8d16571aacd18513b65b5f5215500a2d Author: Claus Ibsen AuthorDate: Sat Jan 22 18:53:49 2022 +0100 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. --- .../test/java/org/apache/camel/processor/MDCErrorHandlerTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java index 2d8a47c..bea130e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java @@ -44,7 +44,8 @@ public class MDCErrorHandlerTest extends ContextTestSupport { public void process(Exchange exchange) throws Exception { var m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); - Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId")); + Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), +m.get("camel.breadcrumbId")); Assertions.assertEquals("start", m.get("camel.routeId")); } })); @@ -59,7 +60,8 @@ public class MDCErrorHandlerTest extends ContextTestSupport { public void process(Exchange exchange) throws Exception { var m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); - Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId")); + Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), +m.get("camel.breadcrumbId")); Assertions.assertEquals("dead", m.get("camel.routeId")); } })
[camel] branch main updated: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.
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 d592232 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. d592232 is described below commit d592232b1137a6f39c7cf593e41f67844b3ccade Author: Claus Ibsen AuthorDate: Sat Jan 22 18:53:49 2022 +0100 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. --- .../test/java/org/apache/camel/processor/MDCErrorHandlerTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java index 2d8a47c..bea130e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java @@ -44,7 +44,8 @@ public class MDCErrorHandlerTest extends ContextTestSupport { public void process(Exchange exchange) throws Exception { var m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); - Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId")); + Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), +m.get("camel.breadcrumbId")); Assertions.assertEquals("start", m.get("camel.routeId")); } })); @@ -59,7 +60,8 @@ public class MDCErrorHandlerTest extends ContextTestSupport { public void process(Exchange exchange) throws Exception { var m = MDC.getCopyOfContextMap(); Assertions.assertEquals(5, m.size()); - Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), m.get("camel.breadcrumbId")); + Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID), +m.get("camel.breadcrumbId")); Assertions.assertEquals("dead", m.get("camel.routeId")); } })
[camel] branch main updated: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.
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 3b2d68c CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. 3b2d68c is described below commit 3b2d68cd281d48b76025a36bcd3151ffd27be3df Author: Claus Ibsen AuthorDate: Sat Jan 22 18:45:40 2022 +0100 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. --- .../apache/camel/impl/engine/MDCUnitOfWork.java| 10 +++- .../errorhandler/DeadLetterChannelReifier.java | 6 +- .../errorhandler/DefaultErrorHandlerReifier.java | 6 +- .../reifier/errorhandler/ErrorHandlerReifier.java | 17 +- .../camel/processor/MDCErrorHandlerTest.java | 70 ++ 5 files changed, 99 insertions(+), 10 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java index 797e181..074521d 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java @@ -65,6 +65,10 @@ public class MDCUnitOfWork extends DefaultUnitOfWork implements Service { this.originalCamelContextId = MDC.get(MDC_CAMEL_CONTEXT_ID); this.originalTransactionKey = MDC.get(MDC_TRANSACTION_KEY); +prepareMDC(exchange); +} + +protected void prepareMDC(Exchange exchange) { // must add exchange and message id in constructor MDC.put(MDC_EXCHANGE_ID, exchange.getExchangeId()); String msgId = exchange.getMessage().getMessageId(); @@ -133,11 +137,14 @@ public class MDCUnitOfWork extends DefaultUnitOfWork implements Service { @Override public AsyncCallback beforeProcess(Processor processor, Exchange exchange, AsyncCallback callback) { +// prepare MDC before processing +prepareMDC(exchange); // add optional step id String stepId = exchange.getProperty(ExchangePropertyKey.STEP_ID, String.class); if (stepId != null) { MDC.put(MDC_STEP_ID, stepId); } +// return callback with after processing work return new MDCCallback(callback, pattern); } @@ -148,8 +155,7 @@ public class MDCUnitOfWork extends DefaultUnitOfWork implements Service { if (stepId == null) { MDC.remove(MDC_STEP_ID); } - -// clear to avoid leaking to current thread when +// clear MDC to avoid leaking to current thread when // the exchange is continued routed asynchronously clear(); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java index 8cb6a59..7fb4f12 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java @@ -47,14 +47,14 @@ public class DeadLetterChannelReifier extends DefaultErrorHandlerReifier DefaultErrorHandler answer = new DefaultErrorHandler( camelContext, processor, logger, -getBean(Processor.class, definition.getOnRedelivery(), definition.getOnRedeliveryRef()), +getProcessor(definition.getOnRedelivery(), definition.getOnRedeliveryRef()), redeliveryPolicy, getPredicate(definition.getRetryWhile(), definition.getRetryWhileRef()), getExecutorService(definition.getExecutorService(), definition.getExecutorServiceRef()), -getBean(Processor.class, definition.getOnPrepareFailure(), definition.getOnPrepareFailureRef()), -getBean(Processor.class, definition.getOnExceptionOccurred(), definition.getOnExceptionOccurredRef())); +getProcessor(definition.getOnPrepareFailure(), definition.getOnPrepareFailureRef()), +getProcessor(definition.getOnExceptionOccurred(), definition.getOnExceptionOccurredRef())); // configure error handler before we can use it configure(answer); return answer; diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java index 1bfeb16..7ac9428 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new e1b8a1f Regen e1b8a1f is described below commit e1b8a1f84cf147ce3b1045eaa7002d38a07cbd98 Author: Claus Ibsen AuthorDate: Sat Jan 22 18:29:38 2022 +0100 Regen --- .../camel/component/schematron/processor/ClassPathURIResolver.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java index e025081..8f7d2c1 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java @@ -42,8 +42,8 @@ public class ClassPathURIResolver implements URIResolver { @Override public Source resolve(String href, String base) throws TransformerException { InputStream stream -= org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), - getClass().getClassLoader()); += org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), +getClass().getClassLoader()); if (stream != null) { return new StreamSource(stream); } else {
[camel] branch camel-3.14.x updated: Regen
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 a76f778 Regen a76f778 is described below commit a76f778f5a3b72f178b05bc0df4d58f662065671 Author: Claus Ibsen AuthorDate: Sat Jan 22 18:29:38 2022 +0100 Regen --- .../camel/component/schematron/processor/ClassPathURIResolver.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java index e025081..8f7d2c1 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java @@ -42,8 +42,8 @@ public class ClassPathURIResolver implements URIResolver { @Override public Source resolve(String href, String base) throws TransformerException { InputStream stream -= org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), - getClass().getClassLoader()); += org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), +getClass().getClassLoader()); if (stream != null) { return new StreamSource(stream); } else {
[GitHub] [camel] bvfalcon opened a new pull request #6808: Service account authorization (Google OAuth2 2LO) added for Google-components calendar, sheets, drive, gmail
bvfalcon opened a new pull request #6808: URL: https://github.com/apache/camel/pull/6808 As logical continue of CAMEL-17476, changes in camel-google-mail were copied to components camel-google-calendar, camel-google-sheets, camel-google-drive. For each component 3 new parameters was added, specific for Google service account authorization: keyResource (JSON-formatted key-file with credentials), scopes (collection of component-specific Google Scopes) and delegate (domain-wide delegation). Parameters and methods of their processing are unified between all components. In some cases this unification makes necessary changes in DSL: 1) Scopes in camel-google-drive. Before my changes scopes were initialized with [non-modifiable implementation of List](https://github.com/apache/camel/blob/main/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java#L47). It makes impossible to add additional scopes in DSL. Now scopes are not initialized by default and scopes definition must be defined in DSL as "[]=". 2) Scopes in camel-google-calendar. Before my changes scopes were [defined as String](https://github.com/apache/camel/blob/main/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java#L41) and [parsed programmatically into List](https://github.com/apache/camel/blob/main/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java#L58). Now scopes are defined as List and in DSL parameter "scopes" must be defined as "[]=" instead of "=" **Important notice** about [Jakarta Activation in camel-google-mail](https://github.com/apache/camel/blob/main/components/camel-google/camel-google-mail/pom.xml#L106): since JDK 9 this module is not a part of JDK, so i remove this exclusion. As for as I know, [Apache Camel 3.x is oriented on Java 11](https://camel.apache.org/blog/2019/12/Camel3-Whatsnew/#3-java-11). If this is not so, this exclusion must be parametrized with maven profiles or any similar way. P.S. Big thanks to @jamesnetherton for [upgrading google dependencies](https://github.com/apache/camel/pull/6799/). In such big project as Apache Camel different library versions can jar-hell provoke. Of course, it is unacceptable to leave different versions in such similar components. -- 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-kafka-connector] michaelhoffmantech opened a new issue #1326: Connectors Webpage Links to Older Version
michaelhoffmantech opened a new issue #1326: URL: https://github.com/apache/camel-kafka-connector/issues/1326 The download links for the latest version of connectors are pointing to the 0.11.0 packages instead of the 1.0 packages: https://camel.apache.org/camel-kafka-connector/1.0.x/reference/index.html -- 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-kafka-connector] michaelhoffmantech opened a new issue #1325: Consistency of Property Naming
michaelhoffmantech opened a new issue #1325: URL: https://github.com/apache/camel-kafka-connector/issues/1325 Can there be more consistency of prefixes for property names in connectors? An example is the difference between the http-sink and https-sink where the http-sink connector name is camel.kamelet.http-sink.url, but then the https-sink is camel.sink.path.httpUri. One driver for this is that developers coming to these Camel connectors may not know about kamelets and could be confused with the property naming. Also, if using Kafka Connect in a larger organization, you'll find developers will copy and paste, so it might be a helpful hint to know that a property was specific to the connector. -- 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 (58cfcde -> 5d13131)
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 58cfcde Regen for commit b54dafc3b8b5370db9c2b8cb32562adb800b3d51 add 5d13131 Remove misleading docs (#6802) No new revisions were added by this update. Summary of changes: .../camel-yaml-dsl/src/main/docs/yaml-dsl.adoc | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-)
[camel-spring-boot] branch main updated: (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#431)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new c465207 (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#431) c465207 is described below commit c4652079b9d23fe30aabfe50c0c0432381b276b7 Author: Otavio Rodolfo Piske AuthorDate: Sat Jan 22 10:08:44 2022 +0100 (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#431) --- .../src/main/resources/archetype-resources/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index 70087fa..2bd381f 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -107,8 +107,7 @@ maven-compiler-plugin ${maven-compiler-plugin-version} - 1.8 - 1.8 + 11
[GitHub] [camel-spring-boot] davsclaus merged pull request #431: (chores) Adjust archetypes so that generated projects use Java 11
davsclaus merged pull request #431: URL: https://github.com/apache/camel-spring-boot/pull/431 -- 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-karaf] davsclaus merged pull request #109: (chores) Adjust archetypes so that generated projects use Java 11 at …
davsclaus merged pull request #109: URL: https://github.com/apache/camel-karaf/pull/109 -- 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-karaf] branch main updated: (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#109)
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-karaf.git The following commit(s) were added to refs/heads/main by this push: new 0763508 (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#109) 0763508 is described below commit 076350820141b27e0c7b255f1a80414cb372aba0 Author: Otavio Rodolfo Piske AuthorDate: Sat Jan 22 10:08:32 2022 +0100 (chores) Adjust archetypes so that generated projects use Java 11 at minimum (#109) --- .../src/main/resources/archetype-resources/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml index ec194c9..3998858 100644 --- a/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml @@ -93,8 +93,7 @@ maven-compiler-plugin ${maven-compiler-plugin-version} - 1.8 - 1.8 + 11
[camel] branch main updated (5d13131 -> 01f5b57)
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 5d13131 Remove misleading docs (#6802) add 01f5b57 CAMEL-17524 fix resource loading so it works in OSGi (#6807) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/graphql/GraphqlEndpoint.java| 2 +- .../apache/camel/component/jbpm/server/CamelKieServerExtension.java | 6 -- .../component/jira/oauth/OAuthAsynchronousHttpClientFactory.java| 3 ++- .../camel/component/schematron/processor/ClassPathURIResolver.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #6807: CAMEL-17524 fix resource loading so it works in OSGi
davsclaus commented on pull request #6807: URL: https://github.com/apache/camel/pull/6807#issuecomment-1019102838 cherry picked to main -- 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: CAMEL-17524 fix resource loading so it works in OSGi (#6807)
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 d3a0d30 CAMEL-17524 fix resource loading so it works in OSGi (#6807) d3a0d30 is described below commit d3a0d3082f11a250f8d2cfb8963f359d47899c9c Author: Ryan Yeats AuthorDate: Sat Jan 22 01:30:06 2022 -0700 CAMEL-17524 fix resource loading so it works in OSGi (#6807) --- .../java/org/apache/camel/component/graphql/GraphqlEndpoint.java| 2 +- .../apache/camel/component/jbpm/server/CamelKieServerExtension.java | 6 -- .../component/jira/oauth/OAuthAsynchronousHttpClientFactory.java| 3 ++- .../camel/component/schematron/processor/ClassPathURIResolver.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java b/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java index 54bcc28..cedf3b4 100644 --- a/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java +++ b/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java @@ -189,7 +189,7 @@ public class GraphqlEndpoint extends DefaultEndpoint { public String getQuery() { if (query == null && queryFile != null) { try { -query = IOHelper.loadText(ObjectHelper.loadResourceAsStream(queryFile)); +query = IOHelper.loadText(ObjectHelper.loadResourceAsStream(queryFile, getClass().getClassLoader())); } catch (IOException e) { throw new RuntimeCamelException("Failed to read query file: " + queryFile, e); } diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java index a4f68af..6981bf2 100644 --- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java +++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java @@ -97,7 +97,8 @@ public class CamelKieServerExtension implements KieServerExtension { this.camelContext.setName("KIE Server Camel context"); try (InputStream is -= getCamelContext().getClassResolver().loadResourceAsStream("/global-camel-routes.xml")) { += org.apache.camel.util.ObjectHelper.loadResourceAsStream("/global-camel-routes.xml", +getClass().getClassLoader())) { if (is != null) { ExtendedCamelContext ecc = camelContext.adapt(ExtendedCamelContext.class); RoutesDefinition routes @@ -129,7 +130,8 @@ public class CamelKieServerExtension implements KieServerExtension { public void createContainer(String id, KieContainerInstance kieContainerInstance, Map parameters) { ClassLoader classloader = kieContainerInstance.getKieContainer().getClassLoader(); -try (InputStream is = getCamelContext().getClassResolver().loadResourceAsStream("camel-routes.xml")) { +try (InputStream is += org.apache.camel.util.ObjectHelper.loadResourceAsStream("camel-routes.xml", getClass().getClassLoader())) { if (is != null) { DefaultCamelContext context = (DefaultCamelContext) buildDeploymentContext(id, classloader); diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java index e3ba43c..4df7f73 100644 --- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java +++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java @@ -161,7 +161,8 @@ public class OAuthAsynchronousHttpClientFactory { static String getVersion(String groupId, String artifactId) { final Properties props = new Properties(); String pomProps = String.format("/META-INF/maven/%s/%s/pom.properties", groupId, artifactId); -try (InputStream resourceAsStream = org.apache.camel.util.ObjectHelper.loadResourceAsStream(pomProps)) { +try (InputStream resourceAsStream = org.apache.camel.util.ObjectHelper.loadResourceAsStream(pomProps, + OAuthAsynchronousHttpClientFactory.class.getClassLoader())) { props.load(resourceAsStream); return props.getProperty("version", UNKNOWN_VERSION); }
[GitHub] [camel] davsclaus merged pull request #6807: CAMEL-17524 fix resource loading so it works in OSGi
davsclaus merged pull request #6807: URL: https://github.com/apache/camel/pull/6807 -- 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: Remove misleading docs (#6802)
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 5d13131 Remove misleading docs (#6802) 5d13131 is described below commit 5d13131ff67038a8fb1e5985cd55bff6b74b6250 Author: Marat Gubaidullin AuthorDate: Sat Jan 22 03:25:13 2022 -0500 Remove misleading docs (#6802) --- .../camel-yaml-dsl/src/main/docs/yaml-dsl.adoc | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/docs/yaml-dsl.adoc b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/docs/yaml-dsl.adoc index fbf4874..5de8556 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/docs/yaml-dsl.adoc +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/docs/yaml-dsl.adoc @@ -89,21 +89,9 @@ filter: - *Data Format Aware Steps* + -The EIP `marshal` and `unmarshal` supports the definition of data formats through the `data-format-type` field: +The EIP `marshal` and `unmarshal` supports the definition of data formats: + [source,yaml] -.Explicit Data Format field - -marshal: -data-format-type: - json: -library: Gson - -+ -To make the DSL less verbose, the `data-format` field can be omitted: -+ -[source,yaml] -.Implicit Data Format field marshal: json:
[GitHub] [camel] davsclaus merged pull request #6802: CAMEL-17253: Remove misleading docs
davsclaus merged pull request #6802: URL: https://github.com/apache/camel/pull/6802 -- 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-website] github-actions[bot] commented on pull request #747: DO NOT MERGE PREVIEW ONLY preview playbook for RI work
github-actions[bot] commented on pull request #747: URL: https://github.com/apache/camel-website/pull/747#issuecomment-1019099826 Preview is available at https://pr-747--camel.netlify.app -- 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