(camel-spring-boot) branch dependabot/github_actions/peter-evans/create-pull-request-6.1.0 deleted (was 749a5f3660c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/peter-evans/create-pull-request-6.1.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 749a5f3660c Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot) branch main updated: Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 (#1167)
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 4e024eaaab0 Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 (#1167) 4e024eaaab0 is described below commit 4e024eaaab008e73b911d39d55851a2dc2de9275 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 07:20:22 2024 +0200 Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 (#1167) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.5 to 6.1.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6.0.5...v6.1.0) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/automatic-sync-camel-3.yml | 2 +- .github/workflows/automatic-sync-main.yml| 2 +- .github/workflows/generate-sbom-main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automatic-sync-camel-3.yml b/.github/workflows/automatic-sync-camel-3.yml index c2f1f58e959..aa03d0296f5 100644 --- a/.github/workflows/automatic-sync-camel-3.yml +++ b/.github/workflows/automatic-sync-camel-3.yml @@ -52,7 +52,7 @@ jobs: - name: Build Camel-spring-boot Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests - name: Create Pull Request -uses: peter-evans/create-pull-request@v6.0.5 +uses: peter-evans/create-pull-request@v6.1.0 with: base: camel-spring-boot-3.x token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/automatic-sync-main.yml b/.github/workflows/automatic-sync-main.yml index dc8ed42b8ec..d9b1f606c26 100644 --- a/.github/workflows/automatic-sync-main.yml +++ b/.github/workflows/automatic-sync-main.yml @@ -52,7 +52,7 @@ jobs: - name: Build Camel-spring-boot Project run: ./mvnw -V --no-transfer-progress clean install -DskipTests - name: Create Pull Request -uses: peter-evans/create-pull-request@v6.0.5 +uses: peter-evans/create-pull-request@v6.1.0 with: base: main token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml index f5e1ab38f13..9747fece80f 100644 --- a/.github/workflows/generate-sbom-main.yml +++ b/.github/workflows/generate-sbom-main.yml @@ -54,7 +54,7 @@ jobs: - name: Build Camel-spring-boot Project for generating SBOM run: ./mvnw -V --no-transfer-progress clean install -DskipTests -Psbom - name: Create Pull Request -uses: peter-evans/create-pull-request@v6.0.5 +uses: peter-evans/create-pull-request@v6.1.0 with: base: main token: ${{ secrets.GITHUB_TOKEN }}
(camel) 03/03: Add properties to skip execution of the validate and route coverage mojos (#13717)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 5374409cb40cc89df52d7e14cf519d0e841dc562 Author: Adriano Machado <60320+ammach...@users.noreply.github.com> AuthorDate: Sat Apr 13 01:51:16 2024 -0400 Add properties to skip execution of the validate and route coverage mojos (#13717) * Add properties to skip execution of the validate and route coverage mojos * Fixing typo * Better log messages * Adding new parameters to documentation --- catalog/camel-report-maven-plugin/pom.xml | 12 .../src/main/docs/camel-report-maven-plugin.adoc| 2 ++ .../org/apache/camel/maven/RouteCoverageMojo.java | 14 -- .../java/org/apache/camel/maven/ValidateMojo.java | 21 - .../ROOT/pages/camel-report-maven-plugin.adoc | 2 ++ 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml index 8557a0e7cd0..ad08c1c7716 100644 --- a/catalog/camel-report-maven-plugin/pom.xml +++ b/catalog/camel-report-maven-plugin/pom.xml @@ -55,18 +55,6 @@ org.apache.maven maven-core - - -org.codehaus.mojo -exec-maven-plugin -${exec-maven-plugin-version} - - -org.apache.maven -maven-plugin-descriptor - - - org.apache.maven maven-plugin-api diff --git a/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc b/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc index 8e7c682edc0..dbaf6f93c72 100644 --- a/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc +++ b/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc @@ -133,6 +133,7 @@ The maven plugin *validate* goal supports the following options which can be con |=== | Parameter | Default Value | Description +| skip | false | Whether to skip the plugin execution. | downloadVersion | true | Whether to allow downloading Camel catalog version from the internet. This is needed if the project uses a different Camel version than this plugin is using by default. | failOnError | false | Whether to fail if invalid Camel endpoints was found. By default the plugin logs the errors at WARN level. | coverageThreshold | 100 | The minimum route coverage in percent when using failOnError. @@ -317,6 +318,7 @@ The maven plugin *coverage* goal supports the following options which can be con |=== | Parameter | Default Value | Description +| skip | false | Whether to skip the plugin execution. | failOnError | false | Whether to fail if any of the routes has not 100% coverage. | includeTest | false | Whether to include test source code. | includes | | To filter the names of java and xml files to only include files matching any of the given list of diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java index 5e27feac9f5..a6d945c753b 100644 --- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java +++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java @@ -54,11 +54,11 @@ import org.apache.camel.parser.helper.RouteCoverageHelper; import org.apache.camel.parser.model.CamelNodeDetails; import org.apache.camel.parser.model.CoverageData; import org.apache.camel.util.FileUtil; +import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.codehaus.mojo.exec.AbstractExecMojo; import org.jboss.forge.roaster.Roaster; import org.jboss.forge.roaster.model.JavaType; import org.jboss.forge.roaster.model.source.JavaClassSource; @@ -73,7 +73,7 @@ import static org.apache.camel.maven.ReportPluginCommon.stripRootPath; * Performs route coverage reports after running Camel unit tests with camel-test modules */ @Mojo(name = "route-coverage", threadSafe = true) -public class RouteCoverageMojo extends AbstractExecMojo { +public class RouteCoverageMojo extends AbstractMojo { /** * The maven project. @@ -81,6 +81,12 @@ public class RouteCoverageMojo extends AbstractExecMojo { @Parameter(property = "project", required = true, readonly = true) protected MavenProject project; +/** + * Skip route coverage execution. + */ +@Parameter(property = "camel.skipRouteCoverage",
(camel) 01/03: camel-report:route-coverage - Fix indent for doTry .. doCatch .. doFinally to be aligned
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 47cbc30cde84c27818733c4d7e74355e2597c1e8 Author: Claus Ibsen AuthorDate: Sun May 28 11:09:03 2023 +0200 camel-report:route-coverage - Fix indent for doTry .. doCatch .. doFinally to be aligned --- .../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java | 5 + 1 file changed, 5 insertions(+) diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java index b2cb7454c7f..5e27feac9f5 100644 --- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java +++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java @@ -472,6 +472,11 @@ public class RouteCoverageMojo extends AbstractExecMojo { return; } +// end block to make doTry .. doCatch .. doFinally aligned +if ("doCatch".equals(node.getName()) || "doFinally".equals(node.getName())) { +level.decrementAndGet(); +} + RouteCoverageNode data = new RouteCoverageNode(); data.setName(node.getName()); data.setLineNumber(Integer.parseInt(node.getLineNumber()));
(camel) 02/03: CAMEL-20140: Fix camel-report:route-coverage to be able to output coverage data (#12184)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git commit e712dd0350e237828dcff18059e9770dbeae9013 Author: Claus Ibsen AuthorDate: Thu Nov 23 15:57:09 2023 +0100 CAMEL-20140: Fix camel-report:route-coverage to be able to output coverage data (#12184) --- .../java/org/apache/camel/parser/helper/RouteCoverageHelper.java | 5 + .../java/org/apache/camel/management/mbean/ManagedCamelContext.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/RouteCoverageHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/RouteCoverageHelper.java index f4e9e53a490..ec4cbcd20d3 100644 --- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/RouteCoverageHelper.java +++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/RouteCoverageHelper.java @@ -68,10 +68,7 @@ public final class RouteCoverageHelper { for (int i = 0; i < routes.getLength(); i++) { Node route = routes.item(i); String id = route.getAttributes().getNamedItem("id").getNodeValue(); -String customId = route.getAttributes().getNamedItem("customId") != null -? route.getAttributes().getNamedItem("customId").getNodeValue() : "false"; -// must be the target route and the route must be explicit assigned with that route id (not anonymous route) -if ("true".equals(customId) && routeId.equals(id)) { +if (routeId.equals(id)) { // parse each route and build a List for line by line coverage data AtomicInteger counter = new AtomicInteger(); parseRouteData(catalog, route, answer, counter); diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java index 382f54fa0c0..5bc37f74959 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java @@ -678,7 +678,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti getExchangesTotal(), getTotalProcessingTime())) .append(">\n"); -String xml = dumpRoutesAsXml(); +String xml = dumpRoutesAsXml(false, false); if (xml != null) { // use the coverage xml parser to dump the routes and enrich with coverage stats Document dom = RouteCoverageXmlParser.parseXml(context, new ByteArrayInputStream(xml.getBytes()));
(camel) branch camel-4.0.x updated (238e731813b -> 5374409cb40)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git from 238e731813b CAMEL-20834: camel-salesforce - A NullPointException in SubscriptionHelper.subscribe() interrupts platform-event subscription (#14572) new 47cbc30cde8 camel-report:route-coverage - Fix indent for doTry .. doCatch .. doFinally to be aligned new e712dd0350e CAMEL-20140: Fix camel-report:route-coverage to be able to output coverage data (#12184) new 5374409cb40 Add properties to skip execution of the validate and route coverage mojos (#13717) 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: catalog/camel-report-maven-plugin/pom.xml | 12 .../src/main/docs/camel-report-maven-plugin.adoc| 2 ++ .../org/apache/camel/maven/RouteCoverageMojo.java | 19 +-- .../java/org/apache/camel/maven/ValidateMojo.java | 21 - .../camel/parser/helper/RouteCoverageHelper.java| 5 + .../camel/management/mbean/ManagedCamelContext.java | 2 +- .../ROOT/pages/camel-report-maven-plugin.adoc | 2 ++ 7 files changed, 39 insertions(+), 24 deletions(-)
(camel-quarkus) branch quarkus-main updated (ac017797d8 -> f45da988da)
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 ac017797d8 Upgrade Quarkus to 3.13.0.CR1 add 4bc44cb448 Update changelog for 3.12.0 release add d4b38e9bd2 Clean release procedure new f45da988da Upgrade Quarkus to 3.13.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 (ac017797d8) \ N -- N -- N refs/heads/quarkus-main (f45da988da) 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 | 58 +++- .../pages/contributor-guide/release-guide.adoc | 78 +- 2 files changed, 89 insertions(+), 47 deletions(-)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.13.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 f45da988da889addcc86a2405363c1a82723b355 Author: James Netherton AuthorDate: Mon Jun 24 11:24:38 2024 +0100 Upgrade Quarkus to 3.13.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index ba98deb2fa..bf5513271d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -36,7 +36,7 @@ asciidoc: graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} min-maven-version: 3.8.2 # replace ${min-maven-version} -target-maven-version: 3.9.7 # replace ${target-maven-version} +target-maven-version: 3.9.8 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: next@components diff --git a/pom.xml b/pom.xml index 29fdee2c59..c90966bf13 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.2 2.4.0 2.0.2 -3.12.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -265,7 +265,7 @@ 3.8.2 -3.9.7 +3.9.8 [${min-maven-version},)
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 2db279293 chore: changelog automatic update 2db279293 is described below commit 2db27929348b948cebd0cc7e24dc58a07a320862 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 01:16:05 2024 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf0d2cb67..1674b85cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,11 +20,13 @@ - Unable to specify any CloudEvent attributes or extensions, except for `type` [\#5537](https://github.com/apache/camel-k/issues/5537) - Move deprecated v1alpha1.KameletBinding tests to v1.Pipe [\#5490](https://github.com/apache/camel-k/issues/5490) - Move tests, examples and documentation from groovy to yaml [\#5489](https://github.com/apache/camel-k/issues/5489) +- Review CI setup and test executions scrips/make targets [\#5463](https://github.com/apache/camel-k/issues/5463) - Add a deploy make target [\#5460](https://github.com/apache/camel-k/issues/5460) - Remove health readiness workaround when fixed in Camel [\#5451](https://github.com/apache/camel-k/issues/5451) - Deprecate some of the camel.apache.org annotation in favor of k8s's recommended labels [\#5212](https://github.com/apache/camel-k/issues/5212) - Dependency Service Discovery for Camel K [\#5196](https://github.com/apache/camel-k/issues/5196) - Mount configmap/secret resources to a dedicated resources.d durectory [\#5181](https://github.com/apache/camel-k/issues/5181) +- Ability to use timezones when using quartz component and CronJob strategy [\#5121](https://github.com/apache/camel-k/issues/5121) - Add missing functionalities and resolve possible discrepancies [\#4951](https://github.com/apache/camel-k/issues/4951) - Make the platform controller operator instantiate the camel k operator [\#4950](https://github.com/apache/camel-k/issues/4950) - Add missing fields on IntegrationPlatform custom resource to support platform controller operator [\#4949](https://github.com/apache/camel-k/issues/4949)
(camel-k) branch release-2.3.x updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.3.x by this push: new 567f81521 chore: nightly automatic updates 567f81521 is described below commit 567f81521c1d6c3e0ec107c330150544ed826e2e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 00:34:11 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf0d2cb67..1674b85cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,11 +20,13 @@ - Unable to specify any CloudEvent attributes or extensions, except for `type` [\#5537](https://github.com/apache/camel-k/issues/5537) - Move deprecated v1alpha1.KameletBinding tests to v1.Pipe [\#5490](https://github.com/apache/camel-k/issues/5490) - Move tests, examples and documentation from groovy to yaml [\#5489](https://github.com/apache/camel-k/issues/5489) +- Review CI setup and test executions scrips/make targets [\#5463](https://github.com/apache/camel-k/issues/5463) - Add a deploy make target [\#5460](https://github.com/apache/camel-k/issues/5460) - Remove health readiness workaround when fixed in Camel [\#5451](https://github.com/apache/camel-k/issues/5451) - Deprecate some of the camel.apache.org annotation in favor of k8s's recommended labels [\#5212](https://github.com/apache/camel-k/issues/5212) - Dependency Service Discovery for Camel K [\#5196](https://github.com/apache/camel-k/issues/5196) - Mount configmap/secret resources to a dedicated resources.d durectory [\#5181](https://github.com/apache/camel-k/issues/5181) +- Ability to use timezones when using quartz component and CronJob strategy [\#5121](https://github.com/apache/camel-k/issues/5121) - Add missing functionalities and resolve possible discrepancies [\#4951](https://github.com/apache/camel-k/issues/4951) - Make the platform controller operator instantiate the camel k operator [\#4950](https://github.com/apache/camel-k/issues/4950) - Add missing fields on IntegrationPlatform custom resource to support platform controller operator [\#4949](https://github.com/apache/camel-k/issues/4949)
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 4dafb068d chore: nightly automatic updates 4dafb068d is described below commit 4dafb068d24a156dfa8be154c3cd992dad3e24f1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jun 24 23:48:04 2024 + chore: nightly automatic updates --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc0261b5..72da745d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,11 +20,13 @@ - Unable to specify any CloudEvent attributes or extensions, except for `type` [\#5537](https://github.com/apache/camel-k/issues/5537) - Move deprecated v1alpha1.KameletBinding tests to v1.Pipe [\#5490](https://github.com/apache/camel-k/issues/5490) - Move tests, examples and documentation from groovy to yaml [\#5489](https://github.com/apache/camel-k/issues/5489) +- Review CI setup and test executions scrips/make targets [\#5463](https://github.com/apache/camel-k/issues/5463) - Add a deploy make target [\#5460](https://github.com/apache/camel-k/issues/5460) - Remove health readiness workaround when fixed in Camel [\#5451](https://github.com/apache/camel-k/issues/5451) - Deprecate some of the camel.apache.org annotation in favor of k8s's recommended labels [\#5212](https://github.com/apache/camel-k/issues/5212) - Dependency Service Discovery for Camel K [\#5196](https://github.com/apache/camel-k/issues/5196) - Mount configmap/secret resources to a dedicated resources.d durectory [\#5181](https://github.com/apache/camel-k/issues/5181) +- Ability to use timezones when using quartz component and CronJob strategy [\#5121](https://github.com/apache/camel-k/issues/5121) - Add missing functionalities and resolve possible discrepancies [\#4951](https://github.com/apache/camel-k/issues/4951) - Make the platform controller operator instantiate the camel k operator [\#4950](https://github.com/apache/camel-k/issues/4950) - Add missing fields on IntegrationPlatform custom resource to support platform controller operator [\#4949](https://github.com/apache/camel-k/issues/4949) @@ -37,6 +39,9 @@ **Merged pull requests:** - chore\(deps\): bump k8s.io/klog/v2 from 2.130.0 to 2.130.1 [\#5665](https://github.com/apache/camel-k/pull/5665) ([dependabot[bot]](https://github.com/apps/dependabot)) +- feat\(\#5121\): adding timeZone property to the Cron trait spec [\#5664](https://github.com/apache/camel-k/pull/5664) ([lsergio](https://github.com/lsergio)) +- \(\#5463\) Add make targets: setup-knative, setup-yaks [\#5661](https://github.com/apache/camel-k/pull/5661) ([tdiesler](https://github.com/tdiesler)) +- fix\(e2e\): Telemetry rest-consumer service name [\#5660](https://github.com/apache/camel-k/pull/5660) ([gansheer](https://github.com/gansheer)) - chore\(deps\): bump github.com/container-tools/spectrum from 0.6.42 to 0.6.45 [\#5655](https://github.com/apache/camel-k/pull/5655) ([dependabot[bot]](https://github.com/apps/dependabot)) - \(\#5652\) Added TimeoutSeconds to knative-serving trait [\#5653](https://github.com/apache/camel-k/pull/5653) ([hernanDatgDev](https://github.com/hernanDatgDev)) - \(\#5635\) Add TLS configuration in the ingress trait [\#5650](https://github.com/apache/camel-k/pull/5650) ([romain-pfund](https://github.com/romain-pfund))
(camel-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 10d7d068e16 Regen 10d7d068e16 is described below commit 10d7d068e16ed5609efdbb85b16c635b8e561250 Author: Claus Ibsen AuthorDate: Mon Jun 24 20:40:56 2024 +0200 Regen --- .../catalog/components/aws2-kinesis.json | 78 +++--- .../src/main/docs/aws2-kinesis.json| 7 ++ .../springboot/Kinesis2ComponentConfiguration.java | 12 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json index 37ce0cf41ea..768104cc592 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json @@ -39,19 +39,20 @@ "amazonKinesisClient": { "index": 13, "kind": "property", "displayName": "Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis clien [...] "asyncClient": { "index": 14, "kind": "property", "displayName": "Async Client", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "If we want to a KinesisAsyncClient instance set it to true" }, "autowiredEnabled": { "index": 15, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching [...] -"healthCheckConsumerEnabled": { "index": 16, "kind": "property", "displayName": "Health Check Consumer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all consumer based health checks from this component" }, -"healthCheckProducerEnabled": { "index": 17, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on produce [...] -"proxyHost": { "index": 18, "kind": "property", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" }, -"proxyPort": { "index": 19, "kind": "property", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" }, -"proxyProtocol": { "index": 20, "kind": "property", "displayName": "Proxy Protocol", "group": "proxy", "label": "proxy", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass":
(camel) branch CAMEL-20909 deleted (was d2a673ef464)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20909 in repository https://gitbox.apache.org/repos/asf/camel.git was d2a673ef464 CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers (#14628)
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 f765808912e CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers (#14628) f765808912e is described below commit f765808912e6bcd1b7c4559f151c2d9e6dfa7808 Author: Andrea Cosentino AuthorDate: Mon Jun 24 19:37:04 2024 +0200 CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers (#14628) Signed-off-by: Andrea Cosentino --- .../camel/catalog/components/aws2-kinesis.json | 78 components/camel-aws/camel-aws2-kinesis/pom.xml| 5 + .../aws2/kinesis/Kinesis2ComponentConfigurer.java | 6 + .../aws2/kinesis/Kinesis2EndpointConfigurer.java | 6 + .../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +- .../camel/component/aws2/kinesis/aws2-kinesis.json | 78 .../aws2/kinesis/KclKinesis2Consumer.java | 221 + .../aws2/kinesis/Kinesis2Configuration.java| 11 + .../component/aws2/kinesis/Kinesis2Endpoint.java | 22 +- .../kinesis/integration/KclKinesisConsumerIT.java | 75 +++ .../dsl/Aws2KinesisComponentBuilderFactory.java| 18 ++ .../dsl/Kinesis2EndpointBuilderFactory.java| 90 + .../camel/kotlin/components/Aws2KinesisUriDsl.kt | 14 ++ parent/pom.xml | 1 + 14 files changed, 546 insertions(+), 82 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json index 2c45648f61e..355c628c0c6 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json @@ -39,19 +39,20 @@ "amazonKinesisClient": { "index": 13, "kind": "property", "displayName": "Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis clien [...] "asyncClient": { "index": 14, "kind": "property", "displayName": "Async Client", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "If we want to a KinesisAsyncClient instance set it to true" }, "autowiredEnabled": { "index": 15, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching [...] -"healthCheckConsumerEnabled": { "index": 16, "kind": "property", "displayName": "Health Check Consumer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all consumer based health checks from this component" }, -"healthCheckProducerEnabled": { "index": 17, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on produce [...] -"proxyHost": { "index": 18, "kind": "property", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" }, -"proxyPort": { "index": 19, "kind": "property", "displayName": "Proxy Port", "group": "proxy",
(camel-kafka-connector) branch dependabot/github_actions/peter-evans/create-pull-request-6.1.0 created (now 23cc47ea35)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/peter-evans/create-pull-request-6.1.0 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at 23cc47ea35 Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 No new revisions were added by this update.
(camel) 01/01: CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-20909 in repository https://gitbox.apache.org/repos/asf/camel.git commit d2a673ef4648d3ed489d9f20a45118742562b08e Author: Andrea Cosentino AuthorDate: Mon Jun 24 18:10:53 2024 +0200 CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers Signed-off-by: Andrea Cosentino --- .../camel/catalog/components/aws2-kinesis.json | 78 components/camel-aws/camel-aws2-kinesis/pom.xml| 5 + .../aws2/kinesis/Kinesis2ComponentConfigurer.java | 6 + .../aws2/kinesis/Kinesis2EndpointConfigurer.java | 6 + .../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +- .../camel/component/aws2/kinesis/aws2-kinesis.json | 78 .../aws2/kinesis/KclKinesis2Consumer.java | 221 + .../aws2/kinesis/Kinesis2Configuration.java| 11 + .../component/aws2/kinesis/Kinesis2Endpoint.java | 22 +- .../kinesis/integration/KclKinesisConsumerIT.java | 75 +++ .../dsl/Aws2KinesisComponentBuilderFactory.java| 18 ++ .../dsl/Kinesis2EndpointBuilderFactory.java| 90 + .../camel/kotlin/components/Aws2KinesisUriDsl.kt | 14 ++ parent/pom.xml | 1 + 14 files changed, 546 insertions(+), 82 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json index 2c45648f61e..355c628c0c6 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json @@ -39,19 +39,20 @@ "amazonKinesisClient": { "index": 13, "kind": "property", "displayName": "Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis clien [...] "asyncClient": { "index": 14, "kind": "property", "displayName": "Async Client", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "If we want to a KinesisAsyncClient instance set it to true" }, "autowiredEnabled": { "index": 15, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching [...] -"healthCheckConsumerEnabled": { "index": 16, "kind": "property", "displayName": "Health Check Consumer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all consumer based health checks from this component" }, -"healthCheckProducerEnabled": { "index": 17, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on produce [...] -"proxyHost": { "index": 18, "kind": "property", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" }, -"proxyPort": { "index": 19, "kind": "property", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass":
(camel) branch CAMEL-20909 created (now d2a673ef464)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20909 in repository https://gitbox.apache.org/repos/asf/camel.git at d2a673ef464 CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers This branch includes the following new commits: new d2a673ef464 CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-quarkus) branch main updated: Clean release procedure
This is an automated email from the ASF dual-hosted git repository. aldettinger 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 d4b38e9bd2 Clean release procedure d4b38e9bd2 is described below commit d4b38e9bd2166aa53fcbf04368421d984785a90e Author: aldettinger AuthorDate: Mon Jun 24 16:41:43 2024 +0200 Clean release procedure --- .../pages/contributor-guide/release-guide.adoc | 78 +- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc index 2d79021340..8d93d48b6c 100644 --- a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc @@ -74,6 +74,17 @@ $ mvn deploy -Papache-release -DskipTests -Denforcer.skip -Dquarkus.build.skip - Camel Quarkus provides some release scripts to push the required bits in development subversion repository. +In a first step, make sure your public key is present in the `KEYS` file. Add it, if it is not there yet using `gpg` command: + +[source,shell] + +$ export EMAIL= # the e-mail address in your key +$ gpg -k $EMAIL >> KEYS +$ gpg --armor --export $EMAIL >> KEYS + + +Then execute the `upload-source.sh` script, like below: + [source,shell] $ cd release-utils/scripts/ @@ -190,79 +201,54 @@ For instance, one could search mail with subject: == Update the Apache Camel Quarkus distribution subversion repository -Once the staging repository has been released, the Apache Camel Quarkus distribution subversion repository should be updated as sketched below. +Once the staging repository has been released, the Apache Camel Quarkus distribution subversion repository should be updated. + +In a first step, one would simply need to promote the deliverables from the development to the distribution svn repository by invoking the `promote-release.sh`. -If you are doing this for the first time you need to checkout the Apache Camel Quarkus distribution subversion repository: [source,shell] -$ svn checkout 'https://dist.apache.org/repos/dist/release/camel' camel-releases-dist +$ export VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's|-SNAPSHOT||') # the version you are releasing, e.g. 0.1.0 +$ cd release-utils/scripts/ +$ ./promote-release.sh $VERSION $VERSION -In case you have performed the above step during some release in the past, you need to update your working copy: +In a second step, it is needed to check that useless versions are deleted from the svn repository. +If you are doing this for the first time you need to checkout the Apache Camel Quarkus distribution subversion repository: [source,shell] -$ cd camel-releases-dist -$ svn update . +$ svn checkout 'https://dist.apache.org/repos/dist/release/camel' camel-releases-dist -Make sure your public key is present in the `KEYS` file. Add it, if it is not there yet using `gpg` command: +In case you have performed the above step during some release in the past, you need to update your working copy: [source,shell] -$ export EMAIL= # the e-mail address in your key -$ gpg -k $EMAIL >> KEYS -$ gpg --armor --export $EMAIL >> KEYS +$ cd camel-releases-dist +$ svn update . +$ cd "camel-quarkus/$VERSION" -Assemble the Apache Camel Quarkus sources distribution and SBOM artifacts: -[source,shell] - -$ mkdir -p "camel-quarkus/$VERSION" -$ cd "camel-quarkus/$VERSION" -$ export URL='https://repository.apache.org/content/repositories/releases/org/apache/camel/quarkus/camel-quarkus' -$ wget -O "apache-camel-quarkus-$VERSION-src.zip" "$URL/$VERSION/camel-quarkus-$VERSION-src.zip" -$ wget -O "apache-camel-quarkus-$VERSION-src.zip.asc" "$URL/$VERSION/camel-quarkus-$VERSION-src.zip.asc" -$ wget -O "apache-camel-quarkus-$VERSION-sbom.json" "$URL/$VERSION/camel-quarkus-$VERSION-cyclonedx.json" -$ wget -O "apache-camel-quarkus-$VERSION-sbom.json.asc" "$URL/$VERSION/camel-quarkus-$VERSION-cyclonedx.json.asc" -$ wget -O "apache-camel-quarkus-$VERSION-sbom.xml" "$URL/$VERSION/camel-quarkus-$VERSION-cyclonedx.xml" -$ wget -O "apache-camel-quarkus-$VERSION-sbom.xml.asc" "$URL/$VERSION/camel-quarkus-$VERSION-cyclonedx.xml.asc" -$ sha512sum "apache-camel-quarkus-$VERSION-src.zip" > "apache-camel-quarkus-$VERSION-src.zip.sha512" -$ sha512sum "apache-camel-quarkus-$VERSION-sbom.json" > "apache-camel-quarkus-$VERSION-sbom.json.sha512" -$ sha512sum "apache-camel-quarkus-$VERSION-sbom.xml" > "apache-camel-quarkus-$VERSION-sbom.xml.sha512" - -Ensure that only the latest release from each maintained branches is present (including active LTS versions). -Typically, when releasing e.g. 1.4.0, you may need to delete e.g. 1.3.0: +Then, ensure that only the latest release from
Error while running github feature from refs/heads/asf-site:.asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!: 422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to allow at least one merge strategy. (no_merge_method)", "resource": "Repository", "field": "merge_commit_allowed", "code": "invalid"}], "documentation_url": "https://docs.github.com/rest/repos/repos#update-a-repository;, "status": "422"}
(camel-website-pub) branch asf-site updated (b0f063c8ea -> b2490df951)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard b0f063c8ea Website updated to 59029127923c277da49d0d92794038290fce97eb discard 191338518b Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 49e2e29607 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new b2490df951 Website updated to 18ca5d414c1265a854c444856a375551123736a8 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 (b0f063c8ea) \ N -- N -- N refs/heads/asf-site (b2490df951) 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 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: .htaccess | 74 +- .well-known/security.txt|2 +- components/next/arangodb-component.html |4 +- site-manifest.json |2 +- sitemap-camel-core.xml | 16 +- sitemap-camel-k.xml | 906 ++--- sitemap-camel-kafka-connector.xml | 832 ++--- sitemap-camel-kamelets.xml | 1408 sitemap-camel-karaf.xml | 24 +- sitemap-camel-quarkus.xml | 2028 +-- sitemap-camel-spring-boot.xml | 56 +- sitemap-components.xml | 5784 +++ sitemap-manual.xml | 428 +-- 13 files changed, 5782 insertions(+), 5782 deletions(-)
[PR] Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 [camel-spring-boot]
dependabot[bot] opened a new pull request, #1167: URL: https://github.com/apache/camel-spring-boot/pull/1167 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.5 to 6.1.0. Release notes Sourced from https://github.com/peter-evans/create-pull-request/releases;>peter-evans/create-pull-request's releases. Create Pull Request v6.1.0 ✨ Adds pull-request-branch as an action output. What's Changed build(deps): bump undici from 6.14.1 to 6.15.0 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2873;>peter-evans/create-pull-request#2873 Update distribution by https://github.com/actions-bot;>@​actions-bot in https://redirect.github.com/peter-evans/create-pull-request/pull/2878;>peter-evans/create-pull-request#2878 build(deps-dev): bump @​types/node from 18.19.31 to 18.19.32 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2884;>peter-evans/create-pull-request#2884 build(deps-dev): bump @​types/node from 18.19.32 to 18.19.33 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2890;>peter-evans/create-pull-request#2890 build(deps-dev): bump ts-jest from 29.1.2 to 29.1.3 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2892;>peter-evans/create-pull-request#2892 build(deps): bump undici from 6.15.0 to 6.18.0 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2891;>peter-evans/create-pull-request#2891 Update distribution by https://github.com/actions-bot;>@​actions-bot in https://redirect.github.com/peter-evans/create-pull-request/pull/2907;>peter-evans/create-pull-request#2907 build(deps): bump undici from 6.18.0 to 6.18.1 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2913;>peter-evans/create-pull-request#2913 build(deps-dev): bump ts-jest from 29.1.3 to 29.1.4 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2914;>peter-evans/create-pull-request#2914 Update distribution by https://github.com/actions-bot;>@​actions-bot in https://redirect.github.com/peter-evans/create-pull-request/pull/2921;>peter-evans/create-pull-request#2921 build(deps): bump undici from 6.18.1 to 6.18.2 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2934;>peter-evans/create-pull-request#2934 build(deps-dev): bump prettier from 3.2.5 to 3.3.0 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2936;>peter-evans/create-pull-request#2936 build(deps-dev): bump @​types/node from 18.19.33 to 18.19.34 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2935;>peter-evans/create-pull-request#2935 Update distribution by https://github.com/actions-bot;>@​actions-bot in https://redirect.github.com/peter-evans/create-pull-request/pull/2947;>peter-evans/create-pull-request#2947 build(deps-dev): bump prettier from 3.3.0 to 3.3.2 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2959;>peter-evans/create-pull-request#2959 build(deps-dev): bump braces from 3.0.2 to 3.0.3 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2962;>peter-evans/create-pull-request#2962 build(deps-dev): bump ws from 8.11.0 to 8.17.1 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2970;>peter-evans/create-pull-request#2970 build(deps-dev): bump ts-jest from 29.1.4 to 29.1.5 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2975;>peter-evans/create-pull-request#2975 build(deps-dev): bump @​types/node from 18.19.34 to 18.19.36 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2976;>peter-evans/create-pull-request#2976 build(deps): bump undici from 6.18.2 to 6.19.2 by https://github.com/dependabot;>@​dependabot in https://redirect.github.com/peter-evans/create-pull-request/pull/2977;>peter-evans/create-pull-request#2977 Update distribution by https://github.com/actions-bot;>@​actions-bot in https://redirect.github.com/peter-evans/create-pull-request/pull/2990;>peter-evans/create-pull-request#2990 feat: add branch name output by https://github.com/peter-evans;>@​peter-evans in
(camel-spring-boot) branch dependabot/github_actions/peter-evans/create-pull-request-6.1.0 created (now 749a5f3660c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/peter-evans/create-pull-request-6.1.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 749a5f3660c Bump peter-evans/create-pull-request from 6.0.5 to 6.1.0 No new revisions were added by this update.
(camel-website) branch regen_bot updated (59029127 -> 18ca5d41)
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-website.git from 59029127 Add `--cwd` parameter for the website preview add 18ca5d41 chore: Update minimal version for Node to 18 and recommend 20 in documentation No new revisions were added by this update. Summary of changes: README.md | 24 1 file changed, 12 insertions(+), 12 deletions(-)
Re: [PR] chore: Update minimal version for Node to 18 and recommend 20 in [camel-website]
zregvart merged PR #1197: URL: https://github.com/apache/camel-website/pull/1197 -- 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-website) branch main updated: chore: Update minimal version for Node to 18 and recommend 20 in documentation
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 18ca5d41 chore: Update minimal version for Node to 18 and recommend 20 in documentation 18ca5d41 is described below commit 18ca5d414c1265a854c444856a375551123736a8 Author: Aurélien Pupier AuthorDate: Mon Jun 17 08:44:35 2024 +0200 chore: Update minimal version for Node to 18 and recommend 20 in documentation Signed-off-by: Aurélien Pupier --- README.md | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2d58e5f4..45ab81d7 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ resources that are to be published. Tools used to generate the website: - [Git](https://git-scm.com/) a source code management tool used to fetch document sources from different github repositories. - - [Node.js](https://nodejs.org/) a JavaScript runtime used to build the website. You will need to use Node.js version 10. + - [Node.js](https://nodejs.org/) a JavaScript runtime used to build the website. You will need to use Node.js version 18+. - [yarn](https://yarnpkg.com/) a blazing fast dependency and package manager tool used to download and manage required libraries. - (installed via yarn) [Gulp](http://gulpjs.com/) a task automation tool. Used to build the Camel @@ -56,7 +56,7 @@ Make sure that you have Node.js (herein "`Node`") installed. If this command fails with an error, you do not have Node installed. -This project requires the Node LTS version 14 (e.g., v14.15.0). +This project requires the Node LTS version 18+ (e.g., v20.11.1). Please make sure to have a suitable version of Node installed. You have several options to install Node on your machine. @@ -67,35 +67,35 @@ Node on your machine. - Install using [Homebrew](https://brew.sh/) and [Node formulae](https://formulae.brew.sh/formula/node) - Install from official [Node packages](https://nodejs.org/en/download/) -An easy step to step guide to install nvm and install node v14 on your local system is as follows: +An easy step to step guide to install nvm and install node v18 on your local system is as follows: $ touch ~/.bash_profile -$ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.36.0/install.sh | bash +$ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.39.7/install.sh | bash $ source ~/.nvm/nvm.sh -$ nvm install 14 +$ nvm install 20 Note - If you have different Node version other than Node LTS version 14 you can use following command to make -Node LTS version 14 as default Node version. +Node LTS version 20 as default Node version. -$ nvm use 14 +$ nvm use 20 ### Installation of nvm on Windows Note - The following steps need to be ran on cmd as administrator only. -An easy step to step guide to install nvm and install node v14 on your local system is as follows: +An easy step to step guide to install nvm and install node v20 on your local system is as follows: > choco install nvm -> nvm install 14 +> nvm install 20 Note - If you have different Node version other than Node LTS version 14 you can use following command to make -Node LTS version 14 as default Node version. +Node LTS version 20 as default Node version. -> nvm use 14 +> nvm use 20 -Now that you have Node 14 installed, you can proceed with checking the Yarn installation. +Now that you have Node 20 installed, you can proceed with checking the Yarn installation. Yarn
(camel-quarkus) branch main updated (a6d3198fa9 -> 4bc44cb448)
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from a6d3198fa9 Regen SBOM from commit a3338cf3a6c17849c980c1ebbc23dba506d25e83 (#6219) add 4bc44cb448 Update changelog for 3.12.0 release No new revisions were added by this update. Summary of changes: CHANGELOG.md | 58 +- 1 file changed, 57 insertions(+), 1 deletion(-)
Re: [PR] Update changelog for 3.12.0 release [camel-quarkus]
aldettinger merged PR #6220: URL: https://github.com/apache/camel-quarkus/pull/6220 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Update changelog for 3.12.0 release [camel-quarkus]
aldettinger opened a new pull request, #6220: URL: https://github.com/apache/camel-quarkus/pull/6220 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Evaluate how we can fully support fa(s)t-jar execution [camel-k]
Exether commented on issue #5539: URL: https://github.com/apache/camel-k/issues/5539#issuecomment-2186522246 This looks like an interesting move to me also. Currently when we update the kamelets we have issues with inconsistency between the kamelets' definitions and the dependencies already contained in the images (Explained in this [forum's post](https://camel.zulipchat.com/#narrow/stream/257299-camel-k/topic/Using.20Camel.20K.20operator.20to.20build.20an.20image/near/440820516)). Having all routes and dependencies inside the image would definitely avoid this 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
Error while running github feature from refs/heads/asf-site:.asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!: 422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to allow at least one merge strategy. (no_merge_method)", "resource": "Repository", "field": "merge_commit_allowed", "code": "invalid"}], "documentation_url": "https://docs.github.com/rest/repos/repos#update-a-repository;, "status": "422"}
(camel-website-pub) branch asf-site updated (8a5146a882 -> b0f063c8ea)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard 8a5146a882 Website updated to 4d8867d97083c7bf6fd64aa4c0f48ba837afe0bd discard 18207b693b Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 191338518b Website updated to 325e929157412b27394080f4d4dba3d821476ddf new b0f063c8ea Website updated to 59029127923c277da49d0d92794038290fce97eb 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 (8a5146a882) \ N -- N -- N refs/heads/asf-site (b0f063c8ea) 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 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: .htaccess | 72 +- .well-known/security.txt |2 +- camel-k/next/apis/camel-k.html|2 +- camel-k/next/traits/cron.html |2 +- manual/camel-jbang.html |4 +- site-manifest.json|2 +- sitemap-camel-core.xml| 16 +- sitemap-camel-k.xml | 906 +++--- sitemap-camel-kafka-connector.xml | 832 +++--- sitemap-camel-kamelets.xml| 1408 - sitemap-camel-karaf.xml | 24 +- sitemap-camel-quarkus.xml | 2028 ++--- sitemap-camel-spring-boot.xml | 56 +- sitemap-components.xml| 5784 ++--- sitemap-manual.xml| 428 +-- 15 files changed, 5784 insertions(+), 5782 deletions(-)
(camel) branch main updated: Upgrade to SB 3.3.1
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 367757d6496 Upgrade to SB 3.3.1 367757d6496 is described below commit 367757d6496bc62ac7b46cfa1ef73e54b3f9aee2 Author: Claus Ibsen AuthorDate: Mon Jun 24 14:26:35 2024 +0200 Upgrade to SB 3.3.1 --- .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++-- .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index ebbd379518a..b67bf403bb8 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -148,8 +148,8 @@ abstract class ExportBaseCommand extends CamelCommand { protected String localKameletDir; @CommandLine.Option(names = { "--spring-boot-version" }, description = "Spring Boot version", -defaultValue = "3.3.0") -protected String springBootVersion = "3.3.0"; +defaultValue = "3.3.1") +protected String springBootVersion = "3.3.1"; @CommandLine.Option(names = { "--camel-spring-boot-version" }, description = "Camel version to use with Spring Boot") protected String camelSpringBootVersion; 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 a96c9ef9790..626d1c80902 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 @@ -145,8 +145,8 @@ public class Run extends CamelCommand { String quarkusVersion = "3.11.3"; @Option(names = { "--spring-boot-version" }, description = "Spring Boot version", -defaultValue = "3.3.0") -String springBootVersion = "3.3.0"; +defaultValue = "3.3.1") +String springBootVersion = "3.3.1"; @Option(names = { "--profile" }, scope = CommandLine.ScopeType.INHERIT, defaultValue = "dev", description = "Profile to run (dev, test, or prod).")
(camel) branch main updated: Upgrade to Quarkus 3.11.3
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 d7f818d04ae Upgrade to Quarkus 3.11.3 d7f818d04ae is described below commit d7f818d04ae183e585f8531c08b37a8fcb54f9d3 Author: Claus Ibsen AuthorDate: Mon Jun 24 14:26:04 2024 +0200 Upgrade to Quarkus 3.11.3 --- .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++-- .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++-- .../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +- .../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index f577965982f..ebbd379518a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -163,8 +163,8 @@ abstract class ExportBaseCommand extends CamelCommand { protected String quarkusArtifactId = "quarkus-bom"; @CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version", -defaultValue = "3.11.1") -protected String quarkusVersion = "3.11.1"; +defaultValue = "3.11.3") +protected String quarkusVersion = "3.11.3"; @CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true", description = "Include Maven Wrapper files in exported project") 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 fe3d263510b..a96c9ef9790 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 @@ -141,8 +141,8 @@ public class Run extends CamelCommand { String kameletsVersion; @Option(names = { "--quarkus-version" }, description = "Quarkus Platform version", -defaultValue = "3.11.1") -String quarkusVersion = "3.11.1"; +defaultValue = "3.11.3") +String quarkusVersion = "3.11.3"; @Option(names = { "--spring-boot-version" }, description = "Spring Boot version", defaultValue = "3.3.0") diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java index 494d067536c..5dd473e81a5 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java @@ -49,7 +49,7 @@ public abstract class CatalogBaseCommand extends CamelCommand { String runtime; @CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version", -defaultValue = "3.11.1") +defaultValue = "3.11.3") String quarkusVersion; @CommandLine.Option(names = { "--quarkus-group-id" }, description = "Quarkus Platform Maven groupId", diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java index d94cec3ed04..89d5b599bbc 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java @@ -64,7 +64,7 @@ public class CatalogDoc extends CamelCommand { String runtime; @CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version", -defaultValue = "3.11.1") +defaultValue = "3.11.3") String quarkusVersion; @CommandLine.Option(names = { "--quarkus-group-id" }, description = "Quarkus Platform Maven groupId",
Re: [PR] chore: Update minimal version for Node to 18 and recommend 20 in [camel-website]
apupier closed pull request #1195: chore: Update minimal version for Node to 18 and recommend 20 in URL: https://github.com/apache/camel-website/pull/1195 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore: Update minimal version for Node to 18 and recommend 20 in [camel-website]
apupier commented on PR #1195: URL: https://github.com/apache/camel-website/pull/1195#issuecomment-2186453046 version rebased: https://github.com/apache/camel-website/pull/1197 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Jolokia trait failure [camel-k]
tadayosi commented on issue #5666: URL: https://github.com/apache/camel-k/issues/5666#issuecomment-2186421314 Hmm, not sure. Could it be related to this issue? - https://github.com/quarkusio/quarkus/issues/39022 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore: Update minimal version for Node to 18 and recommend 20 in [camel-website]
github-actions[bot] commented on PR #1197: URL: https://github.com/apache/camel-website/pull/1197#issuecomment-2186416540  Preview is available at https://pr-1197--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
(camel-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new cdc539438e9 Regen cdc539438e9 is described below commit cdc539438e944266ebf125861e55ca4ca4a6d305 Author: Claus Ibsen AuthorDate: Mon Jun 24 14:00:10 2024 +0200 Regen --- .../camel/springboot/catalog/components/arangodb.json | 10 ++ .../camel-arangodb-starter/src/main/docs/arangodb.json | 6 ++ .../springboot/ArangoDbComponentConfiguration.java | 14 ++ .../arangodb/springboot/ArangoDbComponentConverter.java| 2 ++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json index 823cb3f8466..1a12745001a 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/arangodb.json @@ -34,8 +34,9 @@ "vertexCollection": { "index": 8, "kind": "property", "displayName": "Vertex Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollect [...] "arangoDB": { "index": 9, "kind": "property", "displayName": "Arango DB", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.arangodb.ArangoDB", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing ArangDB client." }, "autowiredEnabled": { "index": 10, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching [...] -"password": { "index": 11, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB password. If user and password are default, this field is Optional." }, -"user": { "index": 12, "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB user. If user and password are default, this field is Optional." } +"vertx": { "index": 11, "kind": "property", "displayName": "Vertx", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.vertx.core.Vertx", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing Vertx in the ArangoDB client." }, +"password": { "index": 12, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB password. If user and password are default, this field is Optional." }, +"user": { "index": 13, "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB user. If user and password are default, this field is Optional." } }, "headers": { "CamelArangoDbMultiUpdate": { "index": 0, "kind": "header", "displayName": "", "group": "producer",
(camel) branch main updated: CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new b84db97df62 CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB b84db97df62 is described below commit b84db97df627b924e635f3212e4117aa18c8ed01 Author: James Netherton AuthorDate: Mon Jun 24 07:47:34 2024 +0100 CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB --- .../apache/camel/catalog/components/arangodb.json | 10 +- .../arangodb/ArangoDbComponentConfigurer.java | 5 +- .../arangodb/ArangoDbEndpointConfigurer.java | 3 + .../arangodb/ArangoDbEndpointUriFactory.java | 3 +- .../apache/camel/component/arangodb/arangodb.json | 10 +- .../component/arangodb/ArangoDbComponent.java | 15 +++ .../camel/component/arangodb/ArangoDbEndpoint.java | 20 +++- .../arangodb/integration/ArangoCustomVertxIT.java | 110 + .../dsl/ArangodbComponentBuilderFactory.java | 16 +++ .../dsl/ArangoDbEndpointBuilderFactory.java| 29 ++ .../camel/kotlin/components/ArangodbUriDsl.kt | 7 ++ 11 files changed, 217 insertions(+), 11 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json index 999eeab6954..2345a553778 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json @@ -34,8 +34,9 @@ "vertexCollection": { "index": 8, "kind": "property", "displayName": "Vertex Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollect [...] "arangoDB": { "index": 9, "kind": "property", "displayName": "Arango DB", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.arangodb.ArangoDB", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing ArangDB client." }, "autowiredEnabled": { "index": 10, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching [...] -"password": { "index": 11, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB password. If user and password are default, this field is Optional." }, -"user": { "index": 12, "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB user. If user and password are default, this field is Optional." } +"vertx": { "index": 11, "kind": "property", "displayName": "Vertx", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.vertx.core.Vertx", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing Vertx in the ArangoDB client." }, +"password": { "index": 12, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB password. If user and password are default, this field is Optional." }, +"user": { "index": 13, "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string",
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
jamesnetherton merged PR #14627: URL: https://github.com/apache/camel/pull/14627 -- 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-examples) branch docker deleted (was e172301)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch docker in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git was e172301 Docker Compose v2 - version is obsolete The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[PR] chore: Update minimal version for Node to 18 and recommend 20 in [camel-website]
zregvart opened a new pull request, #1197: URL: https://github.com/apache/camel-website/pull/1197 documentation Same as #1195 but rebased for the preview Signed-off-by: Aurélien Pupier -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Jolokia trait failure [camel-k]
squakez commented on issue #5666: URL: https://github.com/apache/camel-k/issues/5666#issuecomment-2186324984 The problem is some kind of classpath issue, as it seems we must include the agent in the classpath by specifying it explicitly. Running the application with these parameters is working: ``` - -javaagent:dependencies/lib/main/org.jolokia.jolokia-agent-jvm-2.0.2-javaagent.jar=discoveryEnabled=false,host=*,port=8778 - -cp - ./resources:/etc/camel/application.properties:/etc/camel/resources:/etc/camel/resources.d/_configmaps:/etc/camel/resources.d/_secrets:/etc/camel/sources/camel-k-embedded-flow.yaml:dependencies/lib/main/org.jolokia.jolokia-agent-jvm-2.0.2-javaagent.jar:dependencies/*:dependencies/app/*:dependencies/lib/boot/*:dependencies/lib/main/*:dependencies/quarkus/* - io.quarkus.bootstrap.runner.QuarkusEntryPoint ``` We can certainly workaround that. However, it is still unanswered why this problems happened from one moment to another. I thought it may be some change in the jdk base docker image, but, trying the application with some older image is having the same effect. -- 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-website) branch regen_bot updated (4d8867d9 -> 59029127)
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-website.git from 4d8867d9 Add release notes and blog entry for Camel 3.21.5 add 59029127 Add `--cwd` parameter for the website preview No new revisions were added by this update. Summary of changes: package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] investigation for preview [camel-website]
github-actions[bot] commented on PR #1196: URL: https://github.com/apache/camel-website/pull/1196#issuecomment-2186303285  Preview is available at -- 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-website) branch main updated: Add `--cwd` parameter for the website preview
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 59029127 Add `--cwd` parameter for the website preview 59029127 is described below commit 59029127923c277da49d0d92794038290fce97eb Author: Zoran Regvart AuthorDate: Mon Jun 24 13:05:18 2024 +0200 Add `--cwd` parameter for the website preview Fixes #1170 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05d43913..fcbedee2 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "update:dedupe": "yarn workspaces foreach --all dedupe", "preview": "run-s -l build:antora preview:hugo", "preview:hugo": "hugo server --bind=0.0.0.0 -D", -"preview:netlify": "netlify deploy --dir public", +"preview:netlify": "netlify deploy --dir public --cwd .", "build:antora-local-full": "antora local-antora-playbook-full.yml --stacktrace --clean --fetch", "build:antora-local-partial": "antora local-antora-playbook-partial.yml --stacktrace", "build:antora-local-full2": "antora antora-playbook-local-full.yml --stacktrace --clean --fetch",
Re: [I] Website preview action is broken [camel-website]
zregvart closed issue #1170: Website preview action is broken URL: https://github.com/apache/camel-website/issues/1170 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Jolokia trait failure [camel-k]
squakez commented on issue #5666: URL: https://github.com/apache/camel-k/issues/5666#issuecomment-2186283276 The error we're getting is the following one: ``` jolokia integration I> No access restrictor found, access to any MBean is allowed jolokia integration Could not start Jolokia agent: java.lang.IllegalStateException: Cannot load service org.jolokia.service.serializer.JolokiaSerializer,10 defined in jar:file:/deployments/dependencies/lib/main/org.jolokia.jolokia-agent-jvm-2.0.2-javaagent.jar!/META-INF/jolokia/services-default : java.lang.IllegalArgumentException: Can not instantiate org.jolokia.service.serializer.JolokiaSerializer: java.lang.reflect.InvocationTargetException. Aborting ``` The strange thing is that this started out of the blue, without apparently any change on our side. @tadayosi do you have any clue what could be the root cause by any chance? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] investigation for preview [camel-website]
github-actions[bot] commented on PR #1196: URL: https://github.com/apache/camel-website/pull/1196#issuecomment-2186266409  Preview is available at -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
github-actions[bot] commented on PR #14627: URL: https://github.com/apache/camel/pull/14627#issuecomment-2186237177 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
jamesnetherton commented on code in PR #14627: URL: https://github.com/apache/camel/pull/14627#discussion_r1650789286 ## components/camel-arangodb/src/main/java/org/apache/camel/component/arangodb/ArangoDbComponent.java: ## @@ -31,6 +32,8 @@ public class ArangoDbComponent extends DefaultComponent { @Metadata(label = "advanced", autowired = true) private ArangoDB arangoDB; +@Metadata(label = "advanced") Review Comment: Thanks - Latest commit adds this. I verified it on the CQ side too. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
jamesnetherton commented on PR #14627: URL: https://github.com/apache/camel/pull/14627#issuecomment-2186236327 /component-test arangodb -- 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 quarkus-main updated (8550d9327d -> ac017797d8)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 8550d9327d Upgrade Quarkus to 3.13.0.CR1 add 415d6eed26 Use LazySecretKeysHandler for Jasypt Config add 19bd357f9a Bump quarkiverse-jsch.version from 3.0.7 to 3.0.8 (#6200) add a5a869ea1f [Slack] Decrease delay when getting messages (#6197) add ebb852f71b Using WireMock in weather extension integration tests #6047 add 47d4bc24bd Upgrade Quarkus Jgit version to 3.1.2 add 14bc3bec04 Bump com.unboundid:unboundid-ldapsdk from 7.0.0 to 7.0.1 (#6205) add f76231067f Add Pinecone extension add 395320bbc7 Update Maven wrapper distribution URL to Maven 3.9.8 add 9e223f242b Auto label issues relating to flaky tests add 14dcb31271 Upgrade Quarkus to 3.12.0 add 83ed3aa0e5 Upgrade to Quarkus CxF 3.12.0 add 44b5f7adbe Next is 3.13.0-SNAPSHOT add a3338cf3a6 Add default value of modePackage in camel-quarkus-rest-openapi add a6d3198fa9 Regen SBOM from commit a3338cf3a6c17849c980c1ebbc23dba506d25e83 (#6219) new ac017797d8 Upgrade Quarkus to 3.13.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 (8550d9327d) \ N -- N -- N refs/heads/quarkus-main (ac017797d8) 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: .github/auto-label-configuration.yaml | 5 + .mvn/wrapper/maven-wrapper.properties | 2 +- camel-quarkus-sbom/camel-quarkus-sbom.json | 28207 +- camel-quarkus-sbom/camel-quarkus-sbom.xml | 29201 ++- catalog/pom.xml|15 +- docs/antora.yml| 6 +- docs/modules/ROOT/examples/components/pinecone.yml |13 + docs/modules/ROOT/nav.adoc | 1 + .../ROOT/pages/reference/extensions/pinecone.adoc |45 + .../pages/reference/extensions/rest-openapi.adoc | 2 +- docs/pom.xml | 2 +- extensions-core/core-cloud/deployment/pom.xml | 2 +- extensions-core/core-cloud/pom.xml | 2 +- extensions-core/core-cloud/runtime/pom.xml | 2 +- extensions-core/core/deployment/pom.xml| 2 +- extensions-core/core/pom.xml | 2 +- extensions-core/core/runtime/pom.xml | 2 +- extensions-core/http-common/deployment/pom.xml | 2 +- extensions-core/http-common/pom.xml| 2 +- extensions-core/http-common/runtime/pom.xml| 2 +- extensions-core/pom.xml| 2 +- .../reactive-executor/deployment/pom.xml | 2 +- extensions-core/reactive-executor/pom.xml | 2 +- extensions-core/reactive-executor/runtime/pom.xml | 2 +- .../threadpoolfactory-vertx/deployment/pom.xml | 2 +- extensions-core/threadpoolfactory-vertx/pom.xml| 2 +- .../threadpoolfactory-vertx/runtime/pom.xml| 2 +- extensions-core/xml-io-dsl/deployment/pom.xml | 2 +- extensions-core/xml-io-dsl/pom.xml | 2 +- extensions-core/xml-io-dsl/runtime/pom.xml | 2 +- extensions-core/xml-jaxb/deployment/pom.xml| 2 +- extensions-core/xml-jaxb/pom.xml | 2 +- extensions-core/xml-jaxb/runtime/pom.xml | 2 +- extensions-core/xml-jaxp/deployment/pom.xml| 2 +- extensions-core/xml-jaxp/pom.xml | 2 +- extensions-core/xml-jaxp/runtime/pom.xml | 2 +- extensions-core/yaml-dsl/deployment/pom.xml| 2 +- extensions-core/yaml-dsl/pom.xml | 2 +- extensions-core/yaml-dsl/runtime/pom.xml | 2 +- extensions-core/yaml-io/deployment/pom.xml | 2 +- extensions-core/yaml-io/pom.xml| 2 +- extensions-core/yaml-io/runtime/pom.xml| 2 +- extensions-jvm/asn1/deployment/pom.xml | 2 +- extensions-jvm/asn1/pom.xml| 2 +-
(camel-quarkus) 01/01: Upgrade Quarkus to 3.13.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ac017797d82ac68944380dcbdbd8f2af0558caec Author: James Netherton AuthorDate: Mon Jun 24 11:24:38 2024 +0100 Upgrade Quarkus to 3.13.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index ba98deb2fa..bf5513271d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -36,7 +36,7 @@ asciidoc: graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} min-maven-version: 3.8.2 # replace ${min-maven-version} -target-maven-version: 3.9.7 # replace ${target-maven-version} +target-maven-version: 3.9.8 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: next@components diff --git a/pom.xml b/pom.xml index 29fdee2c59..c90966bf13 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.2 2.4.0 2.0.2 -3.12.0 +999-SNAPSHOT 4.0.0 2.6.1 @@ -265,7 +265,7 @@ 3.8.2 -3.9.7 +3.9.8 [${min-maven-version},)
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
davsclaus commented on code in PR #14627: URL: https://github.com/apache/camel/pull/14627#discussion_r1650767008 ## components/camel-arangodb/src/main/java/org/apache/camel/component/arangodb/ArangoDbComponent.java: ## @@ -31,6 +32,8 @@ public class ArangoDbComponent extends DefaultComponent { @Metadata(label = "advanced", autowired = true) private ArangoDB arangoDB; +@Metadata(label = "advanced") Review Comment: I think it should be autowired = true, then its automatic uses the one from Quarkus out of the box -- 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-20906: camel-core - Route reload NPE. Add WARN and avoid NPE.
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 6ddb848a250 CAMEL-20906: camel-core - Route reload NPE. Add WARN and avoid NPE. 6ddb848a250 is described below commit 6ddb848a25013ce99f9c9796f94c17aee0f37f47 Author: Claus Ibsen AuthorDate: Mon Jun 24 11:39:19 2024 +0200 CAMEL-20906: camel-core - Route reload NPE. Add WARN and avoid NPE. --- .../org/apache/camel/support/RouteWatcherReloadStrategy.java | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java index 4cfede4ca83..0c79ca76529 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java @@ -301,6 +301,11 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg Route route = getCamelContext().getRoute(id); if (route != null) { ServiceStatus status = getCamelContext().getRouteController().getRouteStatus(id); +if (status == null) { +// undefined status of route (should not really happen) +LOG.warn("Cannot get route status for route: {}. This route is skipped.", id); +continue; +} if (ServiceStatus.Started.equals(status)) { started++; } @@ -329,7 +334,9 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg int total = ids.size(); for (String id : ids) { Route route = getCamelContext().getRoute(id); -EventHelper.notifyRouteReloaded(getCamelContext(), route, index++, total); +if (route != null) { +EventHelper.notifyRouteReloaded(getCamelContext(), route, index++, total); +} } if (!removeAllRoutes) { @@ -338,7 +345,7 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg StringJoiner sj = new StringJoiner("\n"); for (String id : ids) { Route route = getCamelContext().getRoute(id); -if (!route.isCustomId()) { +if (route != null && !route.isCustomId()) { sj.add(route.getEndpoint().getEndpointUri()); } }
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
github-actions[bot] commented on PR #14627: URL: https://github.com/apache/camel/pull/14627#issuecomment-2186200447 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
jamesnetherton commented on PR #14627: URL: https://github.com/apache/camel/pull/14627#issuecomment-2186199673 /component-test arangodb -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
github-actions[bot] commented on PR #14627: URL: https://github.com/apache/camel/pull/14627#issuecomment-2186195063 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB [camel]
jamesnetherton opened a new pull request, #14627: URL: https://github.com/apache/camel/pull/14627 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20794: AWS2 Kinesis producer supports sending batch [camel]
fanyang commented on PR #14618: URL: https://github.com/apache/camel/pull/14618#issuecomment-2186040278 Sure, will do. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Review CI setup and test executions scrips/make targets [camel-k]
squakez closed issue #5463: Review CI setup and test executions scrips/make targets URL: https://github.com/apache/camel-k/issues/5463 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: (#5463) Add make targets: setup-knative, setup-yaks
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 46f62b4fc (#5463) Add make targets: setup-knative, setup-yaks 46f62b4fc is described below commit 46f62b4fce9d2e25c8a0802a4720c77d5aab58d7 Author: Thomas Diesler AuthorDate: Thu Jun 20 13:17:27 2024 +0200 (#5463) Add make targets: setup-knative, setup-yaks --- e2e/knative/files/setup.sh | 2 +- script/Makefile| 12 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/e2e/knative/files/setup.sh b/e2e/knative/files/setup.sh index 34482f6e5..5ad85a5df 100755 --- a/e2e/knative/files/setup.sh +++ b/e2e/knative/files/setup.sh @@ -77,7 +77,7 @@ EVENTING_CORE="https://github.com/knative/eventing/releases/download/${EVENTING_ IN_MEMORY_CHANNEL="https://github.com/knative/eventing/releases/download/${EVENTING_VERSION}/in-memory-channel.yaml; CHANNEL_BROKER="https://github.com/knative/eventing/releases/download/${EVENTING_VERSION}/mt-channel-broker.yaml; -KNATIVE_TEMP=$(mktemp -d knative-) +KNATIVE_TEMP=$(mkdir -p ./build/_output && mktemp -d ./build/_output/knative-) # Serving CRDs # diff --git a/script/Makefile b/script/Makefile index e144d6afb..11b317fc9 100644 --- a/script/Makefile +++ b/script/Makefile @@ -266,6 +266,18 @@ else @echo "### Skipping unit test..." endif +# +# Setup the Knative test environment +# +setup-knative: + ./e2e/knative/files/setup.sh + +# +# Setup the Yaks test environment +# +setup-yaks: + ./e2e/yaks/files/setup.sh + # # Common tests that do not require any customized operator setting. They can leverage a unique namespaced operator installation to reduce # the time to complete (they are used also as smoke test for nightly release)
Re: [PR] (#5463) Add make targets: setup-knative, setup-yaks [camel-k]
squakez merged PR #5661: URL: https://github.com/apache/camel-k/pull/5661 -- 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-20794: AWS2 Kinesis producer supports sending batch (#14618)
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 b52830b560f CAMEL-20794: AWS2 Kinesis producer supports sending batch (#14618) b52830b560f is described below commit b52830b560fa64e7c9188f4105837f87d6aaa3f4 Author: Fan Yang AuthorDate: Mon Jun 24 17:17:56 2024 +0800 CAMEL-20794: AWS2 Kinesis producer supports sending batch (#14618) * Kinesis producer supports sending batch * Format code * Set max batch size 500 --- .../component/aws2/kinesis/Kinesis2Producer.java | 96 +++--- .../kinesis/integration/KinesisProducerIT.java | 13 ++- 2 files changed, 97 insertions(+), 12 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java index ce8903aa4ac..c51fe777379 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java @@ -16,6 +16,11 @@ */ package org.apache.camel.component.aws2.kinesis; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.support.DefaultProducer; @@ -23,9 +28,15 @@ import org.apache.camel.util.ObjectHelper; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.services.kinesis.model.PutRecordRequest; import software.amazon.awssdk.services.kinesis.model.PutRecordResponse; +import software.amazon.awssdk.services.kinesis.model.PutRecordsRequest; +import software.amazon.awssdk.services.kinesis.model.PutRecordsRequestEntry; +import software.amazon.awssdk.services.kinesis.model.PutRecordsResponse; public class Kinesis2Producer extends DefaultProducer { +// Maximum number of records that can be sent in a single PutRecords request +private static final int MAX_BATCH_SIZE = 500; + private KinesisConnection connection; public Kinesis2Producer(Kinesis2Endpoint endpoint) { @@ -45,11 +56,80 @@ public class Kinesis2Producer extends DefaultProducer { return (Kinesis2Endpoint) super.getEndpoint(); } +@Override +protected void doStart() throws Exception { +super.doStart(); + +ObjectHelper.notNull(connection, "connection", this); +} + @Override public void process(Exchange exchange) throws Exception { +Object body = exchange.getIn().getBody(); +if (body instanceof Iterable) { +sendBatchRecords(exchange); +} else { +sendSingleRecord(exchange); +} +} + +private void sendBatchRecords(Exchange exchange) { +Object partitionKey = exchange.getIn().getHeader(Kinesis2Constants.PARTITION_KEY); +ensurePartitionKeyNotNull(partitionKey); +List> requestBatchList = createRequestBatchList(exchange, partitionKey); +for (List requestBatch : requestBatchList) { +PutRecordsRequest putRecordsRequest = PutRecordsRequest.builder() + .streamName(getEndpoint().getConfiguration().getStreamName()) +.records(requestBatch) +.build(); +PutRecordsResponse putRecordsResponse = connection.getClient(getEndpoint()).putRecords(putRecordsRequest); +if (putRecordsResponse.failedRecordCount() > 0) { +throw new RuntimeException( +"Failed to send records " + putRecordsResponse.failedRecordCount() + " of " + + putRecordsResponse.records().size()); +} +} +} + +private List> createRequestBatchList(Exchange exchange, Object partitionKey) { +List> requestBatchList = new ArrayList<>(); +List requestBatch = new ArrayList<>(MAX_BATCH_SIZE); +for (Object record : exchange.getIn().getBody(Iterable.class)) { +SdkBytes sdkBytes; +if (record instanceof byte[] bytes) { +sdkBytes = SdkBytes.fromByteArray(bytes); +} else if (record instanceof ByteBuffer bf) { +sdkBytes = SdkBytes.fromByteBuffer(bf); +} else if (record instanceof InputStream is) { +sdkBytes = SdkBytes.fromInputStream(is); +} else if (record instanceof String str) { +sdkBytes = SdkBytes.fromUtf8String(str); +} else { +throw new IllegalArgumentException( +"Record type not supported. Must be byte[],
Re: [PR] CAMEL-20794: AWS2 Kinesis producer supports sending batch [camel]
davsclaus commented on PR #14618: URL: https://github.com/apache/camel/pull/14618#issuecomment-2186015741 It would be good to update the docs as well, do you mind creating another PR to update src/main/docs (see this folder) and add some information about sending a batch if the payload is iterarable such as a List -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20794: AWS2 Kinesis producer supports sending batch [camel]
davsclaus merged PR #14618: URL: https://github.com/apache/camel/pull/14618 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [camel-main] couchdb: native mode has to be fixed for a different implentation [camel-quarkus]
jamesnetherton commented on issue #6198: URL: https://github.com/apache/camel-quarkus/issues/6198#issuecomment-2185952486 Should be fixed in https://github.com/apache/camel-quarkus/commit/0a46a57a2f027a5e0bcdcf5f174d561f37e8c710. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [camel-main] couchdb: native mode has to be fixed for a different implentation [camel-quarkus]
jamesnetherton closed issue #6198: [camel-main] couchdb: native mode has to be fixed for a different implentation URL: https://github.com/apache/camel-quarkus/issues/6198 -- 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 camel-main updated: Fix couchdb in native mode
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new 0a46a57a2f Fix couchdb in native mode 0a46a57a2f is described below commit 0a46a57a2f027a5e0bcdcf5f174d561f37e8c710 Author: James Netherton AuthorDate: Mon Jun 24 09:47:36 2024 +0100 Fix couchdb in native mode --- .../couchdb/deployment/CouchdbProcessor.java | 29 ++ .../quarkus/component/couchdb/it/CouchbIT.java | 2 -- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java b/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java index 3a6cbffa2c..431ac39f0d 100644 --- a/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java +++ b/extensions/couchdb/deployment/src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java @@ -16,14 +16,17 @@ */ package org.apache.camel.quarkus.component.couchdb.deployment; -import java.util.ArrayList; -import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; 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.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; class CouchdbProcessor { @@ -35,18 +38,24 @@ class CouchdbProcessor { } @BuildStep -List registerReflectiveClasses() { -List items = new ArrayList(); - items.add(ReflectiveClassBuildItem.builder("org.lightcouch.Response").fields().build()); - items.add(ReflectiveClassBuildItem.builder("org.lightcouch.CouchDbInfo").fields().build()); - items.add(ReflectiveClassBuildItem.builder("org.lightcouch.ChangesResult$Row").fields().build()); - items.add(ReflectiveClassBuildItem.builder("org.lightcouch.ChangesResult$Row$Rev").fields().build()); -return items; +void registerReflectiveClasses( +CombinedIndexBuildItem combinedIndex, +BuildProducer reflectiveClass) { +Set modelClasses = combinedIndex.getIndex() + .getClassesInPackage(DotName.createSimple("com.ibm.cloud.cloudant.v1.model")) +.stream() +.map(ClassInfo::name) +.map(DotName::toString) +.collect(Collectors.toUnmodifiableSet()); + + reflectiveClass.produce(ReflectiveClassBuildItem.builder(modelClasses.toArray(new String[0])) +.fields(true) +.build()); } @BuildStep void addDependenciesToIndexer(BuildProducer indexDependencyProducer) { -indexDependencyProducer.produce(new IndexDependencyBuildItem("com.google.code.gson", "gson")); +indexDependencyProducer.produce(new IndexDependencyBuildItem("com.ibm.cloud", "cloudant")); } } diff --git a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java index 187f8cb0fe..5c7623a316 100644 --- a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java +++ b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java @@ -17,9 +17,7 @@ package org.apache.camel.quarkus.component.couchdb.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; -@Disabled("https://github.com/apache/camel-quarkus/issues/6198;) @QuarkusIntegrationTest class CouchbIT extends CouchdbTest {
svn commit: r69942 - /release/camel/camel-quarkus/3.11.0/
Author: aldettinger Date: Mon Jun 24 07:54:26 2024 New Revision: 69942 Log: Apache Camel Quarkus released artifacts Removed: release/camel/camel-quarkus/3.11.0/
Re: [I] [camel-main] ical Dataformat fails in native [camel-quarkus]
jamesnetherton closed issue #6218: [camel-main] ical Dataformat fails in native URL: https://github.com/apache/camel-quarkus/issues/6218 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [camel-main] ical Dataformat fails in native [camel-quarkus]
jamesnetherton commented on issue #6218: URL: https://github.com/apache/camel-quarkus/issues/6218#issuecomment-2185836359 Should be fixed in https://github.com/apache/camel-quarkus/commit/83a01bb6b94970b945689107859f597634fd28a9. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
svn commit: r69938 - /dev/camel/camel-quarkus/3.12.0/ /release/camel/camel-quarkus/3.12.0/
Author: aldettinger Date: Mon Jun 24 07:47:44 2024 New Revision: 69938 Log: Promote release from dev to release Added: release/camel/camel-quarkus/3.12.0/ - copied from r69937, dev/camel/camel-quarkus/3.12.0/ Removed: dev/camel/camel-quarkus/3.12.0/
(camel-quarkus) branch camel-main updated: Fix ical dataformat in native mode
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new 83a01bb6b9 Fix ical dataformat in native mode 83a01bb6b9 is described below commit 83a01bb6b94970b945689107859f597634fd28a9 Author: James Netherton AuthorDate: Mon Jun 24 08:42:50 2024 +0100 Fix ical dataformat in native mode --- .../camel/quarkus/component/ical/deployment/IcalProcessor.java | 5 - integration-tests/dataformat/pom.xml | 3 +-- .../apache/camel/quarkus/component/dataformat/it/DataformatIT.java | 2 -- .../apache/camel/quarkus/component/dataformat/it/DataformatTest.java | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index 5ae52c557c..f928511cec 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -26,6 +26,7 @@ import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryB import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; import net.fortuna.ical4j.model.TimeZoneLoader; +import net.fortuna.ical4j.model.TimeZoneRegistryImpl; import net.fortuna.ical4j.util.MapTimeZoneCache; class IcalProcessor { @@ -64,7 +65,9 @@ class IcalProcessor { @BuildStep void registerForReflection(BuildProducer reflectiveClass) { reflectiveClass - .produce(ReflectiveClassBuildItem.builder(MapTimeZoneCache.class).build()); +.produce(ReflectiveClassBuildItem.builder( +MapTimeZoneCache.class, +TimeZoneRegistryImpl.class).build()); } @BuildStep diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml index 0914a75bb8..bb1c87f5f7 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 441d53bb66..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/6218 @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 c249c5fb9b..f2cf856cba 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 @@ -99,6 +99,9 @@ class DataformatTest { static String toFormatedLocalDateTime(ZonedDateTime zonedDateTime) { String result = zonedDateTime.format(DateTimeFormatter.ofPattern("MMdd'T'hhmmss")); +if (zonedDateTime.getZone().getId().equals("Etc/UTC")) { +result += "Z"; +} return result; }
(camel) branch dependabot/maven/io.github.littleproxy-littleproxy-2.2.3 deleted (was 388dd70cb6b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.github.littleproxy-littleproxy-2.2.3 in repository https://gitbox.apache.org/repos/asf/camel.git was 388dd70cb6b chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 (#14625)
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 b104d8b3af8 chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 (#14625) b104d8b3af8 is described below commit b104d8b3af8d9a2c50b3a7afcf613cefa806ce1f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jun 24 09:38:26 2024 +0200 chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 (#14625) Bumps [io.github.littleproxy:littleproxy](https://github.com/LittleProxy/LittleProxy) from 2.2.1 to 2.2.3. - [Release notes](https://github.com/LittleProxy/LittleProxy/releases) - [Changelog](https://github.com/LittleProxy/LittleProxy/blob/main/RELEASE_NOTES.md) - [Commits](https://github.com/LittleProxy/LittleProxy/compare/v2.2.1...v2.2.3) --- updated-dependencies: - dependency-name: io.github.littleproxy:littleproxy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 26bc13276ee..3bff198399a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -325,7 +325,7 @@ 1.5.6 9.11.0 0.2.0 -2.2.1 +2.2.3 1.5.5.Final 3.9.8
Re: [PR] chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 [camel]
davsclaus merged PR #14625: URL: https://github.com/apache/camel/pull/14625 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 [camel]
davsclaus commented on PR #14625: URL: https://github.com/apache/camel/pull/14625#issuecomment-2185818291 tested locally -- 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) 29/41: Added coap doc change
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 832832271fbad523c54af967ffad155c82ce289e Author: JiriOndrusek AuthorDate: Wed Jun 12 10:58:20 2024 +0200 Added coap doc change --- docs/modules/ROOT/examples/components/coap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/examples/components/coap.yml b/docs/modules/ROOT/examples/components/coap.yml index b7c93da8aa..476683941f 100644 --- a/docs/modules/ROOT/examples/components/coap.yml +++ b/docs/modules/ROOT/examples/components/coap.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: coap cqCamelPartTitle: CoAP -cqCamelPartDescription: Send and receive messages to/from COAP capable devices. +cqCamelPartDescription: Send and receive messages to/from CoAP (Constrained Application Protocol) capable devices. cqExtensionPageTitle: CoAP
(camel-quarkus) 39/41: fix of dataformat for Etc/UTC
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 871fc703d1306f224fdcf5f93bb84aff964be086 Author: JiriOndrusek AuthorDate: Fri Jun 21 13:50:54 2024 +0200 fix of dataformat for Etc/UTC --- .../apache/camel/quarkus/component/dataformat/it/DataformatTest.java | 3 --- 1 file changed, 3 deletions(-) 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 f2cf856cba..c249c5fb9b 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 @@ -99,9 +99,6 @@ class DataformatTest { static String toFormatedLocalDateTime(ZonedDateTime zonedDateTime) { String result = zonedDateTime.format(DateTimeFormatter.ofPattern("MMdd'T'hhmmss")); -if (zonedDateTime.getZone().getId().equals("Etc/UTC")) { -result += "Z"; -} return result; }
(camel-quarkus) 12/41: Fixed forrmatting
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 cb365e4f9af39e2f441cc4ac22675672456794a4 Author: JiriOndrusek AuthorDate: Tue May 28 09:41:09 2024 +0200 Fixed forrmatting --- .../test/junit5/patterns/TestDebugBreakpoint.java| 16 1 file changed, 16 insertions(+) diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java index 6c49499351..35289e1210 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.quarkus.test.junit5.patterns; import org.apache.camel.Exchange;
(camel-quarkus) 38/41: Better fix of dataformat
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 f2136205ab41465451d2ee67ce883bbfe2fb4d6f Author: JiriOndrusek AuthorDate: Fri Jun 21 12:02:55 2024 +0200 Better fix of dataformat --- .../camel/quarkus/component/dataformat/it/ICalUtils.java | 10 ++ .../camel/quarkus/component/dataformat/it/DataformatTest.java | 2 ++ integration-tests/dataformat/src/test/resources/test.ics | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java index 30ead3641b..b5d04fd036 100644 --- a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java +++ b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java @@ -17,12 +17,10 @@ package org.apache.camel.quarkus.component.dataformat.it; import java.net.URI; -import java.time.DateTimeException; import java.time.Instant; import java.time.ZonedDateTime; import net.fortuna.ical4j.model.Calendar; -import net.fortuna.ical4j.model.DateTime; import net.fortuna.ical4j.model.TimeZoneRegistry; import net.fortuna.ical4j.model.TimeZoneRegistryFactory; import net.fortuna.ical4j.model.component.VEvent; @@ -49,8 +47,8 @@ public class ICalUtils { // Create the event VEvent meeting = new VEvent(); meeting.replace(new DtStamp(Instant.ofEpochMilli(0))); -meeting.add(new DtStart(toDateTime(start, registry).toInstant())); -meeting.add(new DtEnd(toDateTime(end, registry).toInstant())); +meeting.add(new DtStart(start)); +meeting.add(new DtEnd(end)); meeting.add(new Summary(summary)); // add timezone info.. @@ -76,8 +74,4 @@ public class ICalUtils { return icsCalendar; } -static DateTime toDateTime(ZonedDateTime zonedDateTime, TimeZoneRegistry registry) { -return new DateTime(zonedDateTime.toInstant().toEpochMilli()); -} - } 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 5556571bfa..f2cf856cba 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 @@ -68,7 +68,9 @@ class DataformatTest { final String icsTemplate = IOUtils.toString(getClass().getResourceAsStream("/test.ics"), StandardCharsets.UTF_8); final String icalString = String.format( icsTemplate, +ZoneId.systemDefault().getId(), toFormatedLocalDateTime(START), +ZoneId.systemDefault().getId(), toFormatedLocalDateTime(END), START.getZone().getId()); diff --git a/integration-tests/dataformat/src/test/resources/test.ics b/integration-tests/dataformat/src/test/resources/test.ics index c730b9af11..8da810106e 100644 --- a/integration-tests/dataformat/src/test/resources/test.ics +++ b/integration-tests/dataformat/src/test/resources/test.ics @@ -4,8 +4,8 @@ PRODID:-//Events Calendar//iCal4j 1.0//EN CALSCALE:GREGORIAN BEGIN:VEVENT DTSTAMP:19700101T00Z -DTSTART:%s -DTEND:%s +DTSTART;TZID=%s:%s +DTEND;TZID=%s:%s SUMMARY:Progress Meeting TZID:%s UID:
(camel-quarkus) 21/41: Rebased + format fix
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 99b44874542a4d5777ec84c14a932f4b6ac55d30 Author: JiriOndrusek AuthorDate: Mon Jun 10 09:25:28 2024 +0200 Rebased + format fix --- .../camel/quarkus/test/CamelQuarkusTestSupport.java | 21 ++--- .../test/CustomCamelContextConfiguration.java | 4 ++-- .../test/CustomTestExecutionConfiguration.java | 2 +- .../TransientCamelContextNotStoppingManager.java| 2 +- .../patterns/DebugNoLazyTypeConverterTest.java | 1 + 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 626391d0ad..94cd0f63b2 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -92,8 +92,8 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport private static final Logger LOG = LoggerFactory.getLogger(CamelQuarkusTestSupport.class); -//@RegisterExtension -//protected CamelTestSupport camelTestSupportExtension = this; +//@RegisterExtension +//protected CamelTestSupport camelTestSupportExtension = this; private final StopWatch watch = new StopWatch(); private String currentTestName; @@ -119,7 +119,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport .withJMX(useJmx()) .withUseRouteBuilder(isUseRouteBuilder()) .withDumpRouteCoverage(isDumpRouteCoverage()) -.withAutoStartContext(false); +.withAutoStartContext(false); contextConfiguration() .withCustomCamelContextSupplier(this::camelContextSupplier) @@ -137,11 +137,11 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport } CustomCamelContextConfiguration contextConfiguration() { -return (CustomCamelContextConfiguration)camelContextConfiguration; +return (CustomCamelContextConfiguration) camelContextConfiguration; } CustomTestExecutionConfiguration testConfigurationBuilder() { -return (CustomTestExecutionConfiguration)testConfigurationBuilder; +return (CustomTestExecutionConfiguration) testConfigurationBuilder; } // quarkus callbacks --- @@ -211,7 +211,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport */ @Override public CamelContext context() { - return this.context; +return this.context; } @Deprecated(since = "4.7.0") @@ -260,7 +260,8 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport long time = watch.taken(); if (isRouteCoverageEnabled()) { -ExtensionHelper.testEndFooter(getClass(), currentTestName, time, new RouteCoverageDumperExtension((ModelCamelContext) context)); +ExtensionHelper.testEndFooter(getClass(), currentTestName, time, +new RouteCoverageDumperExtension((ModelCamelContext) context)); } else { ExtensionHelper.testEndFooter(getClass(), currentTestName, time); } @@ -290,7 +291,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport // noop } - /** * Factory method which derived classes can use to create a {@link RouteBuilder} to define the routes for testing */ @@ -315,7 +315,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport return new RoutesBuilder[] { createRouteBuilder() }; } - void internalAfterAll(QuarkusTestContext context, ExtensionContext extensionContext) { try { if (!testConfiguration().isCreateCamelContextPerClass()) { @@ -329,8 +328,8 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport } void internalBeforeAll(ExtensionContext context) { -final boolean perClassPresent -= context.getTestInstanceLifecycle().filter(lc -> lc.equals(TestInstance.Lifecycle.PER_CLASS)).isPresent(); +final boolean perClassPresent = context.getTestInstanceLifecycle() +.filter(lc -> lc.equals(TestInstance.Lifecycle.PER_CLASS)).isPresent(); if (perClassPresent) { LOG.trace("Creating a legacy context manager for {}", context.getDisplayName()); testConfigurationBuilder().withCustomCreateCamelContextPerClass(perClassPresent); diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java
(camel-quarkus) 40/41: Disabled native dataformat 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 a2668e885cad9bd796e779ffa642068902c5ac8e Author: JiriOndrusek AuthorDate: Fri Jun 21 16:43:48 2024 +0200 Disabled native dataformat test --- integration-tests/dataformat/pom.xml | 5 +++-- .../apache/camel/quarkus/component/dataformat/it/DataformatIT.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml index 7eed5cf0ef..0914a75bb8 100644 --- a/integration-tests/dataformat/pom.xml +++ b/integration-tests/dataformat/pom.xml @@ -67,7 +67,8 @@ - + 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 8676954dce..441d53bb66 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,7 +17,9 @@ 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/6218 @QuarkusIntegrationTest class DataformatIT extends DataformatTest {
(camel-quarkus) 24/41: Solved conflict + rebased
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 b8e6a87953c43f124b8583dca49dcd6c388091d3 Author: JiriOndrusek AuthorDate: Tue Jun 11 08:54:50 2024 +0200 Solved conflict + rebased --- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8cc7fc..83c553ff46 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6581,12 +6581,12 @@ io.dropwizard.metrics dropwizard-core -4.2.25 +4.2.26 io.dropwizard.metrics metrics-jmx -4.2.25 +4.2.26 io.minio @@ -6688,12 +6688,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 53ab707188..010e9e5e0e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6658,12 +6658,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub 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 946dff4d48..5ca10b95ce 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6658,12 +6658,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub
(camel-quarkus) 32/41: Fixed couchdb issue + generated files
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 098d9d8fa454ef52013384f5e465f46e6fa4fef8 Author: JiriOndrusek AuthorDate: Mon Jun 17 14:41:45 2024 +0200 Fixed couchdb issue + generated files --- .../component/couchdb/it/CouchdbResource.java| 6 +++--- .../component/couchdb/it/CouchdbTestDocument.java| 17 + .../camel/quarkus/component/couchdb/it/CouchbIT.java | 2 +- .../quarkus/component/couchdb/it/CouchdbTest.java| 20 +++- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- .../bom/src/main/generated/flattened-reduced-pom.xml | 2 +- .../main/generated/flattened-reduced-verbose-pom.xml | 2 +- 8 files changed, 32 insertions(+), 21 deletions(-) diff --git a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java index fcb7aa4725..03b2f09756 100644 --- a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java +++ b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java @@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.couchdb.it; import java.util.Collection; import java.util.concurrent.ConcurrentLinkedQueue; +import com.ibm.cloud.sdk.core.service.exception.NotFoundException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -33,7 +34,6 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.couchdb.CouchDbConstants; import org.apache.camel.component.couchdb.CouchDbOperations; import org.jboss.logging.Logger; -import org.lightcouch.NoDocumentException; import static org.apache.camel.quarkus.component.couchdb.it.CouchDbRoute.COUCHDB_ENDPOINT_URI; @@ -52,7 +52,7 @@ public class CouchdbResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) -public CouchdbTestDocument create(CouchdbTestDocument document) { +public CouchdbTestDocument create(CouchdbTestDocument document) throws InterruptedException { LOG.info("Invoking create"); Exchange createExchange = producerTemplate.request(COUCHDB_ENDPOINT_URI, e -> e.getMessage().setBody(document.toJsonObject())); @@ -72,7 +72,7 @@ public class CouchdbResource { e.getMessage().setHeader(CouchDbConstants.HEADER_METHOD, CouchDbOperations.GET); e.getMessage().setHeader(CouchDbConstants.HEADER_DOC_ID, document.getId()); }); -if (getExchange.getException(NoDocumentException.class) != null) { +if (getExchange.getException(NotFoundException.class) != null) { return null; } else { return getExchange.getMessage().getBody(String.class); diff --git a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java index f384ba8213..9e55787379 100644 --- a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java +++ b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java @@ -16,7 +16,11 @@ */ package org.apache.camel.quarkus.component.couchdb.it; +import java.util.Optional; +import java.util.stream.StreamSupport; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.JsonArray; import com.google.gson.JsonObject; public class CouchdbTestDocument { @@ -67,11 +71,16 @@ public class CouchdbTestDocument { public static CouchdbTestDocument fromJsonObject(JsonObject jsonObject) { CouchdbTestDocument doc = new CouchdbTestDocument(); -if (jsonObject.has("_id")) { -doc.setId(jsonObject.get("_id").getAsString()); +if (jsonObject.has("id")) { +doc.setId(jsonObject.get("id").getAsString()); } -if (jsonObject.has("_rev")) { -doc.setRevision(jsonObject.get("_rev").getAsString()); +if (jsonObject.has("changes") && jsonObject.get("changes").isJsonArray()) { +JsonArray ja = jsonObject.get("changes").getAsJsonArray(); +Optional rev = StreamSupport.stream(ja.spliterator(), true) +.filter(jo -> ((JsonObject) jo).has("rev")) +.map(jo2 -> ((JsonObject) jo2).get("rev").getAsString()) +.findAny(); +doc.setRevision(rev.orElse(null)); } if (jsonObject.has("value")) {
(camel-quarkus) 30/41: Fixed azure-queue
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 39fa39c330bdad59916242d6495635a1924a6428 Author: JiriOndrusek AuthorDate: Wed Jun 12 13:44:35 2024 +0200 Fixed azure-queue --- .../storage/queue/deployment/AzureStorageQueueProcessor.java | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java index 8d0df10777..9f73e984fa 100644 --- a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java +++ b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java @@ -16,6 +16,7 @@ */ package org.apache.camel.quarkus.component.azure.storage.queue.deployment; +import com.azure.xml.XmlSerializable; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; @@ -31,6 +32,7 @@ class AzureStorageQueueProcessor { private static final Logger LOG = Logger.getLogger(AzureStorageQueueProcessor.class); private static final String FEATURE = "camel-azure-storage-queue"; +private static final DotName XML_SERIALIZABLE_NAME = DotName.createSimple(XmlSerializable.class.getName()); @BuildStep FeatureBuildItem feature() { @@ -55,8 +57,16 @@ class AzureStorageQueueProcessor { || n.startsWith("com.azure.storage.queue.models.")) .sorted() .toArray(String[]::new); - reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().build()); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().serialization().build()); +final String[] knownSerializableImpls = combinedIndex.getIndex() +.getAllKnownImplementors(XML_SERIALIZABLE_NAME) +.stream() +.map(ClassInfo::name) +.map(DotName::toString) +.sorted() +.toArray(String[]::new); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(knownSerializableImpls).methods().build()); } @BuildStep
(camel-quarkus) 34/41: Fixed servlet
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 0f2b8b7b3b5032a17802ef89262d38c4478d625b Author: JiriOndrusek AuthorDate: Tue Jun 18 11:33:30 2024 +0200 Fixed servlet --- .../org/apache/camel/quarkus/component/servlet/ServletProducers.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java index 292be43a1e..c0172831a1 100644 --- a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java +++ b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java @@ -33,6 +33,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; +import org.apache.camel.http.common.HttpMessage; import org.apache.camel.spi.MimeType; import static org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.DEFAULT_SERVLET_NAME; @@ -51,7 +52,8 @@ public class ServletProducers { return exchange -> { JsonObject json = new JsonObject(); Message message = exchange.getMessage(); -HttpServletRequest request = message.getHeader(Exchange.HTTP_SERVLET_REQUEST, HttpServletRequest.class); +HttpMessage httpMessage = exchange.getIn(HttpMessage.class); +HttpServletRequest request = httpMessage.getRequest(); String servletName = message.getHeader("servletName", DEFAULT_SERVLET_NAME, String.class); ServletContext servletContext = request.getServletContext(); Deployment deployment = ((ServletContextImpl) servletContext).getDeployment();
(camel-quarkus) 22/41: fixed azure and xchange
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 ecd7e9ed34dc03cbdee3a8cfa99cc375c638fc41 Author: JiriOndrusek AuthorDate: Mon Jun 10 16:37:02 2024 +0200 fixed azure and xchange --- extensions/xchange/deployment/pom.xml | 5 +++ .../xchange/deployment/XchangeProcessor.java | 7 .../deployment/graal/XchangeSubstitutions.java | 44 ++ pom.xml| 2 +- 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/extensions/xchange/deployment/pom.xml b/extensions/xchange/deployment/pom.xml index c7eebda0d1..d591231eed 100644 --- a/extensions/xchange/deployment/pom.xml +++ b/extensions/xchange/deployment/pom.xml @@ -42,6 +42,11 @@ org.apache.camel.quarkus camel-quarkus-xchange + +org.graalvm.sdk +nativeimage +provided + diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java index 158f3f6198..6328d03b00 100644 --- a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java +++ b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java @@ -109,6 +109,13 @@ class XchangeProcessor { .filter(className -> className.startsWith("jakarta.ws.rs")) .toArray(String[]::new); reflectiveClass.produce(ReflectiveClassBuildItem.builder(jaxrsAnnotations).methods().build()); + +//constructors for converters +String[] converterClasses = index.getAllKnownSubclasses("com.fasterxml.jackson.databind.util.StdConverter") +.stream() +.map(classInfo -> classInfo.name().toString()) +.toArray(String[]::new); + reflectiveClass.produce(ReflectiveClassBuildItem.builder(converterClasses).methods().fields().build()); } @BuildStep diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java new file mode 100644 index 00..7eeac51c19 --- /dev/null +++ b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.xchange.deployment.graal; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import com.oracle.svm.core.annotate.TargetElement; +import org.knowm.xchange.binance.config.converter.StringToCurrencyConverter; +import org.knowm.xchange.binance.config.converter.StringToCurrencyPairConverter; + +public class XchangeSubstitutions { + +@TargetClass(StringToCurrencyPairConverter.class) +class StringToCurrencyPairConverterSubstitutions { + +@Substitute +@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) +public StringToCurrencyPairConverterSubstitutions() { +} +} + +@TargetClass(StringToCurrencyConverter.class) +class StringToCurrencyConverterSubstitutions { + +@Substitute +@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) +public StringToCurrencyConverterSubstitutions() { +} +} +} diff --git a/pom.xml b/pom.xml index 0fe1cbcb0d..709b894613 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ docker.io/rmohr/activemq:5.15.9-alpine quay.io/artemiscloud/activemq-artemis-broker:1.0.20 docker.io/arangodb:3.12.0 - mcr.microsoft.com/azure-storage/azurite:3.29.0 + mcr.microsoft.com/azure-storage/azurite:3.30.0
(camel-quarkus) 15/41: Generated 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 0e65c81a0f4f54f1ddc89cdc2558758c705a52c2 Author: JiriOndrusek AuthorDate: Wed May 29 10:39:09 2024 +0200 Generated poms --- poms/bom/pom.xml | 2 +- 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, 7 insertions(+), 7 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e50c3fc6d7..ee714262d9 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1779,7 +1779,7 @@ org.apache.camel -camel-langchain4-chat +camel-langchain4j-chat ${camel.version} diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a0cdf972dd..26f37fe019 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1716,12 +1716,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4j-chat 4.7.0-SNAPSHOT org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core 4.7.0-SNAPSHOT diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7aac99bf12..194967448a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1716,12 +1716,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4j-chat 4.7.0-SNAPSHOT org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core 4.7.0-SNAPSHOT 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 65e11c9b80..8904414670 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1716,12 +1716,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4j-chat 4.7.0-SNAPSHOT org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core 4.7.0-SNAPSHOT
(camel-quarkus) 06/41: Generated 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 a90eea51be846306133d6df5141e49cf3f4f7dd0 Author: JiriOndrusek AuthorDate: Tue May 21 09:25:54 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++-- .../bom/src/main/generated/flattened-reduced-pom.xml | 20 ++-- .../main/generated/flattened-reduced-verbose-pom.xml | 20 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4e7fc2daf8..1d1040593c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6269,7 +6269,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6288,12 +6288,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6308,22 +6308,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6768,17 +6768,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index b17731fb1d..ceb6c97395 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6269,7 +6269,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6288,12 +6288,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6308,22 +6308,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6728,17 +6728,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 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 329fef4eb0..75a26dfb52 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6269,7 +6269,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6288,12 +6288,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6308,22 +6308,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0
(camel-quarkus) 10/41: Fix of compilation error in test-framework
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 1207ebb94027564dcd593705fcf3caad6d283408 Author: JiriOndrusek AuthorDate: Mon May 27 16:05:44 2024 +0200 Fix of compilation error in test-framework --- .../camel/quarkus/test/CamelQuarkusTestSupport.java | 2 +- .../quarkus/test/common/AbstractCallbacksTest.java | 17 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 70910d51d8..62c1a21af7 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -267,7 +267,7 @@ public class CamelQuarkusTestSupport extends CamelTestSupport * Method is not intended to be overridden. */ @Override -protected final void doQuarkusCheck() { +protected final void unsupportedCheck() { //can run on Quarkus //log warning in case that at least one RouteBuilder in the registry, it might mean, that unintentionally diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java index 4d9d7b5501..77c6b64c7f 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java @@ -36,15 +36,15 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; -import org.apache.camel.quarkus.test.junit5.patterns.DebugJUnit5Test; import org.apache.camel.util.StopWatch; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { -private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class); +private static final Logger LOG = Logger.getLogger(AbstractCallbacksTest.class); public enum Callback { postTearDown, @@ -69,6 +69,12 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { this.afterClassTestName = afterClassTestName; } +@BeforeEach +protected void createTmpFiles() throws Exception { +createTmpFile(testName, Callback.doSetup); +createTmpFile(afterClassTestName, Callback.doSetup); +} + @Override protected CamelContext createCamelContext() throws Exception { createTmpFile(testName, Callback.contextCreation); @@ -83,13 +89,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { super.doPostSetup(); } -@Override -protected void doSetUp() throws Exception { -createTmpFile(testName, Callback.doSetup); -createTmpFile(afterClassTestName, Callback.doSetup); -super.doSetUp(); -} - @Override protected void doPostSetup() throws Exception { createTmpFile(testName, Callback.postSetup);
(camel-quarkus) 25/41: Fixed smb
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 bed6ab19729f4e14457506026088cc79756b39af Author: JiriOndrusek AuthorDate: Tue Jun 11 11:01:59 2024 +0200 Fixed smb --- .../main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java index b2ec2c0dce..e72b0df28a 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java @@ -22,7 +22,7 @@ public class SmbRoute extends RouteBuilder { @Override public void configure() throws Exception { - from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}={{smb.password}}") + from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}={{smb.password}}=true") .to("mock:result"); } }
(camel-quarkus) 27/41: Fixed langchain4j (requires CAMEL-20863)
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 587ae2529f9c7529be342130a1599b1346b847e5 Author: JiriOndrusek AuthorDate: Tue Jun 11 14:05:27 2024 +0200 Fixed langchain4j (requires CAMEL-20863) --- .../component/langchain/chat/it/OllamaRoute.java | 22 ++ 1 file changed, 22 insertions(+) diff --git a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java index c87d2cffe8..47d9c68c40 100644 --- a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java +++ b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java @@ -16,11 +16,22 @@ */ package org.apache.camel.quarkus.component.langchain.chat.it; +import dev.langchain4j.model.chat.ChatLanguageModel; +import io.quarkiverse.langchain4j.ollama.OllamaChatLanguageModel; +import io.quarkiverse.langchain4j.ollama.Options; import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.apache.camel.builder.RouteBuilder; +import org.eclipse.microprofile.config.inject.ConfigProperty; + +import static java.time.Duration.ofSeconds; @ApplicationScoped public class OllamaRoute extends RouteBuilder { + +@ConfigProperty(name = "quarkus.langchain4j.ollama.base-url") +private String ollamaUrl; + @Override public void configure() throws Exception { from("direct:send-simple-message?timeout=3") @@ -35,4 +46,15 @@ public class OllamaRoute extends RouteBuilder { .to("langchain4j-chat:test3?chatOperation=CHAT_MULTIPLE_MESSAGES") .to("mock:multipleMessageResponse"); } + +//model reflects the values in wire-mocked response +@Produces +public ChatLanguageModel produceModel() { +return OllamaChatLanguageModel.builder() + .options(Options.builder().temperature(0.3).topK(40).topP(0.9).build()) +.model("orca-mini") +.baseUrl(ollamaUrl) +.timeout(ofSeconds(3000)) +.build(); +} }
(camel-quarkus) 11/41: fixed test-framework/junit5 + 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 ddf0dc24fdd4b246b8cda7b7cc9e5612c5a4b103 Author: JiriOndrusek AuthorDate: Mon May 27 17:17:01 2024 +0200 fixed test-framework/junit5 + generated changes --- .../main/resources/META-INF/quarkus-extension.yaml | 2 +- .../main/resources/META-INF/quarkus-extension.yaml | 1 + .../quarkus/test/common/AbstractCallbacksTest.java | 8 -- .../test/common/CallbacksPerTestFalse01Test.java | 3 --- .../test/common/CallbacksPerTestTrue01Test.java| 3 --- .../test/junit5/patterns/DebugJUnit5Test.java | 6 + .../patterns/DebugNoLazyTypeConverterTest.java | 6 + .../quarkus/test/junit5/patterns/DebugTest.java| 6 + .../test/junit5/patterns/TestDebugBreakpoint.java | 29 ++ 9 files changed, 49 insertions(+), 15 deletions(-) diff --git a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 253ef63aa4..96dbe3295d 100644 --- a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -22,7 +22,7 @@ # --- name: "Camel ActiveMQ" -description: "Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component" +description: "Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends the Camel JMS component" metadata: icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg; guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/activemq.html; diff --git a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 6ecbc7bde8..4b4f84c9ba 100644 --- a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -30,3 +30,4 @@ metadata: - "integration" status: - "stable" + - "deprecated" \ No newline at end of file diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java index 77c6b64c7f..597ccc7df7 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java @@ -39,7 +39,6 @@ import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; import org.apache.camel.util.StopWatch; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { @@ -48,7 +47,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { public enum Callback { postTearDown, -doSetup, preSetup, postSetup, contextCreation, @@ -69,12 +67,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { this.afterClassTestName = afterClassTestName; } -@BeforeEach -protected void createTmpFiles() throws Exception { -createTmpFile(testName, Callback.doSetup); -createTmpFile(afterClassTestName, Callback.doSetup); -} - @Override protected CamelContext createCamelContext() throws Exception { createTmpFile(testName, Callback.contextCreation); diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java index e10d0ce525..591a40eb5c 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java @@ -39,9 +39,6 @@ public class CallbacksPerTestFalse01Test extends AbstractCallbacksTest { protected static BiConsumer createAssertionConsumer() { return (callback, count) -> { switch (callback) { -case doSetup: -assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); -break; case contextCreation: assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); break; diff --git
(camel-quarkus) 20/41: Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport
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 00be55a027b260de98695e94029ac66ca5ba5cc3 Author: JiriOndrusek AuthorDate: Fri Jun 7 09:24:53 2024 +0200 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport --- .../quarkus/test/CamelQuarkusTestSupport.java | 320 + .../test/CustomCamelContextConfiguration.java | 34 +++ .../test/CustomTestExecutionConfiguration.java | 30 ++ 3 files changed, 263 insertions(+), 121 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index e91435d977..626391d0ad 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -26,14 +26,29 @@ import io.quarkus.test.junit.callback.QuarkusTestContext; import io.quarkus.test.junit.callback.QuarkusTestMethodContext; import jakarta.inject.Inject; import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.NoSuchEndpointException; +import org.apache.camel.Processor; import org.apache.camel.Route; +import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ModelCamelContext; +import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.model.RouteDefinition; import org.apache.camel.quarkus.core.FastCamelContext; import org.apache.camel.spi.Registry; +import org.apache.camel.test.junit5.AbstractTestSupport; +import org.apache.camel.test.junit5.CamelContextManager; import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit5.ContextManagerFactory; +import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit5.util.ExtensionHelper; +import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension; +import org.apache.camel.util.StopWatch; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtensionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,11 +87,20 @@ import org.slf4j.LoggerFactory; * them. * */ -public class CamelQuarkusTestSupport extends CamelTestSupport +public class CamelQuarkusTestSupport extends AbstractTestSupport implements QuarkusTestProfile { private static final Logger LOG = LoggerFactory.getLogger(CamelQuarkusTestSupport.class); +//@RegisterExtension +//protected CamelTestSupport camelTestSupportExtension = this; + +private final StopWatch watch = new StopWatch(); +private String currentTestName; + +private CamelContextManager contextManager; +private final ContextManagerFactory contextManagerFactory; + @Inject protected CamelContext context; @@ -86,12 +110,40 @@ public class CamelQuarkusTestSupport extends CamelTestSupport Set createdRoutes; public CamelQuarkusTestSupport() { -super(new ContextNotStoppingManagerFactory()); +super(new CustomTestExecutionConfiguration(), new CustomCamelContextConfiguration()); + +this.contextManagerFactory = new ContextNotStoppingManagerFactory(); + +testConfigurationBuilder() +.withCustomUseAdviceWith(isUseAdviceWith()) +.withJMX(useJmx()) +.withUseRouteBuilder(isUseRouteBuilder()) +.withDumpRouteCoverage(isDumpRouteCoverage()) +.withAutoStartContext(false); + +contextConfiguration() +.withCustomCamelContextSupplier(this::camelContextSupplier) +.withCustomPostProcessor(this::postProcessTest) +.withCustomRoutesSupplier(this::createRouteBuilders) +.withRegistryBinder(this::bindToRegistry) + .withUseOverridePropertiesWithPropertiesComponent(useOverridePropertiesWithPropertiesComponent()) +.withRouteFilterExcludePattern(getRouteFilterExcludePattern()) +.withRouteFilterIncludePattern(getRouteFilterIncludePattern()) +.withMockEndpoints(isMockEndpoints()) +.withMockEndpointsAndSkip(isMockEndpointsAndSkip()); //CQ starts and stops context with the application start/stop testConfiguration().withAutoStartContext(false); } +CustomCamelContextConfiguration contextConfiguration() { +return (CustomCamelContextConfiguration)camelContextConfiguration; +} + +CustomTestExecutionConfiguration testConfigurationBuilder() { +return
(camel-quarkus) 13/41: Added camel-langchain4j-core to pom
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 1aaf9718897b4fbb3386906cc7c8e9c4eebe7f91 Author: JiriOndrusek AuthorDate: Wed May 29 08:54:35 2024 +0200 Added camel-langchain4j-core to pom --- poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 4 files changed, 20 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9cb3038d76..e73a0786dd 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1777,6 +1777,11 @@ camel-kudu ${camel.version} + +org.apache.camel +camel-langchain4j-core +${camel.version} + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index d86c08ae49..a0cdf972dd 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e6578fc7a7..7aac99bf12 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat 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 2cea333a33..65e11c9b80 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat
(camel-quarkus) 23/41: Removed unnecessary change made for xchange
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 3a59f3492c816c5b2fb2e5019b8fa63203eecaa7 Author: JiriOndrusek AuthorDate: Mon Jun 10 16:46:53 2024 +0200 Removed unnecessary change made for xchange --- extensions/xchange/deployment/pom.xml | 5 --- .../deployment/graal/XchangeSubstitutions.java | 44 -- 2 files changed, 49 deletions(-) diff --git a/extensions/xchange/deployment/pom.xml b/extensions/xchange/deployment/pom.xml index d591231eed..c7eebda0d1 100644 --- a/extensions/xchange/deployment/pom.xml +++ b/extensions/xchange/deployment/pom.xml @@ -42,11 +42,6 @@ org.apache.camel.quarkus camel-quarkus-xchange - -org.graalvm.sdk -nativeimage -provided - diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java deleted file mode 100644 index 7eeac51c19..00 --- a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.xchange.deployment.graal; - -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.TargetElement; -import org.knowm.xchange.binance.config.converter.StringToCurrencyConverter; -import org.knowm.xchange.binance.config.converter.StringToCurrencyPairConverter; - -public class XchangeSubstitutions { - -@TargetClass(StringToCurrencyPairConverter.class) -class StringToCurrencyPairConverterSubstitutions { - -@Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public StringToCurrencyPairConverterSubstitutions() { -} -} - -@TargetClass(StringToCurrencyConverter.class) -class StringToCurrencyConverterSubstitutions { - -@Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public StringToCurrencyConverterSubstitutions() { -} -} -}
(camel-quarkus) 36/41: Generated 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 a089879d2ab91ac551459a6cb6580c240beda93e Author: JiriOndrusek AuthorDate: Thu Jun 20 09:22:06 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9bd44478d3..de4dc9fe01 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7236,7 +7236,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 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 14d4e353cf..95f5e31c84 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7140,7 +7140,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 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 aa1c2193cc..b31667c0bb 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7140,7 +7140,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework