(camel) branch jms-sent created (now 9cf9a678877)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-sent in repository https://gitbox.apache.org/repos/asf/camel.git at 9cf9a678877 CAMEL-20338: camel-jms - Store header with actual JMS destination name such as when sending to dynamic computed queues. This branch includes the following new commits: new 9cf9a678877 CAMEL-20338: camel-jms - Store header with actual JMS destination name such as when sending to dynamic computed queues. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Re: [PR] CAMEL-20278: upgrade wildfly-elytron to 2.x [camel]
github-actions[bot] commented on PR #12904: URL: https://github.com/apache/camel/pull/12904#issuecomment-1910325129 :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
(camel-quarkus) annotated tag 3.7.0 created (now d32547d8ab)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to annotated tag 3.7.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at d32547d8ab (tag) tagging 99ba1dd3fec33ec8c1b4bd35559d15891e4dbb54 (commit) replaces 1.0.0-CR3 by James Netherton on Thu Jan 25 14:20:18 2024 + - Log - [maven-release-plugin] copy for tag 3.7.0 --- No new revisions were added by this update.
(camel-quarkus) branch 3.7.x created (now 99ba1dd3fe)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 3.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 99ba1dd3fe [maven-release-plugin] Prepare release 3.7.0 This branch includes the following new commits: new 99ba1dd3fe [maven-release-plugin] Prepare release 3.7.0 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.
[I] Coverage report wrong percentage [camel-k]
squakez opened a new issue, #5108: URL: https://github.com/apache/camel-k/issues/5108 ### What happened? It happens because we calculate the difference against the branch, instead of taking it directly when we build the project. ### Steps to reproduce _No response_ ### Relevant log output _No response_ ### Camel K version _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Include the operator node-selector in the helm chart [camel-k]
squakez commented on issue #5103: URL: https://github.com/apache/camel-k/issues/5103#issuecomment-1910298392 Please, feel free to contribute the change. I'm assigning this to you @lsergio, thanks! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] feat(runtime): get rid off camel k runtime dependency - WIP [camel-k]
github-actions[bot] commented on PR #5090: URL: https://github.com/apache/camel-k/pull/5090#issuecomment-1910297616 :heavy_check_mark: Unit test coverage report - coverage increased from 34.8% to 35.8% (**+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] Builder annotation support [camel-k]
github-actions[bot] commented on PR #5104: URL: https://github.com/apache/camel-k/pull/5104#issuecomment-1910283554 :heavy_check_mark: Unit test coverage report - coverage increased from 34.8% to 35.3% (**+0.5%**) -- 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-19620] - upgrade californium-scandium [camel]
kahboom commented on code in PR #12769:
URL: https://github.com/apache/camel/pull/12769#discussion_r1466421491
##
components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java:
##
@@ -419,9 +432,10 @@ private void registerTLSConfiguration(CamelContext
context) throws GeneralSecuri
context.getRegistry().bind("privateKey", privateKey);
context.getRegistry().bind("publicKey", publicKey);
-context.getRegistry().bind("trustedRpkStore", trustedRpkStore);
-context.getRegistry().bind("failedTrustedRpkStore",
failedTrustedRpkStore);
-context.getRegistry().bind("pskStore", pskStore);
+
+context.getRegistry().bind("advancedCertificateVerifier",
advancedCertificateVerifier);
+//
context.getRegistry().bind("failedAdvancedCertificateVerifier",
failedAdvancedCertificateVerifier);
Review Comment:
Thanks, should have caught these!
--
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] Builder annotation support [camel-k]
squakez commented on code in PR #5104:
URL: https://github.com/apache/camel-k/pull/5104#discussion_r1466413582
##
pkg/cmd/operator/operator.go:
##
@@ -295,7 +295,8 @@ func getOperatorImage(ctx context.Context, c ctrl.Reader)
(string, error) {
ns := platform.GetOperatorNamespace()
name := platform.GetOperatorPodName()
if ns == "" || name == "" {
- return "", nil
+ // We are most likely running out of cluster. Let's take a
chance and use the default value
Review Comment:
Ditto
##
pkg/apis/camel/v1/common_types.go:
##
@@ -55,6 +55,8 @@ type BuildConfiguration struct {
LimitMemory string `property:"limit-memory"
json:"limitMemory,omitempty"`
// The node selector for the builder pod. Only used for `pod` strategy
NodeSelector map[string]string `property:"node-selector"
json:"nodeSelector,omitempty"`
+ // Annotation to use for the builder pod. Only user for `pod` strategy
Review Comment:
```suggestion
// Annotation to use for the builder pod. Only used for `pod` strategy
```
##
pkg/cmd/operator/operator.go:
##
@@ -165,8 +165,8 @@ func Run(healthPort, monitoringPort int32, leaderElection
bool, leaderElectionID
// in which case it's not possible to determine a namespace.
operatorNamespace = watchNamespace
if operatorNamespace == "" {
- leaderElection = false
- log.Info("unable to determine namespace for leader
election")
+ // We cannot go forward anyhow since later on we need a
namespace to create resources
Review Comment:
Please, open a separate PR for this change so we can have a more focused
look on what it really involves.
##
pkg/controller/integrationkit/build.go:
##
@@ -133,8 +133,10 @@ func (action *buildAction) handleBuildSubmitted(ctx
context.Context, kit *v1.Int
}
}
// The build operation, when executed as a Pod, should be
executed by a container image containing the
- // `kamel builder` command. Likely the same image running the
operator should be fine.
- buildConfig.ToolImage = platform.OperatorImage
+ // `kamel builder` command. If not specified, likely the same
image running the operator should be fine.
Review Comment:
I think we must force the image to be the one on which the operator is
running. Please, open a separate PR to discuss this separately.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[I] Kamel executable does not support Kubeconfig with multiple files [camel-k]
rodcloutier opened a new issue, #5107: URL: https://github.com/apache/camel-k/issues/5107 ### What happened? While using Kamel I have observed that we cannot use kubeconfig that refers to multiple files. ### Steps to reproduce 1. Create a kubeconfig that refers multiple files ie `KUBECONFIG=$KUBECONFIG:$KUBECONFIG` 2. Call any Kamel command that refers to the cluster ``` ❯ ./kamel get integration ``` 3. Observe the error ``` Error: cannot get current namespace: open /Users/rcloutier/dev/petal/rto/next_gen_pocs/workflow/camel-k/kubeconfig.kind:/Users/rcloutier/dev/petal/rto/next_gen_pocs/workflow/camel-k/kubeconfig.kind: no such file or directory ``` ### Relevant log output _No response_ ### Camel K version build from main -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] Add possibility to configure annotation for the builder pods [camel-k]
rodcloutier opened a new issue, #5106: URL: https://github.com/apache/camel-k/issues/5106 ### Requirement As a user of camel-k, I would like to be able to specify custom annotations that would be applied to the builder pods. ``` ### Problem In the context of a Kubernetes cluster that uses AppArmor, the buildah strategy uses containers that are restricted. In order to lift that restriction, we must unconfine the buildah container. This can be done using the following annotation which must be present on the builder pod ``` container.apparmor.security.beta.kubernetes.io/buildah: unconfined ``` ### Proposal Extend the current buildConfiguration to include custom annotations. ### Open questions _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Use /bin/bash for release-util sign.sh script [camel-quarkus]
oscerd commented on PR #5680: URL: https://github.com/apache/camel-quarkus/pull/5680#issuecomment-1910240025 > > I think we should do this also in other repositories. Thanks for noticing and sorry. > > It's fine - it likely only matters for awkward folks like me who choose to use Debian *nix variants where /bin/sh != /bin/bash. Well, it's always a use case, so better to fix. I'll take care of projects using the script! -- 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] Add support for KUBECONFIG with multiple files [camel-k]
rodcloutier opened a new pull request, #5105: URL: https://github.com/apache/camel-k/pull/5105 This PR intends to solve the issue where a kubeconfig containing multiple files could not be used with Kamel. As defined in https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/#linux-1 **Release Note** ```release-note Add support to allow Kubeconfig to contain multiple file when using Kamel ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (457210a0dff -> dc12d5b0ce2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 457210a0dff CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent add ff8639b819b CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent add dc12d5b0ce2 CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Re: [PR] Builder annotation support [camel-k]
rodcloutier commented on PR #5104: URL: https://github.com/apache/camel-k/pull/5104#issuecomment-1910230153 I am struggling to find any place to insert test for this enhancement. Could anyone chime in? -- 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] Builder annotation support [camel-k]
rodcloutier opened a new pull request, #5104: URL: https://github.com/apache/camel-k/pull/5104 This PR proposes to add the possibility to configure annotation on the build pod. This was required to allow build pods to properly execute in the context of using Buildah in an AppArmor enabled Kubernetes cluster. Also included are a few tweak encountered while running the operator out of cluster. **Release Note** ```release-note Add possibility to use custom annotations on builder pods. ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Use /bin/bash for release-util sign.sh script
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new b9d3ed38a8 Use /bin/bash for release-util sign.sh script b9d3ed38a8 is described below commit b9d3ed38a802aeb53c0dda60fda59d4d14bdd08d Author: James Netherton AuthorDate: Thu Jan 25 13:23:31 2024 + Use /bin/bash for release-util sign.sh script --- release-utils/scripts/sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-utils/scripts/sign.sh b/release-utils/scripts/sign.sh index ae22f18c60..e0d7b05c43 100755 --- a/release-utils/scripts/sign.sh +++ b/release-utils/scripts/sign.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with
Re: [PR] Use /bin/bash for release-util sign.sh script [camel-quarkus]
jamesnetherton merged PR #5680: URL: https://github.com/apache/camel-quarkus/pull/5680 -- 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] Use /bin/bash for release-util sign.sh script [camel-quarkus]
jamesnetherton commented on PR #5680: URL: https://github.com/apache/camel-quarkus/pull/5680#issuecomment-1910228673 > I think we should do this also in other repositories. Thanks for noticing and sorry. It's fine - it likely only matters for awkward folks like me who choose to use Debian *nix variants where /bin/sh != /bin/bash. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (af004d2698c -> 457210a0dff)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from af004d2698c CAMEL-19241: implement support for auto-commits with batching in camel-kafka (#12879) add 457210a0dff CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent No new revisions were added by this update. Summary of changes: .../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 32 ++ 1 file changed, 32 insertions(+)
(camel) branch main updated: CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
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 dc12d5b0ce2 CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent dc12d5b0ce2 is described below commit dc12d5b0ce2879214fa594dd6826e93e52f67c7d Author: Claus Ibsen AuthorDate: Thu Jan 25 14:26:35 2024 +0100 CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc index f32875e7b6c..3e96262eae4 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc @@ -173,7 +173,7 @@ In Camel 4.4 onwards we changed the order to let Camel be first as shown below: -In previous versions, then we would have `spring-boot-dependencies` before `camel-spring-boot-bom`. However to better +In previous versions, then we would have `spring-boot-dependencies` before `camel-spring-boot-bom`. However, to better align and ensure Camel starters are using supported dependencies, then it's recommended to let Camel be first. === Auto Configuration
(camel-spring-boot) branch main updated: CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
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 dc4eae6b865 CAMEL-20308: Change order of camel-spring-boot-bom and
spring-boot-dependencies in dependencyManamgent
dc4eae6b865 is described below
commit dc4eae6b865549828a5b807dff1776d3366e8f4e
Author: Claus Ibsen
AuthorDate: Thu Jan 25 14:26:45 2024 +0100
CAMEL-20308: Change order of camel-spring-boot-bom and
spring-boot-dependencies in dependencyManamgent
---
docs/spring-boot/modules/ROOT/pages/index.adoc | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/docs/spring-boot/modules/ROOT/pages/index.adoc
b/docs/spring-boot/modules/ROOT/pages/index.adoc
index eea67536f0a..32dcfe3de1a 100644
--- a/docs/spring-boot/modules/ROOT/pages/index.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/index.adoc
@@ -2,29 +2,37 @@
Camel support for Spring Boot provides auto-configuration of the Camel and
starters for many Camel xref:components::index.adoc[components]. Our
opinionated auto-configuration of the Camel context auto-detects Camel routes
available in the Spring context and registers the key Camel utilities (like
producer template, consumer template and the type converter) as beans.
-Get started by adding the Camel Spring Boot BOM to your Maven `pom.xml` file.
+Get started by adding the Camel and Spring Boot BOMs to your Maven `pom.xml`
file.
[source,xml]
-
org.apache.camel.springboot
camel-spring-boot-bom
-${project.version}
+${camel-version}
+pom
+import
+
+
+
+org.springframework.boot
+spring-boot-dependencies
+${spring-boot-version}
pom
import
-
-
+
The `camel-spring-boot-bom` is a basic BOM that only holds the list of Camel
Spring Boot starter JARs.
+NOTE: It is recommended to import Camel Spring Boot BOM before Spring Boot BOM
to ensure Camel dependencies are using supported JARs from the release.
However, you can flip the order, and let Spring Boot BOM be first. However, you
may encounter some dependency mis-aligments in some rare situations.
+
Next, add the xref:spring-boot.adoc[Camel Spring Boot starter] to startup the
xref:manual::camelcontext.adoc[Camel Context].
[source,xml]
[PR] Use /bin/bash for release-util sign.sh script [camel-quarkus]
jamesnetherton opened a new pull request, #5680: URL: https://github.com/apache/camel-quarkus/pull/5680 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
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 ff8639b819b CAMEL-20308: Change order of camel-spring-boot-bom and
spring-boot-dependencies in dependencyManamgent
ff8639b819b is described below
commit ff8639b819b25fe7a613734287b776244ec4bc41
Author: Claus Ibsen
AuthorDate: Thu Jan 25 14:23:44 2024 +0100
CAMEL-20308: Change order of camel-spring-boot-bom and
spring-boot-dependencies in dependencyManamgent
---
docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
index 4b48639bc7b..f32875e7b6c 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
@@ -157,7 +157,7 @@ In Camel 4.4 onwards we changed the order to let Camel be
first as shown below:
org.apache.camel.springboot
camel-spring-boot-bom
-${project.version}
+${camel-version}
pom
import
(camel) branch main updated: CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
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 457210a0dff CAMEL-20308: Change order of camel-spring-boot-bom and
spring-boot-dependencies in dependencyManamgent
457210a0dff is described below
commit 457210a0dffae449c7290e3ba0f4393d6d98c2c8
Author: Claus Ibsen
AuthorDate: Thu Jan 25 14:22:12 2024 +0100
CAMEL-20308: Change order of camel-spring-boot-bom and
spring-boot-dependencies in dependencyManamgent
---
.../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 32 ++
1 file changed, 32 insertions(+)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
index f808eeaf5a0..4b48639bc7b 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
@@ -144,6 +144,38 @@ The component now has support for batch processing.
== Camel Spring Boot
+=== Ordering of BOM imports
+
+When using Camel on Spring Boot, it's recommended to use BOMs to import Camel
and Spring dependencies.
+In Camel 4.4 onwards we changed the order to let Camel be first as shown below:
+
+[source,xml]
+
+
+
+
+
+org.apache.camel.springboot
+camel-spring-boot-bom
+${project.version}
+pom
+import
+
+
+
+org.springframework.boot
+spring-boot-dependencies
+${spring-boot-version}
+pom
+import
+
+
+
+
+
+In previous versions, then we would have `spring-boot-dependencies` before
`camel-spring-boot-bom`. However to better
+align and ensure Camel starters are using supported dependencies, then it's
recommended to let Camel be first.
+
=== Auto Configuration
The route controller configuration has been moved from general main to its own
group.
Re: [PR] CAMEL-20336: Add a WebAssembly component and language [camel]
oscerd commented on PR #12857: URL: https://github.com/apache/camel/pull/12857#issuecomment-1910175909 @lburgazzoli can your resolve conflicts so we could merge? Thanks! -- 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] Include the operator node-selector in the helm chart [camel-k]
aeciopires commented on issue #5103: URL: https://github.com/apache/camel-k/issues/5103#issuecomment-1910146763 Hi @lsergio! Thanks for open this issue. It will solve the problem when we want install camel-k in Kubernetes cluster with [Karpenter](https://karpenter.sh/) that have different labels in the nodes. -- 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 aws-config-component deleted (was 981cd7bce10)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch aws-config-component in repository https://gitbox.apache.org/repos/asf/camel.git was 981cd7bce10 CAMEL-20157 - Add a Camel-AWS-Config component - Catalog 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 sb-docs-aws-config deleted (was 0099bf4fee4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sb-docs-aws-config in repository https://gitbox.apache.org/repos/asf/camel.git was 0099bf4fee4 Camel-AWS-Config: Added SB Starter docs 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 spring-vault deleted (was 5b2099bd27a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-vault in repository https://gitbox.apache.org/repos/asf/camel.git was 5b2099bd27a Upgrade Spring Vault to version 3.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) branch sb-starter-cloudtrail deleted (was 53933b8ba4e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sb-starter-cloudtrail in repository https://gitbox.apache.org/repos/asf/camel.git was 53933b8ba4e Camel-AWS-Cloudtrail: Added SB Starter docs 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 aws-s3-console deleted (was 4092b05400b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch aws-s3-console in repository https://gitbox.apache.org/repos/asf/camel.git was 4092b05400b Added an AWS S3 Console, listing consumers, target bucket name and the type of auth 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 conformace-pack deleted (was 6d1d405a071)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch conformace-pack in repository https://gitbox.apache.org/repos/asf/camel.git was 6d1d405a071 Camel-AWS-Config: Add a Delete Conformance Pack Operation to Producer 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 commons-io-2.15.1 deleted (was 8e1091cab8c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch commons-io-2.15.1 in repository https://gitbox.apache.org/repos/asf/camel.git was 8e1091cab8c Upgrade Commons-io to version 2.15.1 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 CAMEL-18590-cosmosdb-2 deleted (was 72517c63eca)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-18590-cosmosdb-2 in repository https://gitbox.apache.org/repos/asf/camel.git was 72517c63eca CAMEL-18590 - Camel-Azure components: Define a unique configuration for authentication - Azure CosmosDB - Fix default value for Credential Type 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 CAMEL-20259 deleted (was 6165c8b9406)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-20259 in repository https://gitbox.apache.org/repos/asf/camel.git was 6165c8b9406 CAMEL-20259 - Remove Camel-HDFS Component - Docs 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 CAMEL-20271 deleted (was 405b21cea07)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-20271 in repository https://gitbox.apache.org/repos/asf/camel.git was 405b21cea07 CAMEL-20271 - Camel-AWS-Cloudtrail: Improve consumers by adding more information as exchange headers 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 CAMEL-20147 deleted (was 24cb95a48c4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-20147 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 24cb95a48c4 CAMEL-20147 - camel-spring-boot: Upgrade to 3.1.6 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 CAMEL-19864 deleted (was 70f2203f126)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-19864 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 70f2203f126 CAMEL-19864: renable test after fixing root issue. 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 CAMEL-19955 deleted (was 8b0b1deeb6d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-19955 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 8b0b1deeb6d CAMEL-19955 - Camel-Infinispan: Review the usage of Protostream sample domain definition and implementation in tests 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 regen-xray deleted (was 7e55c48eda5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch regen-xray in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 7e55c48eda5 Regen 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 CAMEL-20160 deleted (was 27d5853a728)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-20160 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 27d5853a728 CAMEL-20160 - Camel-AWS-Config: Create Spring Boot Starter - Test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot) branch CAMEL-20260 deleted (was d4ef18e2294)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-20260 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was d4ef18e2294 CAMEL-20260 - Remove Camel HDFS Starter 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 sb-fatjar deleted (was d15e91f7b36)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sb-fatjar in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was d15e91f7b36 Regen 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 camel-spring-boot-4.0.0-branch deleted (was f334dab28c1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was f334dab28c1 Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312) This change permanently discards the following revisions: discard f334dab28c1 Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312) discard e3a84a1d41c Override version of org.json:json - need a newer version than the one coming in from spring boot (#311) discard d7d32d9b858 Override reactory-netty-http to 1.1.13 (#309) discard 922dab1fd82 Override logback to 1.4.14 (#308) discard 181f5e6a835 CSB-3042: [camel-mail] java.lang.ClassNotFoundException: org.eclipse.angus.mail.imap.IMAPStore discard ad45178c4a4 Upgrade to spring-boot 3.1.6 (#305) discard 141a5fa8ddf Upgrade tomcat to 10.1.16 (#306) discard be03f72ee6d Add repository/pluginRepository entries to archetype (#304) discard 478f4f373fc fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984) (#291) discard c36fe3d1d09 Add snyk file to ignore tests in SAST analysis discard 013945d9850 Fix CS discard 3c4771821a3 Add a check for path traversal for SAST tests (#990) discard 1d525e1dd0a Set features to DocumentBuilderFactory to protect from XXE; fix for SAST (#989) discard 82b0eabc538 Externalize credentials to properties files for SAST tests (#988) discard 1ac17b0257b Externalize passwords into properties files, set features to DocumentBuilderFactory (#986) discard a4218590f23 [infinispan] Client property configurable in tests (#995) discard ddf1d708ad4 Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287) discard 2faa5c55306 Override tomcat version coming in from sb to 10.1.14 (#284) discard 4ed54d12f70 Change avro version to match camel's avro (1.11.3) (#283) discard 267ca0d51fc CAMEL-19955: Review the usage of Protostream discard c2df983a1d5 Add override for the jetty-bom (#280) discard 7fcf5b2e108 Add a netty-bom override (#277) discard 054241d122f Provide an override for guava (#276) discard 27f63e754fa Make test compliant with quay mirroring discard 62f4c1df83f Fix typo discard e27fedc5813 Add snappy-java override (#272) discard 7b194c485e6 Override avro/commons-compress (#273) discard 9188e68c57c Disables failing tests discard 0aa5bf5a233 Fix archetype pom discard 67ad1e95eee Regeneration discard aef47c69e5f [CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now discard 84e08db31b2 CAMEL-19851: camel-http - Allow to configure timeouts natively (#942) discard ced53451b69 CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT (#945) discard 9ac3cb0e88b CAMEL-19869: camel-infinispan - Disable failing ITs (#944) discard 610e2a200f4 Upgrade to spring-boot 3.1.4 (#953) discard 2490746804f Remove camel-jq-starter from list of productized starters; has a -pre… (#266) discard 54857d93274 Remove compiler plugin from archetype discard 2590207ba8b Disable artifacts tests (#267) discard e997a5ea288 Added omp dependency for PME alignment. discard 65a1a102412 Override infinispan-bom discard bdac313dec9 Upgrade failing test to FHIR 6.6.1 (#931) discard 4b1bed36467 Remove unused camel-version from archetype params discard 7798b4bf38b CSB-2196: fix ftp tests discard 25beac381c9 CAMEL-19793: update dependencies. (#925) discard 17de011c594 Upgrade to spring boot 3.1.3 (#252) discard 69835ebd466 Run cq-camel-spring-boot-prod-maven-plugin discard 404dc32966e CSB-2115 add camel-vertx-http-starter discard 02df358485f Merge pull request #256 from Croway/CSB-1272-4.0.0 discard ed6d2a54411 SB Maven plugin add execution discard cca4cc16466 Externalize csb version property discard 3e868417b2e CSB-1272: Platform template for jbang discard 150e589bdb3 Merge pull request #253 from Croway/CAMEL-19829-midstream discard e59938fed28 Refactor cluster service autoconfiguration discard 1ca6657ecac Updates maven-compiler-plugin to use java 17 discard 363e3edb2ce Remove starters that do not exist from required-productized-camel-artifacts.txt (#248) discard 38a420dbc59 Merge pull request #246 from VaishnaviR18/new-comp discard 5cf2aedc078 Added jq, jaxb and snmp as a productized artifacts. discard f510a41b8fe Change camel / camel-sap versions discard c6a9533fdcc Change versions of camel-sap to 4.0.0-SNAPSHOT discard ea044ddb1b1 camel-test-spring was removed in camel 4 discard 64b7e774094 Algin RC2 deps discard da53ef78506 [CSB-2169] Fixes missing parameters and profile discard 900d1a2290a Use productized version of camel-netty-http in webhook/telegram starters discard 3848d43e4d7 Add camel-sap to dependencies discard 866aad6bb60 Updates artifact to verify in MavenTest discard 52ecab76e57 Camel 4 updates discard e4385738875 Update camel-sap to SB3 discard dcc904d303b Cherry pick over the Jenkinsfile.redhat
Re: [I] Include the operator node-selector in the helm chart [camel-k]
lsergio commented on issue #5103: URL: https://github.com/apache/camel-k/issues/5103#issuecomment-1910133404 I can work on that if approved. -- 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) 23/40: Override tomcat version coming in from sb to 10.1.14 (#284)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2faa5c55306a0f659ddcc4c5e1025f7d78c4f92b
Author: Tom Cunningham
AuthorDate: Tue Oct 17 11:17:29 2023 -0400
Override tomcat version coming in from sb to 10.1.14 (#284)
---
.../camel/springboot/catalog/components/kafka.json | 8 +-
.../camel-kafka-starter/src/main/docs/kafka.json | 4 +-
.../springboot/KafkaComponentConfiguration.java| 4 +-
pom.xml| 9 +-
tooling/camel-spring-boot-bom/pom.xml | 6 +-
tooling/camel-spring-boot-dependencies/pom.xml | 408 ++---
.../src/main/resources/pom.xml | 36 ++
tooling/redhat-camel-spring-boot-bom/pom.xml | 56 ++-
8 files changed, 302 insertions(+), 229 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index 9d52ce4ea29..45db718f30b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -37,7 +37,7 @@
"bridgeErrorHandler": { "index": 12, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions occurred while the consumer is trying to pickup incoming
messages, or the likes, will now be proc [...]
"checkCrcs": { "index": 13, "kind": "property", "displayName": "Check
Crcs", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "true", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Automatically check the CRC32 of the records
consumed. This ensures no on-the-wire o [...]
"commitTimeoutMs": { "index": 14, "kind": "property", "displayName":
"Commit Timeout Ms", "group": "consumer", "label": "consumer", "required":
false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "5000",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The maximum time, in
milliseconds, that the code will wait for a synchron [...]
-"consumerRequestTimeoutMs": { "index": 15, "kind": "property",
"displayName": "Consumer Request Timeout Ms", "group": "consumer", "label":
"consumer", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "4", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The configuration controls the maximum amount
of ti [...]
+"consumerRequestTimeoutMs": { "index": 15, "kind": "property",
"displayName": "Consumer Request Timeout Ms", "group": "consumer", "label":
"consumer", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "3", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The configuration controls the maximum amount
of ti [...]
"consumersCount": { "index": 16, "kind": "property", "displayName":
"Consumers Count", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The number of consumers that connect to kafka
server. Each consumer is run on a separate thre [...]
"fetchMaxBytes": { "index": 17, "kind": "property", "displayName": "Fetch
Max Bytes", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "52428800",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The maximum
(camel-spring-boot) 35/40: Upgrade to spring-boot 3.1.6 (#305)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit ad45178c4a49ca29b7be5bfe3ee5bc1d610f2788 Author: Tom Cunningham AuthorDate: Tue Dec 5 10:04:28 2023 -0500 Upgrade to spring-boot 3.1.6 (#305)
(camel-spring-boot) 37/40: Override logback to 1.4.14 (#308)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 922dab1fd82adf1048ce5fd6afd866a60410ad01
Author: Tom Cunningham
AuthorDate: Tue Dec 5 14:01:29 2023 -0500
Override logback to 1.4.14 (#308)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 16
tooling/redhat-camel-spring-boot-bom/pom.xml | 16
3 files changed, 33 insertions(+)
diff --git a/pom.xml b/pom.xml
index ce977d5c8c6..f0f176959fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,7 @@
22.3.2
4.0.0
2.3.0
+1.4.14
3.11.0
3.4.1
3.1.2
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 28c4b7a7b4c..50fb912dc3f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -113,6 +113,22 @@
guava
${guava-version}
+
+
+ch.qos.logback
+logback-access
+${logback-version}
+
+
+ch.qos.logback
+logback-classic
+${logback-version}
+
+
+ch.qos.logback
+logback-core
+${logback-version}
+
org.apache.tomcat
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 33329740943..28e57d9c93f 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -113,6 +113,22 @@
guava
32.1.2.jre-redhat-1
+
+
+ch.qos.logback
+logback-access
+1.4.14
+
+
+ch.qos.logback
+logback-classic
+1.4.14
+
+
+ch.qos.logback
+logback-core
+1.4.14
+
org.apache.tomcat
(camel-spring-boot) 26/40: Externalize passwords into properties files, set features to DocumentBuilderFactory (#986)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 1ac17b0257bcfd04b00e12d2b507dcf9ea869c79
Author: Tom Cunningham
AuthorDate: Wed Oct 25 05:18:36 2023 -0400
Externalize passwords into properties files, set features to
DocumentBuilderFactory (#986)
---
.../remote/springboot/ftp/FtpEmbeddedService.java | 24 ++-
.../src/test/resources/users.properties| 5
.../springboot/test/AddCommentProducerTest.java| 8 +++
.../springboot/test/AddIssueLinkProducerTest.java | 6 ++---
.../jira/springboot/test/AddIssueProducerTest.java | 6 ++---
.../springboot/test/AddWorkLogProducerTest.java| 3 +--
.../springboot/test/AttachFileProducerTest.java| 5 ++--
.../springboot/test/DeleteIssueProducerTest.java | 3 +--
.../springboot/test/FetchCommentsProducerTest.java | 6 ++---
.../springboot/test/FetchIssueProducerTest.java| 3 +--
.../jira/springboot/test/JiraTestConstants.java| 27 +++---
.../springboot/test/NewCommentsConsumerTest.java | 6 ++---
.../springboot/test/NewIssuesConsumerTest.java | 6 ++---
.../test/TransitionIssueProducerTest.java | 3 +--
.../springboot/test/UpdateIssueProducerTest.java | 6 ++---
.../springboot/test/WatchUpdatesConsumerTest.java | 6 ++---
.../jira/springboot/test/WatcherProducerTest.java | 6 ++---
.../src/test/resources/jiraauth.properties | 3 +++
.../springboot/maven/SpringBootStarterMojo.java| 7 +-
19 files changed, 84 insertions(+), 55 deletions(-)
diff --git
a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
index 3c76c9331fe..d4650956556 100644
---
a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
+++
b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpEmbeddedService.java
@@ -38,10 +38,12 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.function.BiConsumer;
@@ -94,6 +96,12 @@ public class FtpEmbeddedService extends AbstractTestService
implements FtpServic
}
}
+private static Properties loadAuthProperties() throws IOException {
+Properties properties = new Properties();
+
properties.load(FtpEmbeddedService.class.getClassLoader().getResourceAsStream("users.properties"));
+return properties;
+}
+
protected FtpServerFactory createFtpServerFactory() {
NativeFileSystemFactory fsf = new NativeFileSystemFactory();
fsf.setCreateHome(true);
@@ -103,13 +111,17 @@ public class FtpEmbeddedService extends
AbstractTestService implements FtpServic
pumf.setPasswordEncryptor(new ClearTextPasswordEncryptor());
pumf.setFile(null);
UserManager userMgr = pumf.createUserManager();
-createUser(userMgr, "admin", "admin", rootDir, true);
-createUser(userMgr, "scott", "tiger", rootDir, true);
-createUser(userMgr, "dummy", "foo", rootDir, false);
-createUser(userMgr, "us@r", "t%st", rootDir, true);
+Properties users;
+try {
+users = loadAuthProperties();
+} catch (IOException ioe) {
+throw new IllegalStateException(ioe);
+}
+for (String username : users.stringPropertyNames()) {
+createUser(userMgr, username, users.getProperty(username),
rootDir, true);
+}
createUser(userMgr, "anonymous", null, rootDir, false);
-createUser(userMgr, "joe", "p+%w0)d", rootDir, true);
-createUser(userMgr, "jane", "%j#7%c6i", rootDir, true);
+createUser(userMgr, "dummy", "foo", rootDir, false);
ListenerFactory factory = new ListenerFactory();
factory.setPort(port);
diff --git
a/components-starter/camel-ftp-starter/src/test/resources/users.properties
b/components-starter/camel-ftp-starter/src/test/resources/users.properties
new file mode 100644
index 000..022bcefedbc
--- /dev/null
+++ b/components-starter/camel-ftp-starter/src/test/resources/users.properties
@@ -0,0 +1,5 @@
+admin=admin
+scott=tiger
+us@r=t%st
+joe=p+%w0)d
+jane=%j#7%c6i
\ No newline at end of file
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
(camel-spring-boot) 39/40: Override version of org.json:json - need a newer version than the one coming in from spring boot (#311)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e3a84a1d41c2743f40d1fae38eb539001376101d
Author: Tom Cunningham
AuthorDate: Thu Dec 7 08:38:34 2023 -0500
Override version of org.json:json - need a newer version than the one
coming in from spring boot (#311)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 6 ++
tooling/redhat-camel-spring-boot-bom/pom.xml| 6 ++
3 files changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4afc2586737..ac8d1735ba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
3.4.1
3.1.2
3.0
+20231013
1.1.13
2.2.0
${maven-surefire-plugin-version}
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 0031736cc58..ed28efa63a6 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -135,6 +135,12 @@
reactor-netty-http
${reactor-netty-version}
+
+
+org.json
+json
+${org-json-json-version}
+
org.apache.tomcat
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 56d5fda0ae1..5b71c5b1d72 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -135,6 +135,12 @@
reactor-netty-http
1.1.13
+
+
+org.json
+json
+20231013
+
org.apache.tomcat
(camel-spring-boot) 32/40: fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984) (#291)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 478f4f373fc1680a81a1d0ff802976e56387c7cc
Author: John Poth
AuthorDate: Mon Nov 27 14:29:12 2023 +0100
fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984)
(#291)
## Motivation
Since Spring 6.0.13 and the fix for
https://github.com/spring-projects/spring-framework/issues/31224, the member
category `INVOKE_DECLARED_METHODS` no longer includes public methods so the
code needs to be adapted to this behavior change.
## Modifications:
* Register also the member category `INVOKE_PUBLIC_METHODS` when
`INVOKE_DECLARED_METHODS` is registered
(cherry picked from commit ba22da88eed6feccfef10e91b46f57a23f8924e9)
Co-authored-by: Nicolas Filotto
---
.../apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java| 11 +++
.../test/java/org/apache/camel/xml/jaxb/springboot/Book.java | 1 -
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
b/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
index d8002c20ecf..26012c1e1fe 100644
---
a/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
+++
b/components-starter/camel-xml-jaxb-starter/src/main/java/org/apache/camel/xml/jaxb/springboot/JAXBRuntimeHints.java
@@ -196,9 +196,11 @@ final class JAXBRuntimeHints implements
RuntimeHintsRegistrar {
}
applyIfMatch(c, XmlJavaTypeAdapter.class,
XmlJavaTypeAdapter::value,
type -> hints.reflection().registerType(type,
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
-MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.DECLARED_FIELDS));
+MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.INVOKE_PUBLIC_METHODS,
+MemberCategory.DECLARED_FIELDS));
hints.reflection().registerType(c,
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
-MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.DECLARED_FIELDS);
+MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.INVOKE_PUBLIC_METHODS,
+MemberCategory.DECLARED_FIELDS);
}
boolean classDetected = false;
for (String className : getClassesFromIndexes(classLoader)) {
@@ -217,7 +219,7 @@ final class JAXBRuntimeHints implements
RuntimeHintsRegistrar {
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
for (Class c : JAXB_ANNOTATIONS) {
hints.reflection().registerType(c,
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
-MemberCategory.INVOKE_DECLARED_METHODS);
+MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.INVOKE_PUBLIC_METHODS);
}
hints.proxies().registerJdkProxy(TypeReference.of(XmlSeeAlso.class),
TypeReference.of("org.glassfish.jaxb.core.v2.model.annotation.Locatable"));
for (String className : NATIVE_PROXY_DEFINITIONS) {
@@ -225,7 +227,8 @@ final class JAXBRuntimeHints implements
RuntimeHintsRegistrar {
}
for (String className : JAXB_RUNTIME_CLASSES) {
hints.reflection().registerTypeIfPresent(classLoader, className,
-MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
MemberCategory.INVOKE_DECLARED_METHODS);
+MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
+MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.INVOKE_PUBLIC_METHODS);
}
// Register the JAXB resource bundles
hints.reflection().registerTypeIfPresent(classLoader,
"jakarta.xml.bind.Messages");
diff --git
a/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
b/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
index 72829dcdef5..280e5b1fef2 100644
---
a/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
+++
b/components-starter/camel-xml-jaxb-starter/src/test/java/org/apache/camel/xml/jaxb/springboot/Book.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.xml.jaxb.springboot;
-import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
(camel-spring-boot) 38/40: Override reactory-netty-http to 1.1.13 (#309)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d7d32d9b8582435257c535b3e3ec49033af3fc9e
Author: Tom Cunningham
AuthorDate: Tue Dec 5 20:13:02 2023 -0500
Override reactory-netty-http to 1.1.13 (#309)
---
pom.xml | 1 +
.../src/main/resources/pom.xml | 6 ++
tooling/redhat-camel-spring-boot-bom/pom.xml| 6 ++
3 files changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index f0f176959fb..4afc2586737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
3.4.1
3.1.2
3.0
+1.1.13
2.2.0
${maven-surefire-plugin-version}
2.1.10
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 50fb912dc3f..0031736cc58 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -129,6 +129,12 @@
logback-core
${logback-version}
+
+
+io.projectreactor.netty
+reactor-netty-http
+${reactor-netty-version}
+
org.apache.tomcat
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 28e57d9c93f..56d5fda0ae1 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -129,6 +129,12 @@
logback-core
1.4.14
+
+
+io.projectreactor.netty
+reactor-netty-http
+1.1.13
+
org.apache.tomcat
(camel-spring-boot) 36/40: CSB-3042: [camel-mail] java.lang.ClassNotFoundException: org.eclipse.angus.mail.imap.IMAPStore
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 181f5e6a8355cfea5e263a0f839c41e46306ff6c
Author: Luigi De Masi
AuthorDate: Tue Dec 5 15:27:36 2023 +0100
CSB-3042: [camel-mail] java.lang.ClassNotFoundException:
org.eclipse.angus.mail.imap.IMAPStore
---
pom.xml| 1 +
.../src/main/resources/pom.xml | 7 +++
tooling/redhat-camel-spring-boot-bom/pom.xml | 7 +++
3 files changed, 15 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3c18aab22b9..ce977d5c8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
1.0.2.v20150114
+2.0.2
2.28.0
1.0.2.Final
1.7.0.Alpha10
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 0ba4d67aa4f..28c4b7a7b4c 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -179,6 +179,13 @@
${elasticsearch-java-client-sniffer-version}
+
+
+org.eclipse.angus
+angus-mail
+${angus-mail-version}
+
+
org.apache.activemq
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 5dedbdf19c1..33329740943 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -179,6 +179,13 @@
8.9.0
+
+
+org.eclipse.angus
+angus-mail
+2.0.2
+
+
org.apache.activemq
(camel-spring-boot) 34/40: Upgrade tomcat to 10.1.16 (#306)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 141a5fa8ddf4bc8083c948720663120bef9e13b1
Author: Tom Cunningham
AuthorDate: Tue Dec 5 10:04:13 2023 -0500
Upgrade tomcat to 10.1.16 (#306)
* Upgrade to spring-boot 3.1.6
* Upgrade tomcat to 10.1.16
---
pom.xml | 4 ++--
tooling/redhat-camel-spring-boot-bom/pom.xml | 16
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1afe19abab8..3c18aab22b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
false
-3.1.5
+3.1.6
4.0.0.redhat-00025
@@ -140,7 +140,7 @@
2.2.0
${maven-surefire-plugin-version}
2.1.10
-10.1.15
+10.1.16
2.7.9
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 839af98c608..5dedbdf19c1 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -117,37 +117,37 @@
org.apache.tomcat
tomcat-annotations-api
-10.1.15
+10.1.16
org.apache.tomcat
tomcat-jdbc
-10.1.15
+10.1.16
org.apache.tomcat
tomcat-jsp-api
-10.1.15
+10.1.16
org.apache.tomcat.embed
tomcat-embed-core
-10.1.15
+10.1.16
org.apache.tomcat.embed
tomcat-embed-el
-10.1.15
+10.1.16
org.apache.tomcat.embed
tomcat-embed-jasper
-10.1.15
+10.1.16
org.apache.tomcat.embed
tomcat-embed-websocket
-10.1.15
+10.1.16
@@ -229,7 +229,7 @@
org.springframework.boot
spring-boot-dependencies
-3.1.5
+3.1.6
pom
import
(camel-spring-boot) 22/40: Change avro version to match camel's avro (1.11.3) (#283)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 4ed54d12f70975d82aa0455f8810a00c5fc9773d Author: Tom Cunningham AuthorDate: Fri Oct 13 06:24:29 2023 -0400 Change avro version to match camel's avro (1.11.3) (#283) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76841209f40..246fecfa397 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.28.0 1.0.2.Final 1.7.0.Alpha10 -1.11.0 +1.11.3 4.0.13 22.3.2 4.0.0
(camel-spring-boot) 19/40: Add a netty-bom override (#277)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7fcf5b2e108d862a683e21bc7a2833b8f4667cf3
Author: Tom Cunningham
AuthorDate: Wed Oct 11 14:35:43 2023 -0400
Add a netty-bom override (#277)
---
components-starter/camel-hl7-starter/src/main/docs/hl7.json| 10 ++
.../src/main/resources/pom.xml | 10 ++
tooling/redhat-camel-spring-boot-bom/pom.xml | 10 ++
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
index 0c26b75a652..d55f4936959 100644
--- a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
+++ b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
@@ -9,7 +9,7 @@
"name": "camel.dataformat.hl7.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
- "sourceMethod": "public
org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon.CustomizerProperties
getCustomizer() "
+ "sourceMethod": "getCustomizer()"
},
{
"name": "camel.language.hl7terser",
@@ -20,7 +20,7 @@
"name": "camel.language.hl7terser.customizer",
"type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
- "sourceMethod": "public
org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon.CustomizerProperties
getCustomizer() "
+ "sourceMethod": "getCustomizer()"
}
],
"properties": [
@@ -39,7 +39,8 @@
"name": "camel.dataformat.hl7.validate",
"type": "java.lang.Boolean",
"description": "Whether to validate the HL7 message Is by default true.",
- "sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration"
+ "sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
+ "defaultValue": true
},
{
"name": "camel.language.hl7terser.customizer.enabled",
@@ -68,7 +69,8 @@
"name": "camel.language.hl7terser.trim",
"type": "java.lang.Boolean",
"description": "Whether to trim the value to remove leading and trailing
whitespaces and line breaks",
- "sourceType":
"org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration"
+ "sourceType":
"org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
+ "defaultValue": true
}
],
"hints": []
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index d77f378a930..f69bc18469f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -68,6 +68,16 @@
+
+
+
+io.netty
+netty-bom
+${netty-version}
+pom
+import
+
+
org.yaml
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 43e35d63f61..f0b0219bbe9 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -68,6 +68,16 @@
+
+
+
+io.netty
+netty-bom
+4.1.96.Final
+pom
+import
+
+
org.yaml
(camel-spring-boot) 09/40: CAMEL-19851: camel-http - Allow to configure timeouts natively (#942)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 84e08db31b298acc66d29fe57dc896772825a9ad
Author: Nicolas Filotto
AuthorDate: Thu Sep 14 21:49:46 2023 +0200
CAMEL-19851: camel-http - Allow to configure timeouts natively (#942)
## Motivation
The timeout can only be configured like any other complex type, indeed, we
need to define a dedicated bean in our Spring context and refer to that bean in
the configuration of our component which could be simplified by supporting
natively timeouts.
## Modifications:
* Add new converters to support natively a timeout in milliseconds
expressed as long, integer, or string
---
.../springboot/HttpComponentTimeoutConverter.java | 60 ++
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 +
.../HttpComponentTimeoutConverterTest.java | 125 +
3 files changed, 186 insertions(+)
diff --git
a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java
b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java
new file mode 100644
index 000..06b9100d584
--- /dev/null
+++
b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentTimeoutConverter.java
@@ -0,0 +1,60 @@
+/*
+ * 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.component.http.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.hc.core5.util.Timeout;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.stereotype.Component;
+
+
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class HttpComponentTimeoutConverter extends HttpComponentConverter {
+
+@Override
+public Set getConvertibleTypes() {
+Set answer = new LinkedHashSet<>();
+answer.add(new ConvertiblePair(Integer.class,
org.apache.hc.core5.util.Timeout.class));
+answer.add(new ConvertiblePair(Long.class,
org.apache.hc.core5.util.Timeout.class));
+answer.add(new ConvertiblePair(String.class,
org.apache.hc.core5.util.Timeout.class));
+return answer;
+}
+
+@Override
+public Object convert(Object source, TypeDescriptor sourceType,
TypeDescriptor targetType) {
+if (source == null) {
+return null;
+}
+if (source instanceof Integer value) {
+return Timeout.ofMilliseconds(value.longValue());
+} else if (source instanceof Long value) {
+return Timeout.ofMilliseconds(value);
+} else if (source instanceof String value) {
+if (value.startsWith("#")) {
+return super.convert(source, sourceType, targetType);
+}
+return Timeout.ofMilliseconds(Long.parseLong(value));
+}
+return null;
+}
+}
diff --git
a/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 29877893b1d..e92fc17e3f3 100644
---
a/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++
b/components-starter/camel-http-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -17,3 +17,4 @@
org.apache.camel.component.http.springboot.HttpComponentConverter
org.apache.camel.component.http.springboot.HttpComponentAutoConfiguration
+org.apache.camel.component.http.springboot.HttpComponentTimeoutConverter
diff --git
(camel-spring-boot) 30/40: Fix CS
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 013945d9850232ad43b287b3c75a8a2c59369bee
Author: Claus Ibsen
AuthorDate: Thu Oct 26 09:42:36 2023 +0200
Fix CS
---
.../org/apache/camel/itest/springboot/util/DependencyResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
index 5b9566d22ec..e140b38d958 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
@@ -151,9 +151,9 @@ public final class DependencyResolver {
}
private static String xpath(File pom, String expression) throws Exception {
-
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true);
-
factory.setFeature("http://xml.org/sax/features/external-general-entities",false);
-
factory.setFeature("http://xml.org/sax/features/external-parameter-entities",false);
+
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl;,
true);
+
factory.setFeature("http://xml.org/sax/features/external-general-entities;,
false);
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities;,
false);
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(pom);
XPath xpath = xPathfactory.newXPath();
(camel-spring-boot) 27/40: Externalize credentials to properties files for SAST tests (#988)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 82b0eabc538cce91b2619c6f5af6ca79f4dda6ca
Author: Tom Cunningham
AuthorDate: Thu Oct 26 03:41:28 2023 -0400
Externalize credentials to properties files for SAST tests (#988)
---
...ptedPropertiesIvGeneratorAutoDetectionTest.java | 18 +---
...ptedPropertiesCustomConfigurationBeansTest.java | 17 ++--
...ertiesDisabledCustomConfigurationBeansTest.java | 2 +-
.../EncryptedPropertiesDisabledTest.java | 2 +-
.../jasypt/springboot/EncryptedPropertiesTest.java | 2 +-
...tBase.java => EncryptedPropertiesTestBase.java} | 2 +-
.../src/test/resources/test.properties | 2 +
.../integration/AbstractMongoDbITSupport.java | 15 +--
.../MongoDbCredentialsFromUriConnectionIT.java | 18
.../meta/integration/MongoDbMetaExtensionIT.java | 26 +++-
.../integration/MongoDbVerifierExtensionIT.java| 48 ++
.../src/test/resources/test.properties | 11 +
.../NettyComponentConfigurationTest.java | 22 +++---
.../nettycomponentconfigurationtest.properties | 1 +
.../salesforce/springboot/RawPayloadTest.java | 19 +++--
.../src/test/resources/rawpayload.properties | 1 +
16 files changed, 144 insertions(+), 62 deletions(-)
diff --git
a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
index 64458ecdc1b..7a20c73717c 100644
---
a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
+++
b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.java
@@ -27,7 +27,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.PrintStream;
+import java.util.Properties;
import static
org.apache.camel.component.jasypt.springboot.JasyptEncryptedPropertiesUtils.isIVNeeded;
import static org.assertj.core.api.Assertions.assertThat;
@@ -41,18 +43,24 @@ public abstract class
AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest {
String stringToEncrypt = "A password-cracker walks into a bar. Orders a
beer. Then a Beer. Then a BEER. beer. b33r. BeeR. Be3r. bEeR. bE3R. BeEr";
-String password = "s0m3R@nD0mP@ssW0rD";
-
-
+//String password = "s0m3R@nD0mP@ssW0rD";
protected String provider;
+public static Properties loadAuthProperties() throws IOException {
+Properties properties = new Properties();
+
properties.load(AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest.class.getClassLoader().getResourceAsStream("test.properties"));
+return properties;
+}
+
@ParameterizedTest
@MethodSource("data")
-public void testEncryptionAndDecryption(String algorithm) {
+public void testEncryptionAndDecryption(String algorithm) throws
IOException {
LOG.info("Testing Algorithm: '{}', requires IV: {}", algorithm,
isIVNeeded(algorithm));
+Properties properties = loadAuthProperties();
+
// Create a ByteArrayOutputStream so that we can get the output
// from the call to print
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -64,7 +72,7 @@ public abstract class
AbstractEncryptedPropertiesIvGeneratorAutoDetectionTest {
environmentStringPBEConfig.setIvGenerator(isIVNeeded(algorithm)?new
RandomIvGenerator():new NoIvGenerator());
environmentStringPBEConfig.setSaltGenerator(new RandomSaltGenerator());
environmentStringPBEConfig.setProviderName(provider);
-environmentStringPBEConfig.setPassword(password);
+
environmentStringPBEConfig.setPassword(properties.getProperty("password"));
StandardPBEStringEncryptor standardPBEStringEncryptor = new
StandardPBEStringEncryptor();
standardPBEStringEncryptor.setConfig(environmentStringPBEConfig);
diff --git
a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java
b/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java
index ccfe835dc28..5250527c6c1 100644
---
a/components-starter/camel-jasypt-starter/src/test/java/org/apache/camel/component/jasypt/springboot/EncryptedPropertiesCustomConfigurationBeansTest.java
(camel-spring-boot) 40/40: Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit f334dab28c12c0b2637115bb7e1139316a213c5e
Author: Tom Cunningham
AuthorDate: Tue Jan 9 11:46:13 2024 -0500
Add dependencyManagement entries for artifacts being overwritten in redhat
BOM (#312)
---
pom.xml| 35 ++
tooling/camel-spring-boot-dependencies/pom.xml | 10
2 files changed, 45 insertions(+)
diff --git a/pom.xml b/pom.xml
index ac8d1735ba8..2aed1249dcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,41 @@
openshift-maven-plugin
${openshift-maven-plugin-version}
+
+
+org.apache.tomcat
+tomcat-catalina
+${tomcat-version}
+
+
+
+io.projectreactor.netty
+reactor-netty-http
+${reactor-netty-version}
+
+
+
+org.json
+json
+${org-json-json-version}
+
+
+
+
+org.apache.activemq
+artemis-commons
+${artemis-version}
+
+
+commons-logging
+commons-logging
+
+
+
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 32e30d69fe0..5d79d0f6416 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4054,6 +4054,11 @@
maven-plugin-annotations
3.6.4
+
+org.apache.tomcat
+tomcat-catalina
+10.1.16
+
org.codehaus.jackson
jackson-core-asl
@@ -4089,6 +4094,11 @@
camel-sap-starter
${project.version}
+
+org.json
+json
+20231013
+
org.xerial.snappy
snappy-java
(camel-spring-boot) 11/40: Regeneration
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 67ad1e95eeed5b2c652194efa36ecfba07788a36 Author: Tom Cunningham AuthorDate: Thu Sep 21 15:33:42 2023 -0400 Regeneration --- tooling/redhat-camel-spring-boot-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml index 87239d9cfb2..f11c251c5ab 100644 --- a/tooling/redhat-camel-spring-boot-bom/pom.xml +++ b/tooling/redhat-camel-spring-boot-bom/pom.xml @@ -152,7 +152,7 @@ org.springframework.boot spring-boot-dependencies -3.1.3 +3.1.4 pom import
(camel-spring-boot) 12/40: Fix archetype pom
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 0aa5bf5a233ce8ab4075a89a739c5bcad33c2671
Author: Marco Carletti
AuthorDate: Mon Sep 25 15:51:08 2023 +0200
Fix archetype pom
---
.../src/main/resources/archetype-resources/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index a76de9c8dc9..8f82c5eaf97 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
UTF-8
17
17
-17
+17
${spring-boot-version}
3.0.0-M4
registry.access.redhat.com/ubi8/openjdk-17:latest
(camel-spring-boot) 33/40: Add repository/pluginRepository entries to archetype (#304)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit be03f72ee6d9786b55b2bc36cf20335dd8be8945 Author: Tom Cunningham AuthorDate: Mon Dec 4 10:18:32 2023 -0500 Add repository/pluginRepository entries to archetype (#304) --- .../src/main/resources/archetype-resources/pom.xml | 28 ++ 1 file changed, 28 insertions(+) diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index 8f82c5eaf97..6ecd7f5e8a4 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -95,6 +95,34 @@ + + + redhat-ga + https://maven.repository.redhat.com/ga/ + Red Hat GA repository + + false + + + true + + + + + + redhat-ga + https://maven.repository.redhat.com/ga/ + Red Hat GA repository + + false + + + true + + + + +
(camel-spring-boot) 08/40: CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT (#945)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ced53451b695e240f76952954fb65bcc6d257717
Author: Nicolas Filotto
AuthorDate: Thu Sep 14 17:48:37 2023 +0200
CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT
(#945)
## Motivation
The test KafkaConsumerHealthCheckIT always fails on the CI.
## Modifications:
* Disable the test as long as it is not fixed
---
.../camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
index 23fc81cc5ff..254e2c574db 100644
---
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
+++
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
@@ -41,6 +41,7 @@ import org.apache.kafka.common.header.internals.RecordHeader;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -68,6 +69,7 @@ import static
org.testcontainers.shaded.org.awaitility.Awaitility.await;
KafkaConsumerHealthCheckIT.TestConfiguration.class,
}
)
+@Disabled("https://issues.apache.org/jira/browse/CAMEL-19854;)
public class KafkaConsumerHealthCheckIT extends BaseEmbeddedKafkaTestSupport {
public static final String TOPIC = "test-health";
(camel-spring-boot) 14/40: Override avro/commons-compress (#273)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7b194c485e6e26a4f86cc497a2748bea24aa8290
Author: Tom Cunningham
AuthorDate: Fri Sep 29 14:14:08 2023 -0400
Override avro/commons-compress (#273)
---
.../src/main/resources/pom.xml | 12
tooling/redhat-camel-spring-boot-bom/pom.xml | 12
2 files changed, 24 insertions(+)
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 4945d735ad2..e1fa685691f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -90,6 +90,18 @@
undertow-servlet
${undertow-version}
+
+
+org.apache.avro
+avro
+${avro-version}
+
+
+
+org.apache.commons
+commons-compress
+${commons-compress-version}
+
org.elasticsearch.client
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index f11c251c5ab..8a5ffad44ee 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -90,6 +90,18 @@
undertow-servlet
2.3.7.Final
+
+
+org.apache.avro
+avro
+1.11.0
+
+
+
+org.apache.commons
+commons-compress
+1.21
+
org.elasticsearch.client
(camel-spring-boot) 31/40: Add snyk file to ignore tests in SAST analysis
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit c36fe3d1d0925e768e8c51618318943c0a8ffc6e Author: Tom Cunningham AuthorDate: Fri Oct 27 10:05:26 2023 -0400 Add snyk file to ignore tests in SAST analysis --- .gitignore | 1 + .snyk | 4 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 5d69a553e4d..513921af691 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ target *.ipr *.iws .idea +.dccache .DS_Store .classpath .ekstazi diff --git a/.snyk b/.snyk new file mode 100644 index 000..cc61c4dc110 --- /dev/null +++ b/.snyk @@ -0,0 +1,4 @@ +exclude: +global: +- "*IT.java" +- "*Test.java"
(camel-spring-boot) 29/40: Add a check for path traversal for SAST tests (#990)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 3c4771821a3a1a82ff8d31f9b9b46349fb5651a5
Author: Tom Cunningham
AuthorDate: Fri Oct 27 07:55:44 2023 -0400
Add a check for path traversal for SAST tests (#990)
---
.../dataformat/zipfile/springboot/ZipFileDataFormatTest.java | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git
a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
index 1e5ddaa0902..63236668b79 100644
---
a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
+++
b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
@@ -368,7 +368,17 @@ public class ZipFileDataFormatTest {
public void process(Exchange exchange) throws
Exception {
ZipFile zfile = new ZipFile(new
File("src/test/resources/hello.odt"));
ZipEntry entry = new ZipEntry((String)
exchange.getIn().getHeader(Exchange.FILE_NAME));
-File file = new File("hello_out",
entry.getName());
+String outputDirectory = "hello_out";
+File file = new File(outputDirectory,
entry.getName());
+
+// Check for Path Traversal
+File destDirectory = new
File(outputDirectory);
+String destCanonicalPath =
destDirectory.getCanonicalPath();
+String outputCanonicalPath =
file.getCanonicalPath();
+if
(!outputCanonicalPath.startsWith(destCanonicalPath)) {
+throw new Exception("Zip path
traversal found, expected " + destCanonicalPath + " but found " +
outputCanonicalPath);
+}
+
if (entry.isDirectory()) {
file.mkdirs();
} else {
(camel-spring-boot) 16/40: Fix typo
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 62f4c1df83f17f7cd7da68c4a6015949f1dbda1a Author: Marco Carletti AuthorDate: Mon Oct 2 16:43:47 2023 +0200 Fix typo --- tooling/redhat-camel-spring-boot-bom/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml index 641d35d7c18..9da59641396 100644 --- a/tooling/redhat-camel-spring-boot-bom/pom.xml +++ b/tooling/redhat-camel-spring-boot-bom/pom.xml @@ -101,6 +101,7 @@ org.apache.commons commons-compress 1.21 + org.xerial.snappy
(camel-spring-boot) 18/40: Provide an override for guava (#276)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 054241d122fc591e8bd1004fdbb229a023d2c569
Author: Tom Cunningham
AuthorDate: Tue Oct 10 09:57:01 2023 -0400
Provide an override for guava (#276)
---
components-starter/camel-hl7-starter/src/main/docs/hl7.json| 10 --
.../src/main/resources/pom.xml | 7 +++
tooling/redhat-camel-spring-boot-bom/pom.xml | 6 ++
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
index d55f4936959..0c26b75a652 100644
--- a/components-starter/camel-hl7-starter/src/main/docs/hl7.json
+++ b/components-starter/camel-hl7-starter/src/main/docs/hl7.json
@@ -9,7 +9,7 @@
"name": "camel.dataformat.hl7.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
- "sourceMethod": "getCustomizer()"
+ "sourceMethod": "public
org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon.CustomizerProperties
getCustomizer() "
},
{
"name": "camel.language.hl7terser",
@@ -20,7 +20,7 @@
"name": "camel.language.hl7terser.customizer",
"type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
- "sourceMethod": "getCustomizer()"
+ "sourceMethod": "public
org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon.CustomizerProperties
getCustomizer() "
}
],
"properties": [
@@ -39,8 +39,7 @@
"name": "camel.dataformat.hl7.validate",
"type": "java.lang.Boolean",
"description": "Whether to validate the HL7 message Is by default true.",
- "sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration",
- "defaultValue": true
+ "sourceType":
"org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration"
},
{
"name": "camel.language.hl7terser.customizer.enabled",
@@ -69,8 +68,7 @@
"name": "camel.language.hl7terser.trim",
"type": "java.lang.Boolean",
"description": "Whether to trim the value to remove leading and trailing
whitespaces and line breaks",
- "sourceType":
"org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration",
- "defaultValue": true
+ "sourceType":
"org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration"
}
],
"hints": []
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index d45914411d5..d77f378a930 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -90,6 +90,12 @@
undertow-servlet
${undertow-version}
+
+
+com.google.guava
+guava
+${guava-version}
+
org.apache.avro
@@ -101,6 +107,7 @@
org.apache.commons
commons-compress
${commons-compress-version}
+
org.xerial.snappy
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 9da59641396..43e35d63f61 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -90,6 +90,12 @@
undertow-servlet
2.3.7.Final
+
+
+com.google.guava
+guava
+32.1.2-jre
+
org.apache.avro
(camel-spring-boot) 06/40: Upgrade to spring-boot 3.1.4 (#953)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 610e2a200f4e0d2a42608979b66ca2afb46b25a4 Author: Tom Cunningham AuthorDate: Thu Sep 21 10:46:18 2023 -0400 Upgrade to spring-boot 3.1.4 (#953) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2e35db5631..76841209f40 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ false -3.1.3 +3.1.4 4.0.0.redhat-00010
(camel-spring-boot) 17/40: Make test compliant with quay mirroring
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 27f63e754faaf168c7dcecb7690a81f90ffd30ac
Author: Marco Carletti
AuthorDate: Wed Oct 4 09:57:34 2023 +0200
Make test compliant with quay mirroring
---
.../camel/component/mongodb/integration/MongoDbFindOperationIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
index 89e037d1c31..bcb21ea8f50 100644
---
a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
+++
b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
@@ -92,7 +92,7 @@ public class MongoDbFindOperationIT {
static {
// This one requires Mongo 4.4. This is related to
// "CAMEL-15604 support allowDiskUse for MongoDB find
operations"
- service = new MongoDBLocalContainerService("mongo:4.4");
+ service = new MongoDBLocalContainerService("library/mongo:4.4");
service.getContainer()
.waitingFor(Wait.forListeningPort())
(camel-spring-boot) 28/40: Set features to DocumentBuilderFactory to protect from XXE; fix for SAST (#989)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 1d525e1dd0ad2e6358071ad8ce9476fa6eb9ba5a
Author: Tom Cunningham
AuthorDate: Thu Oct 26 03:42:11 2023 -0400
Set features to DocumentBuilderFactory to protect from XXE; fix for SAST
(#989)
---
.../org/apache/camel/itest/springboot/util/DependencyResolver.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
index 2b0cbe6e80a..5b9566d22ec 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
@@ -151,6 +151,9 @@ public final class DependencyResolver {
}
private static String xpath(File pom, String expression) throws Exception {
+
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true);
+
factory.setFeature("http://xml.org/sax/features/external-general-entities",false);
+
factory.setFeature("http://xml.org/sax/features/external-parameter-entities",false);
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(pom);
XPath xpath = xPathfactory.newXPath();
(camel-spring-boot) 05/40: Remove camel-jq-starter from list of productized starters; has a -pre… (#266)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 2490746804f9fdfdbafa54f462854b628a2273fe Author: Tom Cunningham AuthorDate: Thu Sep 21 13:35:33 2023 -0400 Remove camel-jq-starter from list of productized starters; has a -pre… (#266) * Remove camel-jq-starter from list of productized starters; has a -preview dependency * Use infinispan 14.0.11.Final --- .mvn/excludes.txt | 1 + .../springboot/catalog/components/aws2-cw.json | 2 +- .../springboot/catalog/components/aws2-ddb.json| 2 +- .../catalog/components/aws2-ddbstream.json | 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../catalog/components/aws2-kinesis.json | 2 +- .../springboot/catalog/components/aws2-lambda.json | 2 +- .../springboot/catalog/components/aws2-s3.json | 2 +- .../springboot/catalog/components/aws2-sns.json| 6 +- .../springboot/catalog/components/aws2-sqs.json| 2 +- .../catalog/components/elasticsearch.json | 65 ++-- .../catalog/components/spring-rabbitmq.json| 19 +- .../cw/springboot/Cw2ComponentConfiguration.java | 2 +- .../ddb/springboot/Ddb2ComponentConfiguration.java | 2 +- .../Ddb2StreamComponentConfiguration.java | 2 +- .../KinesisFirehose2ComponentConfiguration.java| 2 +- .../springboot/Kinesis2ComponentConfiguration.java | 3 +- .../springboot/Lambda2ComponentConfiguration.java | 2 +- .../springboot/AWS2S3ComponentConfiguration.java | 3 +- .../src/main/docs/aws2-sns.json| 4 +- .../sns/springboot/Sns2ComponentConfiguration.java | 14 +- .../sqs/springboot/Sqs2ComponentConfiguration.java | 2 +- .../src/main/docs/elasticsearch.json | 7 + .../ElasticsearchComponentConfiguration.java | 18 + components-starter/pom.xml | 2 +- pom.xml| 4 +- .../required-productized-camel-artifacts.txt | 1 - tooling/camel-spring-boot-bom/pom.xml | 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 406 +++-- 29 files changed, 310 insertions(+), 273 deletions(-) diff --git a/.mvn/excludes.txt b/.mvn/excludes.txt index 8baca1ed84a..d63dbc8873f 100644 --- a/.mvn/excludes.txt +++ b/.mvn/excludes.txt @@ -119,6 +119,7 @@ :camel-jolt-starter :camel-jooq-starter :camel-joor-starter +:camel-jq-starter :camel-js-dsl-starter :camel-jsch-starter :camel-jsh-dsl-starter diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json index 892e3b26f49..374c2132eb4 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-cw.json @@ -3,7 +3,7 @@ "kind": "component", "name": "aws2-cw", "title": "AWS CloudWatch", -"description": "Sending metrics to AWS CloudWatch using AWS SDK version 2.x.", +"description": "Sending metrics to AWS CloudWatch.", "deprecated": false, "firstVersion": "3.1.0", "label": "cloud,monitoring", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json index 01e8cb7ad48..4f4cd76bbfc 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json @@ -3,7 +3,7 @@ "kind": "component", "name": "aws2-ddb", "title": "AWS DynamoDB", -"description": "Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.", +"description": "Store and retrieve data from AWS DynamoDB.", "deprecated": false, "firstVersion": "3.1.0", "label": "cloud,database", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json index 775eac03033..e10b8d8488d 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddbstream.json +++
(camel-spring-boot) 13/40: Disables failing tests
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9188e68c57cd9ab7f9b7d0841fff33e3d46b7776
Author: Marco Carletti
AuthorDate: Tue Sep 26 15:23:31 2023 +0200
Disables failing tests
---
.../java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java | 2 ++
.../org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java | 2 ++
2 files changed, 4 insertions(+)
diff --git
a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
index 94b3fdc3d81..e67a9793819 100644
---
a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
+++
b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamTest.java
@@ -33,6 +33,7 @@ import
org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -62,6 +63,7 @@ import static org.awaitility.Awaitility.await;
Ddb2StreamTest.TestConfiguration.class
}
)
+@Disabled
class Ddb2StreamTest extends BaseDdb2{
private final static String tableName = "TestTable";
diff --git
a/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
b/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
index b7ed80465ca..55f1784d0a2 100644
---
a/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
+++
b/components-starter/camel-aws2-kinesis-starter/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentTest.java
@@ -27,6 +27,7 @@ import
org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -45,6 +46,7 @@ import
software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;
KinesisComponentTest.TestConfiguration.class
}
)
+@Disabled("API rate limit exceeded")
public class KinesisComponentTest extends BaseKinesis {
@EndpointInject("mock:result")
(camel-spring-boot) 24/40: Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ddf1d708ad449d3269971acd8faadf6bd841b187
Author: Tom Cunningham
AuthorDate: Thu Oct 19 15:10:15 2023 -0400
Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287)
---
pom.xml | 4 ++--
tooling/redhat-camel-spring-boot-bom/pom.xml | 16
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 55b1dee7a01..1afe19abab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
false
-3.1.4
+3.1.5
4.0.0.redhat-00025
@@ -140,7 +140,7 @@
2.2.0
${maven-surefire-plugin-version}
2.1.10
-10.1.14
+10.1.15
2.7.9
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index a0d9e74d5ae..839af98c608 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -117,37 +117,37 @@
org.apache.tomcat
tomcat-annotations-api
-10.1.14
+10.1.15
org.apache.tomcat
tomcat-jdbc
-10.1.14
+10.1.15
org.apache.tomcat
tomcat-jsp-api
-10.1.14
+10.1.15
org.apache.tomcat.embed
tomcat-embed-core
-10.1.14
+10.1.15
org.apache.tomcat.embed
tomcat-embed-el
-10.1.14
+10.1.15
org.apache.tomcat.embed
tomcat-embed-jasper
-10.1.14
+10.1.15
org.apache.tomcat.embed
tomcat-embed-websocket
-10.1.14
+10.1.15
@@ -229,7 +229,7 @@
org.springframework.boot
spring-boot-dependencies
-3.1.4
+3.1.5
pom
import
(camel-spring-boot) 21/40: CAMEL-19955: Review the usage of Protostream
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 267ca0d51fc6556240961ecc16d1f0d0a5be2b5a
Author: Croway
AuthorDate: Thu Oct 12 14:17:06 2023 +0200
CAMEL-19955: Review the usage of Protostream
---
components-starter/camel-infinispan-starter/pom.xml | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-infinispan-starter/pom.xml
b/components-starter/camel-infinispan-starter/pom.xml
index 52ecd5bc484..95d4c20d077 100644
--- a/components-starter/camel-infinispan-starter/pom.xml
+++ b/components-starter/camel-infinispan-starter/pom.xml
@@ -93,15 +93,15 @@
test
- org.infinispan.protostream
- sample-domain-definition
- ${protostream-version}
+ org.infinispan
+ proto-sample-domain-definition
+ ${infinispan-version}
test
- org.infinispan.protostream
- sample-domain-implementation
- ${protostream-version}
+ org.infinispan
+ proto-sample-domain-implementation
+ ${infinispan-version}
test
(camel-spring-boot) 07/40: CAMEL-19869: camel-infinispan - Disable failing ITs (#944)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9ac3cb0e88ba5efcfb0425eb96a99899e30fc046
Author: Nicolas Filotto
AuthorDate: Thu Sep 14 14:19:53 2023 +0200
CAMEL-19869: camel-infinispan - Disable failing ITs (#944)
## Motivation
The integration tests `InfinispanRemoteAggregationRepositoryIT` and
`InfinispanRemoteAggregationRepositoryOperationsIT` are failing on the CI.
## Modifications:
* Disable the integration tests as long as they are not fixed
---
.../infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java | 2 ++
.../remote/InfinispanRemoteAggregationRepositoryOperationsIT.java | 2 ++
2 files changed, 4 insertions(+)
diff --git
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
index ed2ebd038e6..ab6e99084d9 100644
---
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
+++
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java
@@ -21,6 +21,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,7 @@ import org.springframework.test.annotation.DirtiesContext;
InfinispanRemoteAggregationRepositoryIT.class
}
)
+@Disabled("https://issues.apache.org/jira/browse/CAMEL-19869;)
public class InfinispanRemoteAggregationRepositoryIT extends
InfinispanRemoteTestSupport {
public static final int COMPLETION_SIZE = 4;
public static final String CORRELATOR_HEADER = "CORRELATOR_HEADER";
diff --git
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
index a9b26fb716a..eb6fbc3bf71 100644
---
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
+++
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java
@@ -26,6 +26,7 @@ import
org.apache.camel.test.spring.junit5.CamelSpringBootTest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,6 +47,7 @@ import org.springframework.test.annotation.DirtiesContext;
InfinispanRemoteAggregationRepositoryOperationsIT.class
}
)
+@Disabled("https://issues.apache.org/jira/browse/CAMEL-19869;)
public class InfinispanRemoteAggregationRepositoryOperationsIT extends
InfinispanRemoteTestSupport {
private static InfinispanRemoteAggregationRepository aggregationRepository;
(camel-spring-boot) 10/40: [CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit aef47c69e5fd02111753550a8dfc95c63373d2eb
Author: Freeman Fang
AuthorDate: Tue Sep 19 10:10:04 2023 -0400
[CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now
(cherry picked from commit 8e516b9e612d3669ff69d3aaab14510599cd18f6)
---
.../camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
index 254e2c574db..23fc81cc5ff 100644
---
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
+++
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
@@ -41,7 +41,6 @@ import org.apache.kafka.common.header.internals.RecordHeader;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -69,7 +68,6 @@ import static
org.testcontainers.shaded.org.awaitility.Awaitility.await;
KafkaConsumerHealthCheckIT.TestConfiguration.class,
}
)
-@Disabled("https://issues.apache.org/jira/browse/CAMEL-19854;)
public class KafkaConsumerHealthCheckIT extends BaseEmbeddedKafkaTestSupport {
public static final String TOPIC = "test-health";
(camel-spring-boot) 15/40: Add snappy-java override (#272)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e27fedc5813efee085c3afbcab8d3ea7229deb1c
Author: Tom Cunningham
AuthorDate: Fri Sep 29 14:16:41 2023 -0400
Add snappy-java override (#272)
---
.../src/main/resources/pom.xml | 5 +
tooling/redhat-camel-spring-boot-bom/pom.xml | 5 +
2 files changed, 10 insertions(+)
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index e1fa685691f..d45914411d5 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -101,6 +101,11 @@
org.apache.commons
commons-compress
${commons-compress-version}
+
+
+org.xerial.snappy
+snappy-java
+${snappy-java-version}
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 8a5ffad44ee..641d35d7c18 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -101,6 +101,11 @@
org.apache.commons
commons-compress
1.21
+
+
+org.xerial.snappy
+snappy-java
+${snappy-java-version}
(camel-spring-boot) 25/40: [infinispan] Client property configurable in tests (#995)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit a4218590f230278963af4bf97d32a9b451251f0b
Author: Marco Carletti
AuthorDate: Fri Nov 3 10:43:04 2023 +0100
[infinispan] Client property configurable in tests (#995)
---
.../remote/InfinispanRemoteConfigurationIT.java| 4 +-
.../remote/InfinispanRemoteTestSupport.java| 4 +-
.../InfinispanRemoteClusteredTestSupport.java | 52 ++
3 files changed, 29 insertions(+), 31 deletions(-)
diff --git
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
index f65c92fdc12..15c811b3312 100644
---
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
+++
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.infinispan.remote;
+import static
org.apache.camel.component.infinispan.remote.InfinispanRemoteTestSupport.CLIENT_INTELLIGENCE_BASIC;
+
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import
org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
@@ -59,7 +61,7 @@ public class InfinispanRemoteConfigurationIT {
configuration.setSecurityServerName("infinispan");
configuration.setSaslMechanism("DIGEST-MD5");
configuration.setSecurityRealm("default");
- if (SystemUtils.IS_OS_MAC) {
+ if (CLIENT_INTELLIGENCE_BASIC) {
configuration.addConfigurationProperty(
"infinispan.client.hotrod.client_intelligence", "BASIC");
}
diff --git
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
index 4d0bbec4f29..17cce5a55e6 100644
---
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
+++
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
@@ -49,6 +49,8 @@ public class InfinispanRemoteTestSupport {
public static InfinispanService service =
InfinispanServiceFactory.createService();
protected static RemoteCacheManager cacheContainer;
+ public static final boolean CLIENT_INTELLIGENCE_BASIC =
SystemUtils.IS_OS_MAC ||
Boolean.parseBoolean(System.getProperty("infinispan.client_intelligence.basic",
"false"));
+
@Autowired
ProducerTemplate template;
@@ -133,7 +135,7 @@ public class InfinispanRemoteTestSupport {
.saslMechanism("DIGEST-MD5")
.realm("default");
- if (SystemUtils.IS_OS_MAC) {
+ if (CLIENT_INTELLIGENCE_BASIC) {
Properties properties = new Properties();
properties.put("infinispan.client.hotrod.client_intelligence", "BASIC");
clientBuilder.withProperties(properties);
diff --git
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
index 6b3da5d6c5e..54c65d3abfa 100644
---
a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
+++
b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.infinispan.remote.cluster;
+import static
org.apache.camel.component.infinispan.remote.InfinispanRemoteTestSupport.CLIENT_INTELLIGENCE_BASIC;
+
import java.util.Properties;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
@@ -24,43 +26,35 @@ import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.Configuration;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
(camel-spring-boot) 04/40: Remove compiler plugin from archetype
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 54857d93274c5825514380ebad49f4824af09c52
Author: Croway
AuthorDate: Thu Sep 21 12:19:26 2023 +0200
Remove compiler plugin from archetype
---
.../src/main/resources/archetype-resources/pom.xml| 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index 2c951d8fa01..a76de9c8dc9 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -30,6 +30,9 @@
UTF-8
UTF-8
+17
+17
+17
${spring-boot-version}
3.0.0-M4
registry.access.redhat.com/ubi8/openjdk-17:latest
@@ -94,14 +97,6 @@
-
-org.apache.maven.plugins
-maven-compiler-plugin
-${maven-compiler-plugin-version}
-
- 17
-
-
org.springframework.boot
spring-boot-maven-plugin
(camel-spring-boot) 20/40: Add override for the jetty-bom (#280)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c2df983a1d591a725d0cc1ed5dec3e27eb6b37ae
Author: Tom Cunningham
AuthorDate: Wed Oct 11 16:14:19 2023 -0400
Add override for the jetty-bom (#280)
---
.../src/main/resources/pom.xml | 7 +++
tooling/redhat-camel-spring-boot-bom/pom.xml | 7 +++
2 files changed, 14 insertions(+)
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index f69bc18469f..f755089b317 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -77,6 +77,13 @@
pom
import
+
+org.eclipse.jetty
+jetty-bom
+${jetty-version}
+pom
+import
+
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index f0b0219bbe9..32b62fab04a 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -77,6 +77,13 @@
pom
import
+
+org.eclipse.jetty
+jetty-bom
+11.0.15
+pom
+import
+
(camel-spring-boot) branch camel-spring-boot-4.0.0-branch updated (bdac313dec9 -> f334dab28c1)
This is an automated email from the ASF dual-hosted git repository. fmariani pushed a change to branch camel-spring-boot-4.0.0-branch in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from bdac313dec9 Upgrade failing test to FHIR 6.6.1 (#931) new 65a1a102412 Override infinispan-bom new e997a5ea288 Added omp dependency for PME alignment. new 2590207ba8b Disable artifacts tests (#267) new 54857d93274 Remove compiler plugin from archetype new 2490746804f Remove camel-jq-starter from list of productized starters; has a -pre… (#266) new 610e2a200f4 Upgrade to spring-boot 3.1.4 (#953) new 9ac3cb0e88b CAMEL-19869: camel-infinispan - Disable failing ITs (#944) new ced53451b69 CAMEL-19854: camel-kafka - Disable the test KafkaConsumerHealthCheckIT (#945) new 84e08db31b2 CAMEL-19851: camel-http - Allow to configure timeouts natively (#942) new aef47c69e5f [CAMEL-19854]re-enable KafkaConsumerHealthCheckIT as it's OK now new 67ad1e95eee Regeneration new 0aa5bf5a233 Fix archetype pom new 9188e68c57c Disables failing tests new 7b194c485e6 Override avro/commons-compress (#273) new e27fedc5813 Add snappy-java override (#272) new 62f4c1df83f Fix typo new 27f63e754fa Make test compliant with quay mirroring new 054241d122f Provide an override for guava (#276) new 7fcf5b2e108 Add a netty-bom override (#277) new c2df983a1d5 Add override for the jetty-bom (#280) new 267ca0d51fc CAMEL-19955: Review the usage of Protostream new 4ed54d12f70 Change avro version to match camel's avro (1.11.3) (#283) new 2faa5c55306 Override tomcat version coming in from sb to 10.1.14 (#284) new ddf1d708ad4 Upgrade spring-boot to 3.1.5, align tomcat with spring-boot (#287) new a4218590f23 [infinispan] Client property configurable in tests (#995) new 1ac17b0257b Externalize passwords into properties files, set features to DocumentBuilderFactory (#986) new 82b0eabc538 Externalize credentials to properties files for SAST tests (#988) new 1d525e1dd0a Set features to DocumentBuilderFactory to protect from XXE; fix for SAST (#989) new 3c4771821a3 Add a check for path traversal for SAST tests (#990) new 013945d9850 Fix CS new c36fe3d1d09 Add snyk file to ignore tests in SAST analysis new 478f4f373fc fix: Adapt JAXBRuntimeHints to the behavior change in Spring 6.0.13 (#984) (#291) new be03f72ee6d Add repository/pluginRepository entries to archetype (#304) new 141a5fa8ddf Upgrade tomcat to 10.1.16 (#306) new ad45178c4a4 Upgrade to spring-boot 3.1.6 (#305) new 181f5e6a835 CSB-3042: [camel-mail] java.lang.ClassNotFoundException: org.eclipse.angus.mail.imap.IMAPStore new 922dab1fd82 Override logback to 1.4.14 (#308) new d7d32d9b858 Override reactory-netty-http to 1.1.13 (#309) new e3a84a1d41c Override version of org.json:json - need a newer version than the one coming in from spring boot (#311) new f334dab28c1 Add dependencyManagement entries for artifacts being overwritten in redhat BOM (#312) The 40 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: .gitignore | 1 + .mvn/excludes.txt | 1 + .snyk | 4 + Jenkinsfile.redhat | 2 +- .../src/main/resources/archetype-resources/pom.xml | 39 +- archetypes/pom.xml | 2 +- .../springboot/catalog/components/aws2-cw.json | 2 +- .../springboot/catalog/components/aws2-ddb.json| 2 +- .../catalog/components/aws2-ddbstream.json | 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../catalog/components/aws2-kinesis.json | 2 +- .../springboot/catalog/components/aws2-lambda.json | 2 +- .../springboot/catalog/components/aws2-s3.json | 2 +- .../springboot/catalog/components/aws2-sns.json| 6 +- .../springboot/catalog/components/aws2-sqs.json| 2 +- .../catalog/components/elasticsearch.json | 65 ++-- .../camel/springboot/catalog/components/kafka.json | 8 +- .../catalog/components/spring-rabbitmq.json| 19 +- .../cw/springboot/Cw2ComponentConfiguration.java | 2 +- .../ddb/springboot/Ddb2ComponentConfiguration.java | 2 +- .../Ddb2StreamComponentConfiguration.java | 2 +- .../component/aws2/ddbstream/Ddb2StreamTest.java | 2 + .../KinesisFirehose2ComponentConfiguration.java| 2 +- .../springboot/Kinesis2ComponentConfiguration.java | 3 +- .../aws2/kinesis/KinesisComponentTest.java | 2 + .../springboot/Lambda2ComponentConfiguration.java | 2 +-
(camel-spring-boot) 03/40: Disable artifacts tests (#267)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2590207ba8bcfa0ea37117acb57698467b86b956
Author: Tom Cunningham
AuthorDate: Thu Sep 21 05:53:53 2023 -0400
Disable artifacts tests (#267)
* Disable artifacts tests
* Set activeByDefault
---
Jenkinsfile.redhat | 2 +-
archetypes/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.redhat b/Jenkinsfile.redhat
index 8544fb514f2..51d09da97b3 100644
--- a/Jenkinsfile.redhat
+++ b/Jenkinsfile.redhat
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-def MAVEN_PARAMS = '-B -e -ntp -s $MAVEN_SETTINGS
-Darchetype.test.settingsFile=$MAVEN_SETTINGS -Djava.net.preferIPv4Stack=true'
+def MAVEN_PARAMS = '-B -e -ntp -s $MAVEN_SETTINGS -Parchetypes-skip-tests
-Djava.net.preferIPv4Stack=true'
pipeline {
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 4c01fa45ba9..2020d978d3a 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -41,7 +41,7 @@
archetypes-skip-tests
-skipTests
+true
true
(camel-spring-boot) 01/40: Override infinispan-bom
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 65a1a102412c4b0eb8578bbffe45828a6fba031d
Author: Croway
AuthorDate: Mon Sep 18 10:48:48 2023 +0200
Override infinispan-bom
---
.../src/main/resources/pom.xml | 7 +++
tooling/redhat-camel-spring-boot-bom/pom.xml | 7 +++
2 files changed, 14 insertions(+)
diff --git
a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index 898f178c168..4945d735ad2 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -141,6 +141,13 @@
+
+org.infinispan
+infinispan-bom
+${infinispan-version}
+pom
+import
+
org.springframework.boot
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml
b/tooling/redhat-camel-spring-boot-bom/pom.xml
index fbd9d154744..87239d9cfb2 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -141,6 +141,13 @@
+
+org.infinispan
+infinispan-bom
+14.0.11.Final
+pom
+import
+
org.springframework.boot
(camel-spring-boot) 02/40: Added omp dependency for PME alignment.
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e997a5ea288dc2134da7ee12c735f7e80fda3099
Author: Vaishnavi R
AuthorDate: Wed Sep 20 16:22:21 2023 +0530
Added omp dependency for PME alignment.
---
pom.xml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index 72c21958df7..b38867445ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,13 @@
camel-sap
${camel-sap.version}
+
+
+org.eclipse.jkube
+openshift-maven-plugin
+${openshift-maven-plugin-version}
+
[I] Include the operator node-selector in thet helm charts [camel-k]
lsergio opened a new issue, #5103: URL: https://github.com/apache/camel-k/issues/5103 ### Requirement The kamel cli has the `--node-selector` option, but there's not such an option in the helm template (https://github.com/apache/camel-k/blob/main/helm/camel-k/templates/operator.yaml). My idea is to add this option to the yaml file. ### Problem It blocks me from using helm to install Camel K as I'm using then node selector option. ### Proposal Add the node Selector as optional parameter to the chart template. ### Open questions _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kamelets) branch regen_bot updated (d5ff9309 -> 4cac12fc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from d5ff9309 Move to Camel 4.4.0-SNAPSHOT add f486a080 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink add 6670ca54 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink add ca421dc7 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source add 4cac12fc Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source No new revisions were added by this update. Summary of changes: kamelets/azure-eventhubs-sink.kamelet.yaml | 17 + kamelets/azure-eventhubs-source.kamelet.yaml| 17 + .../kamelets/azure-eventhubs-sink.kamelet.yaml | 17 + .../kamelets/azure-eventhubs-source.kamelet.yaml| 17 + 4 files changed, 52 insertions(+), 16 deletions(-)
(camel-kamelets) branch kamelets-1805-eventhubs deleted (was b1ab8222)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kamelets-1805-eventhubs in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was b1ab8222 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source 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-kamelets) 03/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit ca421dc7753e7b2f417e6695cedb11ac3ee88ca9
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:36:27 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Source
Signed-off-by: Andrea Cosentino
---
kamelets/azure-eventhubs-source.kamelet.yaml | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/kamelets/azure-eventhubs-source.kamelet.yaml
b/kamelets/azure-eventhubs-source.kamelet.yaml
index 25297d27..e12220be 100644
--- a/kamelets/azure-eventhubs-source.kamelet.yaml
+++ b/kamelets/azure-eventhubs-source.kamelet.yaml
@@ -33,11 +33,13 @@ spec:
title: "Azure Eventhubs Source"
description: |-
Receive events from Azure Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
- blobAccountName
- blobAccessKey
- blobContainerName
@@ -79,6 +81,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
types:
out:
mediaType: application/octet-stream
@@ -90,10 +98,11 @@ spec:
from:
uri: 'azure-eventhubs://{{namespaceName}}/{{eventhubName}}'
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
blobAccountName: "{{blobAccountName}}"
blobAccessKey: "{{blobAccessKey}}"
blobContainerName: "{{blobContainerName}}"
+credentialType: "{{credentialType}}"
steps:
- to: "kamelet:sink"
(camel-kamelets) 02/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 6670ca5496eb566aaa870c8284ac415cdef6796a
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:34:20 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Sink
Signed-off-by: Andrea Cosentino
---
.../kamelets/azure-eventhubs-sink.kamelet.yaml | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
index 15ff0924..e87cb0fb 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
@@ -37,11 +37,13 @@ spec:
The Kamelet checks for the `partition-id` / `ce-partition-id` header
which is an identifier of the Event Hub partition that the event will be sent
to. If the identifier is not specified, the Event Hubs service will be
responsible for routing events that are sent to an available partition.
A header is optional. If the header is not set, the partition is
assigned by Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
type: object
properties:
namespaceName:
@@ -65,6 +67,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
dependencies:
- "camel:core"
- "camel:azure-eventhubs"
@@ -88,5 +96,6 @@ spec:
- to:
uri: "azure-eventhubs://{{namespaceName}}/{{eventhubName}}"
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
+credentialType: "{{credentialType}}"
(camel-kamelets) 01/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit f486a080e1b4777e6dd4ac4640787b8040cc55cf
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:33:15 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Sink
Signed-off-by: Andrea Cosentino
---
kamelets/azure-eventhubs-sink.kamelet.yaml | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/kamelets/azure-eventhubs-sink.kamelet.yaml
b/kamelets/azure-eventhubs-sink.kamelet.yaml
index 15ff0924..e87cb0fb 100644
--- a/kamelets/azure-eventhubs-sink.kamelet.yaml
+++ b/kamelets/azure-eventhubs-sink.kamelet.yaml
@@ -37,11 +37,13 @@ spec:
The Kamelet checks for the `partition-id` / `ce-partition-id` header
which is an identifier of the Event Hub partition that the event will be sent
to. If the identifier is not specified, the Event Hubs service will be
responsible for routing events that are sent to an available partition.
A header is optional. If the header is not set, the partition is
assigned by Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
type: object
properties:
namespaceName:
@@ -65,6 +67,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
dependencies:
- "camel:core"
- "camel:azure-eventhubs"
@@ -88,5 +96,6 @@ spec:
- to:
uri: "azure-eventhubs://{{namespaceName}}/{{eventhubName}}"
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
+credentialType: "{{credentialType}}"
(camel-kamelets) 04/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 4cac12fc305cb61404fc5f16ec895be55a1b1de8
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:37:11 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Source
Signed-off-by: Andrea Cosentino
---
.../kamelets/azure-eventhubs-source.kamelet.yaml| 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
index 25297d27..e12220be 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
@@ -33,11 +33,13 @@ spec:
title: "Azure Eventhubs Source"
description: |-
Receive events from Azure Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
- blobAccountName
- blobAccessKey
- blobContainerName
@@ -79,6 +81,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
types:
out:
mediaType: application/octet-stream
@@ -90,10 +98,11 @@ spec:
from:
uri: 'azure-eventhubs://{{namespaceName}}/{{eventhubName}}'
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
blobAccountName: "{{blobAccountName}}"
blobAccessKey: "{{blobAccessKey}}"
blobContainerName: "{{blobContainerName}}"
+credentialType: "{{credentialType}}"
steps:
- to: "kamelet:sink"
(camel-kamelets) branch main updated (d5ff9309 -> 4cac12fc)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from d5ff9309 Move to Camel 4.4.0-SNAPSHOT new f486a080 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink new 6670ca54 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink new ca421dc7 Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source new 4cac12fc Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source The 4 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: kamelets/azure-eventhubs-sink.kamelet.yaml | 17 + kamelets/azure-eventhubs-source.kamelet.yaml| 17 + .../kamelets/azure-eventhubs-sink.kamelet.yaml | 17 + .../kamelets/azure-eventhubs-source.kamelet.yaml| 17 + 4 files changed, 52 insertions(+), 16 deletions(-)
Re: [PR] Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs [camel-kamelets]
oscerd merged PR #1851: URL: https://github.com/apache/camel-kamelets/pull/1851 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kamelets) 03/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Source
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kamelets-1805-eventhubs
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit ad65c7e04ba162d5f84deff2ca6a167c50824024
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:36:27 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Source
Signed-off-by: Andrea Cosentino
---
kamelets/azure-eventhubs-source.kamelet.yaml | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/kamelets/azure-eventhubs-source.kamelet.yaml
b/kamelets/azure-eventhubs-source.kamelet.yaml
index 25297d27..e12220be 100644
--- a/kamelets/azure-eventhubs-source.kamelet.yaml
+++ b/kamelets/azure-eventhubs-source.kamelet.yaml
@@ -33,11 +33,13 @@ spec:
title: "Azure Eventhubs Source"
description: |-
Receive events from Azure Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
- blobAccountName
- blobAccessKey
- blobContainerName
@@ -79,6 +81,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
types:
out:
mediaType: application/octet-stream
@@ -90,10 +98,11 @@ spec:
from:
uri: 'azure-eventhubs://{{namespaceName}}/{{eventhubName}}'
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
blobAccountName: "{{blobAccountName}}"
blobAccessKey: "{{blobAccessKey}}"
blobContainerName: "{{blobContainerName}}"
+credentialType: "{{credentialType}}"
steps:
- to: "kamelet:sink"
(camel-kamelets) 02/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kamelets-1805-eventhubs
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 8db21539e51ef3b323cb6b696065e8000975b30d
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:34:20 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Sink
Signed-off-by: Andrea Cosentino
---
.../kamelets/azure-eventhubs-sink.kamelet.yaml | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
index 15ff0924..e87cb0fb 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml
@@ -37,11 +37,13 @@ spec:
The Kamelet checks for the `partition-id` / `ce-partition-id` header
which is an identifier of the Event Hub partition that the event will be sent
to. If the identifier is not specified, the Event Hubs service will be
responsible for routing events that are sent to an available partition.
A header is optional. If the header is not set, the partition is
assigned by Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
type: object
properties:
namespaceName:
@@ -65,6 +67,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
dependencies:
- "camel:core"
- "camel:azure-eventhubs"
@@ -88,5 +96,6 @@ spec:
- to:
uri: "azure-eventhubs://{{namespaceName}}/{{eventhubName}}"
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
+credentialType: "{{credentialType}}"
(camel-kamelets) 01/04: Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs Sink
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kamelets-1805-eventhubs
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 587bb00a0c093b8f9568cab271ce753d3726c9ad
Author: Andrea Cosentino
AuthorDate: Thu Jan 25 13:33:15 2024 +0100
Azure Kamelets: Reflect changes coming from CAMEL-18590 - Azure Eventhubs
Sink
Signed-off-by: Andrea Cosentino
---
kamelets/azure-eventhubs-sink.kamelet.yaml | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/kamelets/azure-eventhubs-sink.kamelet.yaml
b/kamelets/azure-eventhubs-sink.kamelet.yaml
index 15ff0924..e87cb0fb 100644
--- a/kamelets/azure-eventhubs-sink.kamelet.yaml
+++ b/kamelets/azure-eventhubs-sink.kamelet.yaml
@@ -37,11 +37,13 @@ spec:
The Kamelet checks for the `partition-id` / `ce-partition-id` header
which is an identifier of the Event Hub partition that the event will be sent
to. If the identifier is not specified, the Event Hubs service will be
responsible for routing events that are sent to an available partition.
A header is optional. If the header is not set, the partition is
assigned by Event Hubs.
+
+ There are two different mechanism of authentication `CONNECTION_STRING`
and `AZURE_IDENTITY`, you could specify with credentialType property. If you're
using `CONNECTION_STRING` sharedAccessName and sharedAccessKey properties will
be needed.
+
+ In case of `AZURE_IDENTITY` selection, the DefaultAzureCredential will
attempt to authenticate via the following mechanisms in the following order
enviroment, Workload Identity, Managed Identity, Azure Developer CLI, IntelliJ,
Azure CLI and Azure Powershell.
required:
- namespaceName
- eventhubName
- - sharedAccessName
- - sharedAccessKey
type: object
properties:
namespaceName:
@@ -65,6 +67,12 @@ spec:
format: password
x-descriptors:
- urn:camel:group:credentials
+ credentialType:
+title: Credential Type
+description: Determines the credential strategy to adopt.
+type: string
+enum: ["CONNECTION_STRING", "AZURE_IDENTITY"]
+default: "CONNECTION_STRING"
dependencies:
- "camel:core"
- "camel:azure-eventhubs"
@@ -88,5 +96,6 @@ spec:
- to:
uri: "azure-eventhubs://{{namespaceName}}/{{eventhubName}}"
parameters:
-sharedAccessName: "{{sharedAccessName}}"
-sharedAccessKey: "{{sharedAccessKey}}"
+sharedAccessName: "{{?sharedAccessName}}"
+sharedAccessKey: "{{?sharedAccessKey}}"
+credentialType: "{{credentialType}}"
