(camel) branch regen_bot updated (25ce112d80e -> ed970335099)
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 25ce112d80e (chores) camel-core-base-engine: remove unused dependencies add ed970335099 Regen No new revisions were added by this update. Summary of changes: .../builder/component/dsl/SalesforceComponentBuilderFactory.java| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(camel) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ed970335099 Regen
ed970335099 is described below
commit ed9703350998704c27c0c06413e3850c1a94c149
Author: Claus Ibsen
AuthorDate: Thu May 16 07:34:31 2024 +0200
Regen
---
.../builder/component/dsl/SalesforceComponentBuilderFactory.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
index 3de7a20ba21..d2c4ca5679a 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
@@ -1386,9 +1386,9 @@ public interface SalesforceComponentBuilderFactory {
/**
* Explicit authentication method to be used, one of USERNAME_PASSWORD,
- * REFRESH_TOKEN or JWT. Salesforce component can auto-determine the
- * authentication method to use from the properties set, set this
- * property to eliminate any ambiguity.
+ * REFRESH_TOKEN, CLIENT_CREDENTIALS, or JWT. Salesforce component can
+ * auto-determine the authentication method to use from the properties
+ * set, set this property to eliminate any ambiguity.
*
* The option is a:
*
codeorg.apache.camel.component.salesforce.AuthenticationType/code
type.
Re: [PR] CAMEL-20773: camel-health - Consumer health checks should be skipped … [camel]
github-actions[bot] commented on PR #14164: URL: https://github.com/apache/camel/pull/14164#issuecomment-2114057412 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20773: camel-health - Consumer health checks should be skipped … [camel]
davsclaus opened a new pull request, #14164: URL: https://github.com/apache/camel/pull/14164 …for non autoStartup routes # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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 hc-consumer-autostartup created (now a025c495cc2)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hc-consumer-autostartup in repository https://gitbox.apache.org/repos/asf/camel.git at a025c495cc2 CAMEL-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes This branch includes the following new commits: new a025c495cc2 CAMEL-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch hc-consumer-autostartup
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a025c495cc220fb3cf5c6fff64651eea10f8e17a
Author: Claus Ibsen
AuthorDate: Thu May 16 07:26:39 2024 +0200
CAMEL-20773: camel-health - Consumer health checks should be skipped for
non autoStartup routes
---
.../java/org/apache/camel/impl/health/ConsumerHealthCheck.java| 4 +++-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc| 8
docs/user-manual/modules/ROOT/pages/health-check.adoc | 5 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git
a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
index 988b6a03672..bbb112111c4 100644
---
a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
+++
b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
@@ -48,7 +48,9 @@ public class ConsumerHealthCheck extends RouteHealthCheck {
protected void doCallCheck(HealthCheckResultBuilder builder, Map options) {
// only need to do consumer check if the route is UP
boolean up = builder.state().compareTo(State.UP) == 0;
-if (up && consumer instanceof HealthCheckAware) {
+// if a route is configured to not to automatically start, then skip
consumer checks
+boolean external = route.getRouteController() == null &&
!route.isAutoStartup();
+if (up && !external && consumer instanceof HealthCheckAware) {
// health check is optional
HealthCheck hc = ((HealthCheckAware) consumer).getHealthCheck();
if (hc != null) {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
index 14d8478abed..8d6c3bc79db 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
@@ -13,6 +13,14 @@ Add default values to `ThrottlingExceptionRoutePolicy` route
policy.
The `EndpointRegistry` interface has been slightly changed to now directly
extends `Map`
instead of being a parameterized type. This may cause some compilation
failures if the code is declaring a variable for the registry.
+=== camel-health
+
+Routes which has are set to **not** auto-startup are reported as UP in
health-checks.
+We have now implemented similar logic for the consumer health check as well
(the route and consumer health check are linked together).
+
+Previously a route that has not been started due to `auto-startup=false` would
still have its consumer health-check being executed,
+which could lead to DOWN due to consumer failing the check.
+
=== DSL
The Load Balancer EIP has aligned naming and the following balancers has been
renamed in XML and YAML DSL:
diff --git a/docs/user-manual/modules/ROOT/pages/health-check.adoc
b/docs/user-manual/modules/ROOT/pages/health-check.adoc
index 5e579814dba..baefeeb1917 100644
--- a/docs/user-manual/modules/ROOT/pages/health-check.adoc
+++ b/docs/user-manual/modules/ROOT/pages/health-check.adoc
@@ -94,6 +94,11 @@ You can specify multiple patterns (and use wildcards) such
as:
camel.health.exclude-pattern = myroute,foo,bar*
+ Routes that are not automatically started
+
+If a route is configured to not to automatically start (`autoStartup=false`),
+then the route and its corresponding consumer health checks is always up as it
is externally managed.
+
=== Turning off consumer level health-checks
If routes health check is enabled then they will execute consumer
health-checks as well
(camel) branch regen_bot updated (94a1f361dcf -> 25ce112d80e)
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 94a1f361dcf Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5 (#14162) add 25ce112d80e (chores) camel-core-base-engine: remove unused dependencies No new revisions were added by this update. Summary of changes: core/camel-base-engine/pom.xml | 14 -- 1 file changed, 14 deletions(-)
(camel) branch main updated: (chores) camel-core-base-engine: remove unused dependencies
This is an automated email from the ASF dual-hosted git repository. orpiske 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 25ce112d80e (chores) camel-core-base-engine: remove unused dependencies 25ce112d80e is described below commit 25ce112d80e19f9cf260e884c66a8092ee5157cc Author: Otavio Rodolfo Piske AuthorDate: Thu May 16 07:06:47 2024 +0200 (chores) camel-core-base-engine: remove unused dependencies ref: 894f48cb5ac and 036ec6045894 --- core/camel-base-engine/pom.xml | 14 -- 1 file changed, 14 deletions(-) diff --git a/core/camel-base-engine/pom.xml b/core/camel-base-engine/pom.xml index 7e562efbeb4..0a4de4b6fdf 100644 --- a/core/camel-base-engine/pom.xml +++ b/core/camel-base-engine/pom.xml @@ -49,20 +49,6 @@ org.slf4j slf4j-api - - -org.openjdk.jmh -jmh-core -1.37 -test - - -org.openjdk.jmh -jmh-generator-annprocess -1.37 -test - -
(camel) branch regen_bot updated (48ebc0b0411 -> 94a1f361dcf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 48ebc0b0411 Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5 add 94a1f361dcf Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5 (#14162) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (48ebc0b0411) \ N -- N -- N refs/heads/regen_bot (94a1f361dcf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(camel) branch main updated (427c19faa5d -> 94a1f361dcf)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 427c19faa5d (chores) camel-test-junit5: decouple supported/unsupported check add 94a1f361dcf Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5 (#14162) No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/components/salesforce.json | 2 +- .../META-INF/org/apache/camel/component/salesforce/salesforce.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(camel) branch main updated (427c19faa5d -> 94a1f361dcf)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 427c19faa5d (chores) camel-test-junit5: decouple supported/unsupported check add 94a1f361dcf Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5 (#14162) No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/components/salesforce.json | 2 +- .../META-INF/org/apache/camel/component/salesforce/salesforce.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd closed pull request #1148: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1148 -- 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] Generated sources regen [camel]
oscerd merged PR #14162: URL: https://github.com/apache/camel/pull/14162 -- 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] (chores) camel-csv: test code cleanups [camel]
github-actions[bot] commented on PR #14163: URL: https://github.com/apache/camel/pull/14163#issuecomment-2113982515 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] (chores) camel-csv: test code cleanups [camel]
orpiske opened a new pull request, #14163: URL: https://github.com/apache/camel/pull/14163 - use static - modernize code -- 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 (7313a1e53a6 -> 48ebc0b0411)
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 7313a1e53a6 Jms temp (#14161)
add 050c4c8b986 camel-main - Avoid adding duplicate properties location in
camel-main
add e844404abe3 camel-salesforce: Document CLIENT_CREDENTIALS auth type.
add 042c9797bc9 (chores) camel-test-junit5: decouple the hasAnnotationCheck
add cc07a915dd4 (chores) camel-test-junit5: remove SpringBootTest from the
applyCamelPostProcessor
add 46b33293bd8 (chores) camel-test-junit5: move the JUnitPropertiesSource
to a separate class
add 75ff061a6db (chores) camel-test-junit5: decouple the logging from the
base class
add 427c19faa5d (chores) camel-test-junit5: decouple supported/unsupported
check
add 48ebc0b0411 Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5
No new revisions were added by this update.
Summary of changes:
.../camel/catalog/components/salesforce.json | 2 +-
.../camel/component/salesforce/salesforce.json | 2 +-
.../src/main/docs/salesforce-component.adoc| 2 +-
.../component/salesforce/SalesforceComponent.java | 4 +-
.../apache/camel/test/junit5/CamelTestSupport.java | 88 +
.../camel/test/junit5/JunitPropertiesSource.java} | 28 +++---
.../camel/test/junit5/util/ExtensionHelper.java| 108 +
.../junit5/util/RouteCoverageDumperExtension.java | 54 +++
.../org/apache/camel/main/BaseMainSupport.java | 4 +-
9 files changed, 204 insertions(+), 88 deletions(-)
copy
components/{camel-fastjson/src/test/java/org/apache/camel/component/fastjson/TestPojo.java
=>
camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/JunitPropertiesSource.java}
(64%)
create mode 100644
components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
create mode 100644
components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/RouteCoverageDumperExtension.java
[PR] Generated sources regen [camel]
github-actions[bot] opened a new pull request, #14162: URL: https://github.com/apache/camel/pull/14162 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 05/05: (chores) camel-test-junit5: decouple supported/unsupported check
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 427c19faa5d2e5a3534f244e30355ec7134422e5
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 14 17:42:22 2024 +0200
(chores) camel-test-junit5: decouple supported/unsupported check
---
.../apache/camel/test/junit5/CamelTestSupport.java | 18 +-
.../camel/test/junit5/util/ExtensionHelper.java| 41 --
2 files changed, 48 insertions(+), 11 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 79bc99244fa..bd54b3196d7 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -343,8 +343,7 @@ public abstract class CamelTestSupport
public void setUp() throws Exception {
testStartHeader(getClass(), currentTestName);
-doSpringBootCheck();
-doQuarkusCheck();
+ExtensionHelper.hasUnsupported(getClass());
if (isCreateCamelContextPerClass()) {
createCamelContextPerClass();
@@ -360,8 +359,6 @@ public abstract class CamelTestSupport
watch.restart();
}
-
-
private void createCamelContextPerClass() throws Exception {
INSTANCE.set(this);
AtomicInteger v = TESTS.get();
@@ -372,7 +369,6 @@ public abstract class CamelTestSupport
if (v.getAndIncrement() == 0) {
LOG.debug("Setup CamelContext before running first test");
// test is per class, so only setup once (the first time)
-doSpringBootCheck();
setupResources();
doPreSetup();
doSetUp();
@@ -401,10 +397,12 @@ public abstract class CamelTestSupport
/**
* Detects if this is a Spring-Boot test and throws an exception, as these
base classes is not intended for testing
- * Camel on Spring Boot.
+ * Camel on Spring Boot. Use ExtensionHelper.hasClassAnnotation instead
*/
+@Deprecated(since = "4.7.0")
protected void doSpringBootCheck() {
-boolean springBoot =
ExtensionHelper.hasClassAnnotation(getClass(),"org.springframework.boot.test.context.SpringBootTest");
+boolean springBoot
+= ExtensionHelper.hasClassAnnotation(getClass(),
"org.springframework.boot.test.context.SpringBootTest");
if (springBoot) {
throw new RuntimeException(
"Spring Boot detected: The
CamelTestSupport/CamelSpringTestSupport class is not intended for Camel testing
with Spring Boot.");
@@ -413,10 +411,12 @@ public abstract class CamelTestSupport
/**
* Detects if this is a Camel-quarkus test and throw an exception, as
these base classes is not intended for testing
- * Camel onQuarkus.
+ * Camel onQuarkus. Use ExtensionHelper.hasClassAnnotation instead.
*/
+@Deprecated(since = "4.7.0")
protected void doQuarkusCheck() {
-boolean quarkus = ExtensionHelper.hasClassAnnotation(getClass(),
"io.quarkus.test.junit.QuarkusTest",
"org.apache.camel.quarkus.test.CamelQuarkusTest");
+boolean quarkus = ExtensionHelper.hasClassAnnotation(getClass(),
"io.quarkus.test.junit.QuarkusTest",
+"org.apache.camel.quarkus.test.CamelQuarkusTest");
if (quarkus) {
throw new RuntimeException(
"Quarkus detected: The
CamelTestSupport/CamelSpringTestSupport class is not intended for Camel testing
with Quarkus.");
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
index 9b8bddfe0f9..f1d3a2b1762 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
@@ -18,6 +18,7 @@
package org.apache.camel.test.junit5.util;
import java.lang.annotation.Annotation;
+import java.util.function.Consumer;
import org.apache.camel.util.TimeUtils;
import org.slf4j.Logger;
@@ -26,11 +27,46 @@ import org.slf4j.LoggerFactory;
public final class ExtensionHelper {
private static final Logger LOG =
LoggerFactory.getLogger(ExtensionHelper.class);
public static final String SEPARATOR = "*".repeat(80);
+private static final String SPRING_BOOT_TEST =
"org.springframework.boot.test.context.SpringBootTest";
+private static final String QUARKUS_TEST =
"io.quarkus.test.junit.QuarkusTest";
+private static
(camel) 01/05: (chores) camel-test-junit5: decouple the hasAnnotationCheck
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 042c9797bc94b6863c69e1779965fab6617cadf0
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 14 16:54:30 2024 +0200
(chores) camel-test-junit5: decouple the hasAnnotationCheck
---
.../apache/camel/test/junit5/CamelTestSupport.java | 19 ---
.../camel/test/junit5/util/ExtensionHelper.java| 39 ++
2 files changed, 45 insertions(+), 13 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 4aae8bc3962..4f565b8c195 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -61,6 +61,7 @@ import org.apache.camel.support.BreakpointSupport;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.test.CamelRouteCoverageDumper;
+import org.apache.camel.test.junit5.util.ExtensionHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.TimeUtils;
@@ -406,7 +407,7 @@ public abstract class CamelTestSupport
* Camel on Spring Boot.
*/
protected void doSpringBootCheck() {
-boolean springBoot =
hasClassAnnotation("org.springframework.boot.test.context.SpringBootTest");
+boolean springBoot =
ExtensionHelper.hasClassAnnotation(getClass(),"org.springframework.boot.test.context.SpringBootTest");
if (springBoot) {
throw new RuntimeException(
"Spring Boot detected: The
CamelTestSupport/CamelSpringTestSupport class is not intended for Camel testing
with Spring Boot.");
@@ -418,8 +419,7 @@ public abstract class CamelTestSupport
* Camel onQuarkus.
*/
protected void doQuarkusCheck() {
-boolean quarkus =
hasClassAnnotation("io.quarkus.test.junit.QuarkusTest") ||
-
hasClassAnnotation("org.apache.camel.quarkus.test.CamelQuarkusTest");
+boolean quarkus = ExtensionHelper.hasClassAnnotation(getClass(),
"io.quarkus.test.junit.QuarkusTest",
"org.apache.camel.quarkus.test.CamelQuarkusTest");
if (quarkus) {
throw new RuntimeException(
"Quarkus detected: The
CamelTestSupport/CamelSpringTestSupport class is not intended for Camel testing
with Quarkus.");
@@ -727,7 +727,7 @@ public abstract class CamelTestSupport
protected void applyCamelPostProcessor() throws Exception {
// use the bean post processor if the test class is not dependency
// injected already by Spring Framework
-boolean spring =
hasClassAnnotation("org.springframework.boot.test.context.SpringBootTest",
+boolean spring = ExtensionHelper.hasClassAnnotation(getClass(),
"org.springframework.boot.test.context.SpringBootTest",
"org.springframework.context.annotation.ComponentScan");
if (!spring) {
PluginHelper.getBeanPostProcessor(context).postProcessBeforeInitialization(this,
@@ -740,16 +740,9 @@ public abstract class CamelTestSupport
/**
* Does this test class have any of the following annotations on the
class-level.
*/
+@Deprecated
protected boolean hasClassAnnotation(String... names) {
-for (String name : names) {
-for (Annotation ann : getClass().getAnnotations()) {
-String annName = ann.annotationType().getName();
-if (annName.equals(name)) {
-return true;
-}
-}
-}
-return false;
+return ExtensionHelper.hasClassAnnotation(getClass(), names);
}
protected void stopCamelContext() throws Exception {
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
new file mode 100644
index 000..64f356b78ac
--- /dev/null
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
@@ -0,0 +1,39 @@
+/*
+ * 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
+ *
+ *
(camel) 04/05: (chores) camel-test-junit5: decouple the logging from the base class
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 75ff061a6dba466085c40e1e865bf5f20331bfee
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 14 17:22:09 2024 +0200
(chores) camel-test-junit5: decouple the logging from the base class
---
.../apache/camel/test/junit5/CamelTestSupport.java | 46 +-
.../camel/test/junit5/util/ExtensionHelper.java| 32 +
.../junit5/util/RouteCoverageDumperExtension.java | 54 ++
3 files changed, 97 insertions(+), 35 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index c35fc26ce9b..79bc99244fa 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.test.junit5;
-import java.lang.annotation.Annotation;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
@@ -40,8 +39,6 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Service;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.api.management.ManagedCamelContext;
-import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
@@ -55,16 +52,14 @@ import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.PropertiesComponent;
-import org.apache.camel.spi.PropertiesSource;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.BreakpointSupport;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.PluginHelper;
-import org.apache.camel.test.CamelRouteCoverageDumper;
import org.apache.camel.test.junit5.util.ExtensionHelper;
+import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.StringHelper;
-import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -81,6 +76,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.camel.test.junit5.TestSupport.isCamelDebugPresent;
+import static
org.apache.camel.test.junit5.util.ExtensionHelper.testStartHeader;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
@@ -103,7 +99,7 @@ public abstract class CamelTestSupport
private static final ThreadLocal
THREAD_FLUENT_TEMPLATE = new ThreadLocal<>();
private static final ThreadLocal THREAD_CONSUMER = new
ThreadLocal<>();
private static final ThreadLocal THREAD_SERVICE = new
ThreadLocal<>();
-public static final String SEPARATOR =
"";
+
protected Properties extra;
protected volatile ModelCamelContext context;
protected volatile ProducerTemplate template;
@@ -120,7 +116,7 @@ public abstract class CamelTestSupport
private static final ThreadLocal INSTANCE = new
ThreadLocal<>();
private String currentTestName;
private boolean isCreateCamelContextPerClass = false;
-private final CamelRouteCoverageDumper routeCoverageDumper = new
CamelRouteCoverageDumper();
+
private ExtensionContext.Store globalStore;
@Override
@@ -133,6 +129,7 @@ public abstract class CamelTestSupport
watch.restart();
}
+@Deprecated(since = "4.7.0")
public long timeTaken() {
return watch.taken();
}
@@ -344,9 +341,7 @@ public abstract class CamelTestSupport
@BeforeEach
public void setUp() throws Exception {
-LOG.info(SEPARATOR);
-LOG.info("Testing: {} ({})", currentTestName, getClass().getName());
-LOG.info(SEPARATOR);
+testStartHeader(getClass(), currentTestName);
doSpringBootCheck();
doQuarkusCheck();
@@ -365,6 +360,8 @@ public abstract class CamelTestSupport
watch.restart();
}
+
+
private void createCamelContextPerClass() throws Exception {
INSTANCE.set(this);
AtomicInteger v = TESTS.get();
@@ -590,15 +587,11 @@ public abstract class CamelTestSupport
public void tearDown() throws Exception {
long time = watch.taken();
-LOG.info(SEPARATOR);
-LOG.info("Testing done: {} ({})", currentTestName,
(camel) 03/05: (chores) camel-test-junit5: move the JUnitPropertiesSource to a separate class
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 46b33293bd840aaf59947147f6530a5b1ff62c36
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 14 17:03:10 2024 +0200
(chores) camel-test-junit5: move the JUnitPropertiesSource to a separate
class
---
.../apache/camel/test/junit5/CamelTestSupport.java | 12 +--
.../camel/test/junit5/JunitPropertiesSource.java | 39 ++
2 files changed, 40 insertions(+), 11 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 60d8103ff03..c35fc26ce9b 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -539,17 +539,7 @@ public abstract class CamelTestSupport
if (extra != null && !extra.isEmpty()) {
pc.setOverrideProperties(extra);
}
-pc.addPropertiesSource(new PropertiesSource() {
-@Override
-public String getName() {
-return "junit-store";
-}
-
-@Override
-public String getProperty(String name) {
-return globalStore.get(name, String.class);
-}
-});
+pc.addPropertiesSource(new JunitPropertiesSource(globalStore));
Boolean ignore = ignoreMissingLocationWithPropertiesComponent();
if (ignore != null) {
pc.setIgnoreMissingLocation(ignore);
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/JunitPropertiesSource.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/JunitPropertiesSource.java
new file mode 100644
index 000..e52c4637891
--- /dev/null
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/JunitPropertiesSource.java
@@ -0,0 +1,39 @@
+/*
+ * 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.test.junit5;
+
+import org.apache.camel.spi.PropertiesSource;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+class JunitPropertiesSource implements PropertiesSource {
+private final ExtensionContext.Store globalStore;
+
+JunitPropertiesSource(ExtensionContext.Store globalStore) {
+this.globalStore = globalStore;
+}
+
+@Override
+public String getName() {
+return "junit-store";
+}
+
+@Override
+public String getProperty(String name) {
+return globalStore.get(name, String.class);
+}
+}
(camel) 02/05: (chores) camel-test-junit5: remove SpringBootTest from the applyCamelPostProcessor
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cc07a915dd42456908ed65e6afd108ec8a99c33a
Author: Otavio Rodolfo Piske
AuthorDate: Tue May 14 17:01:30 2024 +0200
(chores) camel-test-junit5: remove SpringBootTest from the
applyCamelPostProcessor
This class is blocked in setup and, therefore, unsupported for testing
---
.../src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 4f565b8c195..60d8103ff03 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -727,8 +727,7 @@ public abstract class CamelTestSupport
protected void applyCamelPostProcessor() throws Exception {
// use the bean post processor if the test class is not dependency
// injected already by Spring Framework
-boolean spring = ExtensionHelper.hasClassAnnotation(getClass(),
"org.springframework.boot.test.context.SpringBootTest",
-"org.springframework.context.annotation.ComponentScan");
+boolean spring = ExtensionHelper.hasClassAnnotation(getClass(),
"org.springframework.context.annotation.ComponentScan");
if (!spring) {
PluginHelper.getBeanPostProcessor(context).postProcessBeforeInitialization(this,
getClass().getName());
(camel) branch main updated (e844404abe3 -> 427c19faa5d)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from e844404abe3 camel-salesforce: Document CLIENT_CREDENTIALS auth type.
new 042c9797bc9 (chores) camel-test-junit5: decouple the hasAnnotationCheck
new cc07a915dd4 (chores) camel-test-junit5: remove SpringBootTest from the
applyCamelPostProcessor
new 46b33293bd8 (chores) camel-test-junit5: move the JUnitPropertiesSource
to a separate class
new 75ff061a6db (chores) camel-test-junit5: decouple the logging from the
base class
new 427c19faa5d (chores) camel-test-junit5: decouple supported/unsupported
check
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/test/junit5/CamelTestSupport.java | 88 +
.../camel/test/junit5/JunitPropertiesSource.java} | 28 +++---
.../camel/test/junit5/util/ExtensionHelper.java| 108 +
.../junit5/util/RouteCoverageDumperExtension.java | 54 +++
4 files changed, 196 insertions(+), 82 deletions(-)
copy
components/{camel-fastjson/src/test/java/org/apache/camel/component/fastjson/TestPojo.java
=>
camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/JunitPropertiesSource.java}
(64%)
create mode 100644
components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
create mode 100644
components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/RouteCoverageDumperExtension.java
Re: [PR] (chores) camel-test: inital decoupling for CamelTestSupport [camel]
orpiske merged PR #14146: URL: https://github.com/apache/camel/pull/14146 -- 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-kafka-connector) branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new 6adc9747ce Updated CHANGELOG.md 6adc9747ce is described below commit 6adc9747ce6884a30bed6255a764b9b8a9c4f384 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu May 16 03:05:16 2024 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61eb637c06..854b43fbd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ **Merged pull requests:** +- Bump com.amazon.redshift:redshift-jdbc42 from 2.1.0.26 to 2.1.0.28 in /connectors/camel-aws-redshift-sink-kafka-connector [\#1636](https://github.com/apache/camel-kafka-connector/pull/1636) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump actions/checkout from 4.1.4 to 4.1.5 [\#1634](https://github.com/apache/camel-kafka-connector/pull/1634) ([dependabot[bot]](https://github.com/apps/dependabot)) - Jira [\#1631](https://github.com/apache/camel-kafka-connector/pull/1631) ([davsclaus](https://github.com/davsclaus)) - chore\(CI\): updated jdk install actions. [\#1629](https://github.com/apache/camel-kafka-connector/pull/1629) ([valdar](https://github.com/valdar))
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-2113908948 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 9105431492-1484-879048df-bcee-4896-8a41-694576845563 * Camel Quarkus Commit: fa2f770372640c3b4c067ef4f428002ac0b80d83 * Quarkus Main Commit: 95b20582e77c34d88e88de6f7e34196ef5cff426 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9105431492 -- 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-kafka-connector) branch automatic-periodic-sync updated (975aff7d60 -> 369594ae62)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git from 975aff7d60 Updated CHANGELOG.md add ae421ebcbd Bump com.amazon.redshift:redshift-jdbc42 (#1636) add 369594ae62 [create-pull-request] automated change No new revisions were added by this update. Summary of changes:
[PR] [Github Actions] Periodic Sync Camel-kafka-connector main Branch [camel-kafka-connector]
github-actions[bot] opened a new pull request, #1638: URL: https://github.com/apache/camel-kafka-connector/pull/1638 Periodic Sync of Camel Kafka connector main Branch with main Camel Main. see https://github.com/apache/camel-kafka-connector/blob/main/.github/workflows/automatic-sync-camel-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-2113739837 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 9104346602-1380-b8ac4eaf-e8a8-423c-9115-c5819b65142c * Camel Quarkus Commit: cc5f46e290631d322d1ab289907b913f74e60e24 * Camel Main Commit: 95b20582e77c34d88e88de6f7e34196ef5cff426 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9104346602 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 1b239c3b2 chore: changelog automatic update 1b239c3b2 is described below commit 1b239c3b2d7cdcd1a41f0e4d80544b592bb5627b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu May 16 01:09:47 2024 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9d84bb97..d8f1a4b57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Pod SecurityContext default secure settings [\#5287](https://github.com/apache/camel-k/issues/5287) - Review permission check [\#5210](https://github.com/apache/camel-k/issues/5210) - Custom kamelets are not fetched from private GitHub repository [\#5173](https://github.com/apache/camel-k/issues/5173) +- Kamelet: Consider restricting the Kamelet route to only allow `from` or `route` [\#5118](https://github.com/apache/camel-k/issues/5118) - Keda integration not working with mounted secrets [\#4359](https://github.com/apache/camel-k/issues/4359) ## [2.3.2-nightly](https://github.com/apache/camel-k/tree/2.3.2-nightly) (2024-05-06)
Re: [PR] Updated pom to skip build on Windows running on ARM [camel]
cziesman commented on PR #14063: URL: https://github.com/apache/camel/pull/14063#issuecomment-2113712130 @davsclaus How are other components that are not built in specific environments excluded from the tooling? I ran this again on OSX on Intel and ARM, and the build passed. I ran it on Fedora 38 on ARM and it failed trying to build `camel-endpointdsl`. -- 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] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1148: URL: https://github.com/apache/camel-spring-boot/pull/1148 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Kamelet: Consider restricting the Kamelet route to only allow `from` or `route` [camel-k]
github-actions[bot] closed issue #5118: Kamelet: Consider restricting the Kamelet route to only allow `from` or `route` URL: https://github.com/apache/camel-k/issues/5118 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 8b3464a7a chore: nightly automatic updates 8b3464a7a is described below commit 8b3464a7ad6835f205ce471c39ae6a32ff94bda2 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed May 15 23:46:50 2024 + chore: nightly automatic updates --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c357982d..e0de0d718 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ **Merged pull requests:** +- fix\(e2e\): Route trait schema valid in OCP [\#5506](https://github.com/apache/camel-k/pull/5506) ([gansheer](https://github.com/gansheer)) - Re evaluate golanci-lint exclusions \(execinquery,whitespace,wastedassign,tagliatelle,nolintlint,lll\)" [\#5502](https://github.com/apache/camel-k/pull/5502) ([lburgazzoli](https://github.com/lburgazzoli)) - feat\(lint\): enabe goconst linter [\#5499](https://github.com/apache/camel-k/pull/5499) ([lburgazzoli](https://github.com/lburgazzoli)) - feat\(lint\): enabe magic number detector \(mld\) [\#5496](https://github.com/apache/camel-k/pull/5496) ([lburgazzoli](https://github.com/lburgazzoli))
Re: [PR] fix(e2e): Route trait schema valid in OCP [camel-k]
gansheer merged PR #5506: URL: https://github.com/apache/camel-k/pull/5506 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: fix(e2e): Route trait schema valid in OCP
This is an automated email from the ASF dual-hosted git repository.
gfournier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new ab7192093 fix(e2e): Route trait schema valid in OCP
ab7192093 is described below
commit ab7192093325f18a59914b74d07c80a90b6614e2
Author: Gaelle Fournier
AuthorDate: Wed May 15 15:25:38 2024 +0200
fix(e2e): Route trait schema valid in OCP
---
e2e/common/traits/route_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index ce31bfa61..027bd6d72 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -200,7 +200,7 @@ func TestRunRoutes(t *testing.T) {
routeTrait, _, _ :=
unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits",
"route")
g.Expect(routeTrait).ToNot(BeNil())
g.Expect(len(routeTrait)).To(Equal(1))
- g.Expect(routeTrait["enabled"]).To(Equal(true))
+ g.Expect(routeTrait["annotations"]).ToNot(BeNil())
g.Expect(Kamel(t, ctx, "delete", "--all", "-n",
ns).Execute()).Should(BeNil())
})
(camel) branch main updated: camel-salesforce: Document CLIENT_CREDENTIALS auth type.
This is an automated email from the ASF dual-hosted git repository. jeremyross 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 e844404abe3 camel-salesforce: Document CLIENT_CREDENTIALS auth type. e844404abe3 is described below commit e844404abe37fb1cc764b80a383778a512c73ff7 Author: Jeremy Ross AuthorDate: Wed May 15 13:10:30 2024 -0700 camel-salesforce: Document CLIENT_CREDENTIALS auth type. --- .../src/main/docs/salesforce-component.adoc | 2 +- .../org/apache/camel/component/salesforce/SalesforceComponent.java| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc index d72db1e6040..d1e7bd0ec0f 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc +++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc @@ -87,7 +87,7 @@ For each of the flows, different sets of properties need to be set: | Property | Where to find it on Salesforce | Flow | clientId | Connected App, Consumer Key| All flows -| clientSecret | Connected App, Consumer Secret | Username-Password, Refresh Token +| clientSecret | Connected App, Consumer Secret | Username-Password, Refresh Token, Client Credentials | userName | Salesforce user username | Username-Password, JWT Bearer Token | password | Salesforce user password | Username-Password | refreshToken | From OAuth flow callback | Refresh Token diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java index 434c5bf8be7..6e88f559467 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java @@ -153,10 +153,10 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP label = "common,security") private String jwtAudience; -@Metadata(description = "Explicit authentication method to be used, one of USERNAME_PASSWORD, REFRESH_TOKEN or JWT." +@Metadata(description = "Explicit authentication method to be used, one of USERNAME_PASSWORD, REFRESH_TOKEN, CLIENT_CREDENTIALS, or JWT." + " Salesforce component can auto-determine the authentication method to use from the properties set, set this " + " property to eliminate any ambiguity.", - label = "common,security", enums = "USERNAME_PASSWORD,REFRESH_TOKEN,JWT") + label = "common,security", enums = "USERNAME_PASSWORD,REFRESH_TOKEN,CLIENT_CREDENTIALS,JWT") private AuthenticationType authenticationType; @Metadata(description = "If set to true prevents the component from authenticating to Salesforce with the start of"
(camel) branch main updated: camel-main - Avoid adding duplicate properties location in camel-main
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 050c4c8b986 camel-main - Avoid adding duplicate properties location in
camel-main
050c4c8b986 is described below
commit 050c4c8b986fbde7a681825dd551193490c99cfa
Author: Claus Ibsen
AuthorDate: Wed May 15 20:26:40 2024 +0200
camel-main - Avoid adding duplicate properties location in camel-main
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index b7f7f0fc6e3..8ef5d715da3 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -384,7 +384,9 @@ public abstract class BaseMainSupport extends BaseService {
if (profile != null) {
mainConfigurationProperties.setProfile(profile);
String loc = profilePropertyPlaceholderLocation(profile);
-defaultPropertyPlaceholderLocation = loc + "," +
defaultPropertyPlaceholderLocation;
+if (!defaultPropertyPlaceholderLocation.contains(loc)) {
+defaultPropertyPlaceholderLocation = loc + "," +
defaultPropertyPlaceholderLocation;
+}
}
locations
=
MainHelper.lookupPropertyFromSysOrEnv(MainConstants.PROPERTY_PLACEHOLDER_LOCATION)
(camel-kafka-connector) branch dependabot/maven/connectors/camel-aws-redshift-sink-kafka-connector/com.amazon.redshift-redshift-jdbc42-2.1.0.28 deleted (was 41cd69b524)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/connectors/camel-aws-redshift-sink-kafka-connector/com.amazon.redshift-redshift-jdbc42-2.1.0.28 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git was 41cd69b524 Bump com.amazon.redshift:redshift-jdbc42 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-kafka-connector) branch main updated: Bump com.amazon.redshift:redshift-jdbc42 (#1636)
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new ae421ebcbd Bump com.amazon.redshift:redshift-jdbc42 (#1636) ae421ebcbd is described below commit ae421ebcbdfb09a4ce8ac7639abd42c00cce3f40 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed May 15 19:28:07 2024 +0200 Bump com.amazon.redshift:redshift-jdbc42 (#1636) Bumps [com.amazon.redshift:redshift-jdbc42](https://github.com/aws/amazon-redshift-jdbc-driver) from 2.1.0.26 to 2.1.0.28. - [Release notes](https://github.com/aws/amazon-redshift-jdbc-driver/releases) - [Changelog](https://github.com/aws/amazon-redshift-jdbc-driver/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/amazon-redshift-jdbc-driver/compare/v2.1.0.26...v2.1.0.28) --- updated-dependencies: - dependency-name: com.amazon.redshift:redshift-jdbc42 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- connectors/camel-aws-redshift-sink-kafka-connector/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml b/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml index 7f235e513c..424833dd0c 100644 --- a/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml +++ b/connectors/camel-aws-redshift-sink-kafka-connector/pom.xml @@ -48,7 +48,7 @@ com.amazon.redshift redshift-jdbc42 - 2.1.0.26 + 2.1.0.28 org.apache.camel.kafkaconnector
Re: [PR] Bump com.amazon.redshift:redshift-jdbc42 from 2.1.0.26 to 2.1.0.28 in /connectors/camel-aws-redshift-sink-kafka-connector [camel-kafka-connector]
oscerd merged PR #1636: URL: https://github.com/apache/camel-kafka-connector/pull/1636 -- 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 (d59bb5c33db -> 7313a1e53a6)
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 d59bb5c33db Upgrade mongodb container to 7.0.9 (#14157) add 7313a1e53a6 Jms temp (#14161) No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/components/activemq.json | 46 ++--- .../org/apache/camel/catalog/components/amqp.json | 46 ++--- .../org/apache/camel/catalog/components/jms.json | 46 ++--- .../activemq/ActiveMQEndpointUriFactory.java | 4 +- .../apache/camel/component/activemq/activemq.json | 46 ++--- .../component/amqp/AMQPEndpointUriFactory.java | 4 +- .../org/apache/camel/component/amqp/amqp.json | 46 ++--- .../component/jms/JmsComponentConfigurer.java | 12 ++ .../camel/component/jms/JmsEndpointConfigurer.java | 12 ++ .../camel/component/jms/JmsEndpointUriFactory.java | 4 +- .../org/apache/camel/component/jms/jms.json| 46 ++--- .../apache/camel/component/jms/JmsComponent.java | 18 ++ .../camel/component/jms/JmsConfiguration.java | 29 +++ .../component/jms/reply/ReplyManagerSupport.java | 40 ++--- .../jms/reply/TemporaryQueueReplyManager.java | 78 .../dsl/ActivemqComponentBuilderFactory.java | 39 .../component/dsl/AmqpComponentBuilderFactory.java | 39 .../component/dsl/JmsComponentBuilderFactory.java | 39 .../endpoint/dsl/AMQPEndpointBuilderFactory.java | 198 + .../dsl/ActiveMQEndpointBuilderFactory.java| 198 + .../endpoint/dsl/JmsEndpointBuilderFactory.java| 198 + .../camel/kotlin/components/ActivemqUriDsl.kt | 29 +++ .../apache/camel/kotlin/components/AmqpUriDsl.kt | 29 +++ .../apache/camel/kotlin/components/JmsUriDsl.kt| 29 +++ 24 files changed, 1077 insertions(+), 198 deletions(-)
(camel-kafka-connector) branch dependabot/maven/connectors/camel-aws-redshift-source-kafka-connector/com.amazon.redshift-redshift-jdbc42-2.1.0.28 created (now d29c52f615)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/connectors/camel-aws-redshift-source-kafka-connector/com.amazon.redshift-redshift-jdbc42-2.1.0.28 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at d29c52f615 Bump com.amazon.redshift:redshift-jdbc42 No new revisions were added by this update.
[PR] Bump com.amazon.redshift:redshift-jdbc42 from 2.1.0.26 to 2.1.0.28 in /connectors/camel-aws-redshift-source-kafka-connector [camel-kafka-connector]
dependabot[bot] opened a new pull request, #1637: URL: https://github.com/apache/camel-kafka-connector/pull/1637 Bumps [com.amazon.redshift:redshift-jdbc42](https://github.com/aws/amazon-redshift-jdbc-driver) from 2.1.0.26 to 2.1.0.28. Release notes Sourced from https://github.com/aws/amazon-redshift-jdbc-driver/releases;>com.amazon.redshift:redshift-jdbc42's releases. v2.1.0.28 Release of driver version 2.1.0.28 Changelog Sourced from https://github.com/aws/amazon-redshift-jdbc-driver/blob/master/CHANGELOG.md;>com.amazon.redshift:redshift-jdbc42's changelog. v2.1.0.28 (2024-05-14) Security improvements (CVE-2024-32888) [Beaux Sharifi] Consolidated SDK API calls for retrieving cluster credentials for serverless instances. [Beaux Sharifi] Added logging of returned cluster identifiers during custom domain name resolution to aid debugging. [Beaux Sharifi] Added Object IDentifier (OID) mappings for missing Redshift data types. [Beaux Sharifi] Added null check for IsServerless property within IamHelper to address Dbeaver error (GitHub Issue https://redirect.github.com/aws/amazon-redshift-jdbc-driver/issues/114;>#114) [Beaux Sharifi] v2.1.0.27 (2024-05-07) This version was published to Maven in error and is not recommended for use. [Beaux Sharifi] Commits https://github.com/aws/amazon-redshift-jdbc-driver/commit/51af003d4be170042faef20dadbcf4f992e10d8a;>51af003 Update README.md for version 2.1.0.28 https://github.com/aws/amazon-redshift-jdbc-driver/commit/0d354a5f26ca23f7cac4e800e3b8734220230319;>0d354a5 Update CHANGELOG.md for version 2.1.0.28 https://github.com/aws/amazon-redshift-jdbc-driver/commit/cdb9e8aa069bfb25da1e53d15bb306f7b926692b;>cdb9e8a Removing cname:region support because it is unnecessary. https://github.com/aws/amazon-redshift-jdbc-driver/commit/660341bdc885334f76cecf4f8a35c096db169f87;>660341b Fix potential null pointer exception. https://github.com/aws/amazon-redshift-jdbc-driver/commit/cc22326b26218c95f3818f7ed244a5089243442d;>cc22326 Fixing OID mapping. https://github.com/aws/amazon-redshift-jdbc-driver/commit/6af4f3bbbce05db7c27eb1d7c3dc84079afa079b;>6af4f3b Improved logging for iam auth https://github.com/aws/amazon-redshift-jdbc-driver/commit/12a5e8ecfbb44c8154fc66041cca2e20ecd7b339;>12a5e8e More security improvements. https://github.com/aws/amazon-redshift-jdbc-driver/commit/0f92b52eac49645065f6e579859cd450d47eda7c;>0f92b52 Enhancements to CNAME https://github.com/aws/amazon-redshift-jdbc-driver/commit/e83c58e4797d69225bf69173fa50e8c54fa734c1;>e83c58e Always call getCredentials for Serverless for normal use cases. https://github.com/aws/amazon-redshift-jdbc-driver/commit/bc93694201a291493778ce5369a72befeca5ba7d;>bc93694 Security improvements. Additional commits viewable in https://github.com/aws/amazon-redshift-jdbc-driver/compare/v2.1.0.26...v2.1.0.28;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated
(camel-kafka-connector) branch dependabot/maven/connectors/camel-aws-redshift-sink-kafka-connector/com.amazon.redshift-redshift-jdbc42-2.1.0.28 created (now 41cd69b524)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/connectors/camel-aws-redshift-sink-kafka-connector/com.amazon.redshift-redshift-jdbc42-2.1.0.28 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at 41cd69b524 Bump com.amazon.redshift:redshift-jdbc42 No new revisions were added by this update.
[PR] Bump com.amazon.redshift:redshift-jdbc42 from 2.1.0.26 to 2.1.0.28 in /connectors/camel-aws-redshift-sink-kafka-connector [camel-kafka-connector]
dependabot[bot] opened a new pull request, #1636: URL: https://github.com/apache/camel-kafka-connector/pull/1636 Bumps [com.amazon.redshift:redshift-jdbc42](https://github.com/aws/amazon-redshift-jdbc-driver) from 2.1.0.26 to 2.1.0.28. Release notes Sourced from https://github.com/aws/amazon-redshift-jdbc-driver/releases;>com.amazon.redshift:redshift-jdbc42's releases. v2.1.0.28 Release of driver version 2.1.0.28 Changelog Sourced from https://github.com/aws/amazon-redshift-jdbc-driver/blob/master/CHANGELOG.md;>com.amazon.redshift:redshift-jdbc42's changelog. v2.1.0.28 (2024-05-14) Security improvements (CVE-2024-32888) [Beaux Sharifi] Consolidated SDK API calls for retrieving cluster credentials for serverless instances. [Beaux Sharifi] Added logging of returned cluster identifiers during custom domain name resolution to aid debugging. [Beaux Sharifi] Added Object IDentifier (OID) mappings for missing Redshift data types. [Beaux Sharifi] Added null check for IsServerless property within IamHelper to address Dbeaver error (GitHub Issue https://redirect.github.com/aws/amazon-redshift-jdbc-driver/issues/114;>#114) [Beaux Sharifi] v2.1.0.27 (2024-05-07) This version was published to Maven in error and is not recommended for use. [Beaux Sharifi] Commits https://github.com/aws/amazon-redshift-jdbc-driver/commit/51af003d4be170042faef20dadbcf4f992e10d8a;>51af003 Update README.md for version 2.1.0.28 https://github.com/aws/amazon-redshift-jdbc-driver/commit/0d354a5f26ca23f7cac4e800e3b8734220230319;>0d354a5 Update CHANGELOG.md for version 2.1.0.28 https://github.com/aws/amazon-redshift-jdbc-driver/commit/cdb9e8aa069bfb25da1e53d15bb306f7b926692b;>cdb9e8a Removing cname:region support because it is unnecessary. https://github.com/aws/amazon-redshift-jdbc-driver/commit/660341bdc885334f76cecf4f8a35c096db169f87;>660341b Fix potential null pointer exception. https://github.com/aws/amazon-redshift-jdbc-driver/commit/cc22326b26218c95f3818f7ed244a5089243442d;>cc22326 Fixing OID mapping. https://github.com/aws/amazon-redshift-jdbc-driver/commit/6af4f3bbbce05db7c27eb1d7c3dc84079afa079b;>6af4f3b Improved logging for iam auth https://github.com/aws/amazon-redshift-jdbc-driver/commit/12a5e8ecfbb44c8154fc66041cca2e20ecd7b339;>12a5e8e More security improvements. https://github.com/aws/amazon-redshift-jdbc-driver/commit/0f92b52eac49645065f6e579859cd450d47eda7c;>0f92b52 Enhancements to CNAME https://github.com/aws/amazon-redshift-jdbc-driver/commit/e83c58e4797d69225bf69173fa50e8c54fa734c1;>e83c58e Always call getCredentials for Serverless for normal use cases. https://github.com/aws/amazon-redshift-jdbc-driver/commit/bc93694201a291493778ce5369a72befeca5ba7d;>bc93694 Security improvements. Additional commits viewable in https://github.com/aws/amazon-redshift-jdbc-driver/compare/v2.1.0.26...v2.1.0.28;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated
(camel) branch jms-temp deleted (was aef4c892afe)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-temp in repository https://gitbox.apache.org/repos/asf/camel.git was aef4c892afe CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Jms temp [camel]
davsclaus merged PR #14161: URL: https://github.com/apache/camel/pull/14161 -- 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] Re evaluate golanci-lint exclusions (dupl, gofumpt, nestif) [camel-k]
github-actions[bot] commented on PR #5507: URL: https://github.com/apache/camel-k/pull/5507#issuecomment-2113046627 :heavy_check_mark: Unit test coverage report - coverage increased from 38.2% to 38.3% (**+0.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] (#5489) Groovy > Yaml [camel-k]
tdiesler commented on PR #5497: URL: https://github.com/apache/camel-k/pull/5497#issuecomment-2112961152 Could we run this again pls? -- 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] fix(tests): fixed flaky Readiness condition with never ready route test in e2e/common/traits/health_test.go [camel-k]
valdar commented on PR #5503: URL: https://github.com/apache/camel-k/pull/5503#issuecomment-2112864379 I simplified the route and test a little bit more to be sure that intent is clearer and the test dose not mislead the next poor soul who read it. In so doing I have also found that there were some minor issues (as conditions never actually evaluated) in the startup probe tests and I have tried to fix those as well. -- 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 jms-temp updated (cb63024968e -> aef4c892afe)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-temp in repository https://gitbox.apache.org/repos/asf/camel.git from cb63024968e CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock add aef4c892afe CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock No new revisions were added by this update. Summary of changes: .../dsl/ActivemqComponentBuilderFactory.java | 39 ++ .../component/dsl/AmqpComponentBuilderFactory.java | 39 ++ .../component/dsl/JmsComponentBuilderFactory.java | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-)
Re: [I] All Beans are gone after integration is edited through yaml editor [camel-karavan]
dpalinic commented on issue #1280: URL: https://github.com/apache/camel-karavan/issues/1280#issuecomment-2112744698 No, I haven't pull next version yet. -- 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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091:
URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601781608
##
integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java:
##
@@ -18,38 +18,96 @@
import java.util.Collections;
import java.util.Map;
+import java.util.function.Function;
+import com.github.dockerjava.api.exception.NotFoundException;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.camel.quarkus.test.FipsModeUtil;
import org.eclipse.microprofile.config.ConfigProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerFetchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.TestcontainersConfiguration;
public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
protected static final String KAFKA_IMAGE_NAME =
ConfigProvider.getConfig().getValue("kafka.container.image", String.class);
private static final Logger LOGGER =
LoggerFactory.getLogger(KafkaTestResource.class);
private StrimziKafkaContainer container;
+private GenericContainer j17container;
@Override
public Map start() {
LOGGER.info(TestcontainersConfiguration.getInstance().toString());
try {
-container = new StrimziKafkaContainer(KAFKA_IMAGE_NAME)
-/* Added container startup logging because of
https://github.com/apache/camel-quarkus/issues/2461 */
-.withLogConsumer(frame ->
System.out.print(frame.getUtf8String()))
-.waitForRunning();
-
-container.start();
+startContainer(KAFKA_IMAGE_NAME, name -> new
StrimziKafkaContainer(name));
return Collections.singletonMap("camel.component.kafka.brokers",
container.getBootstrapServers());
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+public String start(Function
containerSupplier) {
+LOGGER.info(TestcontainersConfiguration.getInstance().toString());
+
+//if FIPS environment is present, custom container using J17 has to
used because:
+// Password-based encryption support in FIPs mode was implemented in
the Red Hat build of OpenJDK 17 update 4
+if (FipsModeUtil.isFipsMode()) {
+//custom image should be cached for the next usages with following
id
+String customImageName = "camel-quarkus-test-custom-" +
KAFKA_IMAGE_NAME.replaceAll("[\\./]", "-");
+
+try {
+//in case that the image is not accessible, fetch exception is
thrown
+startContainer(customImageName, containerSupplier);
+} catch (ContainerFetchException e) {
+if (e.getCause() instanceof NotFoundException) {
+LOGGER.info("Custom image for kafka (%s) does not exist.
Has to be created.", customImageName);
+
+//start of the customized container will create the image
+//it is not possible to customize existing
StrimziKafkaContainer. Testcontainer API doe not allow
+//to customize the image.
+// This workaround can be removed once the strimzi
container with openjdk 17 is released.
+// According to
https://strimzi.io/blog/2023/01/25/running-apache-kafka-on-fips-enabled-kubernetes-cluster/
+// image should exist
+j17container = new GenericContainer(
+new ImageFromDockerfile(customImageName, false)
+.withDockerfileFromBuilder(builder ->
builder
+
.from("quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1")
+.env("JAVA_HOME",
"/usr/lib/jvm/jre-17")
+.env("PATH",
"/usr/lib/jvm/jre-17/bin:$PATH")
Review Comment:
Thanks for the link!
--
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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091:
URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601781164
##
integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java:
##
@@ -18,38 +18,96 @@
import java.util.Collections;
import java.util.Map;
+import java.util.function.Function;
+import com.github.dockerjava.api.exception.NotFoundException;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.camel.quarkus.test.FipsModeUtil;
import org.eclipse.microprofile.config.ConfigProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerFetchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.TestcontainersConfiguration;
public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
protected static final String KAFKA_IMAGE_NAME =
ConfigProvider.getConfig().getValue("kafka.container.image", String.class);
private static final Logger LOGGER =
LoggerFactory.getLogger(KafkaTestResource.class);
private StrimziKafkaContainer container;
+private GenericContainer j17container;
@Override
public Map start() {
LOGGER.info(TestcontainersConfiguration.getInstance().toString());
try {
-container = new StrimziKafkaContainer(KAFKA_IMAGE_NAME)
-/* Added container startup logging because of
https://github.com/apache/camel-quarkus/issues/2461 */
-.withLogConsumer(frame ->
System.out.print(frame.getUtf8String()))
-.waitForRunning();
-
-container.start();
+startContainer(KAFKA_IMAGE_NAME, name -> new
StrimziKafkaContainer(name));
return Collections.singletonMap("camel.component.kafka.brokers",
container.getBootstrapServers());
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+public String start(Function
containerSupplier) {
+LOGGER.info(TestcontainersConfiguration.getInstance().toString());
+
+//if FIPS environment is present, custom container using J17 has to
used because:
+// Password-based encryption support in FIPs mode was implemented in
the Red Hat build of OpenJDK 17 update 4
+if (FipsModeUtil.isFipsMode()) {
+//custom image should be cached for the next usages with following
id
+String customImageName = "camel-quarkus-test-custom-" +
KAFKA_IMAGE_NAME.replaceAll("[\\./]", "-");
+
+try {
+//in case that the image is not accessible, fetch exception is
thrown
+startContainer(customImageName, containerSupplier);
+} catch (ContainerFetchException e) {
+if (e.getCause() instanceof NotFoundException) {
+LOGGER.info("Custom image for kafka (%s) does not exist.
Has to be created.", customImageName);
+
+//start of the customized container will create the image
+//it is not possible to customize existing
StrimziKafkaContainer. Testcontainer API doe not allow
+//to customize the image.
+// This workaround can be removed once the strimzi
container with openjdk 17 is released.
+// According to
https://strimzi.io/blog/2023/01/25/running-apache-kafka-on-fips-enabled-kubernetes-cluster/
+// image should exist
+j17container = new GenericContainer(
+new ImageFromDockerfile(customImageName, false)
+.withDockerfileFromBuilder(builder ->
builder
+
.from("quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1")
+.env("JAVA_HOME",
"/usr/lib/jvm/jre-17")
+.env("PATH",
"/usr/lib/jvm/jre-17/bin:$PATH")
Review Comment:
I'll report the issue to the strimzi and propose a fix. We can remove
workaround once the issue is fixed
--
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] Upgrade Quarkus to 3.11.0.CR1 [camel-quarkus]
jamesnetherton commented on PR #6094: URL: https://github.com/apache/camel-quarkus/pull/6094#issuecomment-2112735520 I've not dug into why there are doc changes for some of the config property types. The tests for those extensions seem to be passing ok regardless... -- 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] Upgrade Quarkus to 3.11.0.CR1 [camel-quarkus]
jamesnetherton opened a new pull request, #6094: URL: https://github.com/apache/camel-quarkus/pull/6094 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Improve keystore generation [camel-quarkus]
JiriOndrusek commented on issue #5967: URL: https://github.com/apache/camel-quarkus/issues/5967#issuecomment-2112727545 I found, that the certificate generator project won't be usable in a more complex use-cases (like cxf-soap) For example in `cxf-soap-ssl`, special constraint is required for the certificate generation, see the [code](https://github.com/apache/camel-quarkus/blob/main/integration-test-groups/cxf-soap/cxf-soap-ssl/pom.xml#L141). To achieve the same result in crtiicate-generator project, we would need to customize this part of [code](https://github.com/cescoffier/certificate-generator/blob/main/certificate-generator/src/main/java/me/escoffier/certs/CertificateUtils.java#L45-L56). My conclusion at this moment is, that we can use the certificate-generator approach in easier cases. (the complex ones would stay the same). Now I plan to go through the project and find places where the usage should be possible. I think that the refactor to certificate generator approach is still worth the try, as it will make all simple certificates generation even simple and clearer for developers. -- 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] Jms temp [camel]
davsclaus opened a new pull request, #14161: URL: https://github.com/apache/camel/pull/14161 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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] Jms temp [camel]
github-actions[bot] commented on PR #14161: URL: https://github.com/apache/camel/pull/14161#issuecomment-2112723012 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch jms-temp updated: CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch jms-temp
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/jms-temp by this push:
new cb63024968e CAMEL-20769: camel-jms:
TemporaryReplyQueueExceptionListener may be causing an endless lock
cb63024968e is described below
commit cb63024968e18fc77323399578f1eb1f4b8bfec2
Author: Claus Ibsen
AuthorDate: Wed May 15 16:36:38 2024 +0200
CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing
an endless lock
---
.../org/apache/camel/catalog/components/activemq.json| 4 ++--
.../resources/org/apache/camel/catalog/components/amqp.json | 4 ++--
.../resources/org/apache/camel/catalog/components/jms.json | 4 ++--
.../org/apache/camel/component/activemq/activemq.json| 4 ++--
.../META-INF/org/apache/camel/component/amqp/amqp.json | 4 ++--
.../META-INF/org/apache/camel/component/jms/jms.json | 4 ++--
.../org/apache/camel/component/jms/JmsConfiguration.java | 2 +-
.../camel/component/jms/reply/ReplyManagerSupport.java | 2 +-
.../builder/endpoint/dsl/AMQPEndpointBuilderFactory.java | 12 ++--
.../builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java | 12 ++--
.../builder/endpoint/dsl/JmsEndpointBuilderFactory.java | 12 ++--
11 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
index 9f08908a75d..b4ed7dedf93 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
@@ -118,7 +118,7 @@
"useMessageIDAsCorrelationID": { "index": 92, "kind": "property",
"displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Specifies whether
JMSMessageID should always be used as JMSC [...]
"waitForProvisionCorrelationToBeUpdatedCounter": { "index": 93, "kind":
"property", "displayName": "Wait For Provision Correlation To Be Updated
Counter", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 50, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Number of times to wait for [...]
"waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "index": 94,
"kind": "property", "displayName": "Wait For Provision Correlation To Be
Updated Thread Sleeping Time", "group": "advanced", "label": "advanced",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "100",
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": [...]
-"waitForTemporaryReplyToToBeUpdatedCounter": { "index": 95, "kind":
"property", "displayName": "Wait For Temporary Reply To To Be Updated Counter",
"group": "advanced", "label": "advanced", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 50, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Number of times to wait for tempora [...]
+"waitForTemporaryReplyToToBeUpdatedCounter": { "index": 95, "kind":
"property", "displayName": "Wait For Temporary Reply To To Be Updated Counter",
"group": "advanced", "label": "advanced", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 200, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Number of times to wait for tempor [...]
"waitForTemporaryReplyToToBeUpdatedThreadSleepingTime": { "index": 96,
"kind": "property", "displayName": "Wait For Temporary Reply To To Be Updated
Thread Sleeping Time", "group": "advanced", "label": "advanced", "required":
false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "100",
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Interv [...]
Re: [PR] kafka-ssl in fips [camel-quarkus]
jamesnetherton commented on code in PR #6091:
URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601766075
##
integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java:
##
@@ -18,38 +18,96 @@
import java.util.Collections;
import java.util.Map;
+import java.util.function.Function;
+import com.github.dockerjava.api.exception.NotFoundException;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.camel.quarkus.test.FipsModeUtil;
import org.eclipse.microprofile.config.ConfigProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerFetchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.TestcontainersConfiguration;
public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
protected static final String KAFKA_IMAGE_NAME =
ConfigProvider.getConfig().getValue("kafka.container.image", String.class);
private static final Logger LOGGER =
LoggerFactory.getLogger(KafkaTestResource.class);
private StrimziKafkaContainer container;
+private GenericContainer j17container;
@Override
public Map start() {
LOGGER.info(TestcontainersConfiguration.getInstance().toString());
try {
-container = new StrimziKafkaContainer(KAFKA_IMAGE_NAME)
-/* Added container startup logging because of
https://github.com/apache/camel-quarkus/issues/2461 */
-.withLogConsumer(frame ->
System.out.print(frame.getUtf8String()))
-.waitForRunning();
-
-container.start();
+startContainer(KAFKA_IMAGE_NAME, name -> new
StrimziKafkaContainer(name));
return Collections.singletonMap("camel.component.kafka.brokers",
container.getBootstrapServers());
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+public String start(Function
containerSupplier) {
+LOGGER.info(TestcontainersConfiguration.getInstance().toString());
+
+//if FIPS environment is present, custom container using J17 has to
used because:
+// Password-based encryption support in FIPs mode was implemented in
the Red Hat build of OpenJDK 17 update 4
+if (FipsModeUtil.isFipsMode()) {
+//custom image should be cached for the next usages with following
id
+String customImageName = "camel-quarkus-test-custom-" +
KAFKA_IMAGE_NAME.replaceAll("[\\./]", "-");
+
+try {
+//in case that the image is not accessible, fetch exception is
thrown
+startContainer(customImageName, containerSupplier);
+} catch (ContainerFetchException e) {
+if (e.getCause() instanceof NotFoundException) {
+LOGGER.info("Custom image for kafka (%s) does not exist.
Has to be created.", customImageName);
+
+//start of the customized container will create the image
+//it is not possible to customize existing
StrimziKafkaContainer. Testcontainer API doe not allow
+//to customize the image.
+// This workaround can be removed once the strimzi
container with openjdk 17 is released.
+// According to
https://strimzi.io/blog/2023/01/25/running-apache-kafka-on-fips-enabled-kubernetes-cluster/
+// image should exist
+j17container = new GenericContainer(
+new ImageFromDockerfile(customImageName, false)
+.withDockerfileFromBuilder(builder ->
builder
+
.from("quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1")
+.env("JAVA_HOME",
"/usr/lib/jvm/jre-17")
+.env("PATH",
"/usr/lib/jvm/jre-17/bin:$PATH")
Review Comment:
Here's the reason I guess:
https://github.com/strimzi/test-container-images/blob/main/images/base/Dockerfile#L6
--
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] kafka-ssl in fips [camel-quarkus]
jamesnetherton commented on PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#issuecomment-2112716029 > I suppose that running platform with CQ locally should be enough, right? Yeah, you can just tweak the CQ version in the platform to 3.11.0-SNAPSHOT, build the project and run a few of the CQ tests. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#issuecomment-2112711692 I also noticed, that I have to do small fix in the `TestCertificateGenerationExtension`, because the docker customization is not necessary for each certificate generation task (so I plan to ass a parameter to annotation `TestContainers`, so I would test docker only in necessary cases -- 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 jms-temp created (now 91cc87c2938)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-temp in repository https://gitbox.apache.org/repos/asf/camel.git at 91cc87c2938 CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock This branch includes the following new commits: new 91cc87c2938 CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock 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.
[PR] [Backport 2.3.x]: fix(e2e): Route trait schema valid in OCP [camel-k]
gansheer opened a new pull request, #5508: URL: https://github.com/apache/camel-k/pull/5508 Backport of #5506 Route Trait should only contains annotations param in the test. As it is skipped on non-openshift infra, we missed the error in the test code. **Release Note** ```release-note fix(e2e): Route trait schema valid in OCP ``` -- 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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601758244 ## integration-tests-support/kafka/pom.xml: ## @@ -52,6 +52,14 @@ io.quarkus quarkus-junit4-mock + +org.apache.camel +camel-util Review Comment: I used `CollectionHelper` from `camel-util` and you are right, I can refactor the code to not use it, therefore I can remove the dependency -- 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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#issuecomment-2112706546 > If possible, it might be a good idea to test that this works ok in the Quarkus Platform before we merge this work. I suppose that running platform with CQ locally should be enough, right? -- 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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601755802 ## integration-tests/kafka-ssl/pom.xml: ## @@ -78,6 +78,10 @@ quarkus-junit4-mock test + +org.apache.camel.quarkus + camel-quarkus-integration-tests-support-certificate Review Comment: yes, my bad, test scope should be there -- 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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601755271 ## pom.xml: ## @@ -86,6 +86,7 @@ 1.78 0.1.2 3.1.5 +0.5.0 Review Comment: sure, I missed the separation for test versions -- 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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091:
URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601754597
##
integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java:
##
@@ -18,38 +18,96 @@
import java.util.Collections;
import java.util.Map;
+import java.util.function.Function;
+import com.github.dockerjava.api.exception.NotFoundException;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.camel.quarkus.test.FipsModeUtil;
import org.eclipse.microprofile.config.ConfigProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerFetchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.TestcontainersConfiguration;
public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
protected static final String KAFKA_IMAGE_NAME =
ConfigProvider.getConfig().getValue("kafka.container.image", String.class);
private static final Logger LOGGER =
LoggerFactory.getLogger(KafkaTestResource.class);
private StrimziKafkaContainer container;
+private GenericContainer j17container;
@Override
public Map start() {
LOGGER.info(TestcontainersConfiguration.getInstance().toString());
try {
-container = new StrimziKafkaContainer(KAFKA_IMAGE_NAME)
-/* Added container startup logging because of
https://github.com/apache/camel-quarkus/issues/2461 */
-.withLogConsumer(frame ->
System.out.print(frame.getUtf8String()))
-.waitForRunning();
-
-container.start();
+startContainer(KAFKA_IMAGE_NAME, name -> new
StrimziKafkaContainer(name));
return Collections.singletonMap("camel.component.kafka.brokers",
container.getBootstrapServers());
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+public String start(Function
containerSupplier) {
+LOGGER.info(TestcontainersConfiguration.getInstance().toString());
+
+//if FIPS environment is present, custom container using J17 has to
used because:
+// Password-based encryption support in FIPs mode was implemented in
the Red Hat build of OpenJDK 17 update 4
+if (FipsModeUtil.isFipsMode()) {
+//custom image should be cached for the next usages with following
id
+String customImageName = "camel-quarkus-test-custom-" +
KAFKA_IMAGE_NAME.replaceAll("[\\./]", "-");
+
+try {
+//in case that the image is not accessible, fetch exception is
thrown
+startContainer(customImageName, containerSupplier);
+} catch (ContainerFetchException e) {
+if (e.getCause() instanceof NotFoundException) {
+LOGGER.info("Custom image for kafka (%s) does not exist.
Has to be created.", customImageName);
+
+//start of the customized container will create the image
+//it is not possible to customize existing
StrimziKafkaContainer. Testcontainer API doe not allow
+//to customize the image.
+// This workaround can be removed once the strimzi
container with openjdk 17 is released.
+// According to
https://strimzi.io/blog/2023/01/25/running-apache-kafka-on-fips-enabled-kubernetes-cluster/
+// image should exist
+j17container = new GenericContainer(
+new ImageFromDockerfile(customImageName, false)
+.withDockerfileFromBuilder(builder ->
builder
+
.from("quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1")
+.env("JAVA_HOME",
"/usr/lib/jvm/jre-17")
+.env("PATH",
"/usr/lib/jvm/jre-17/bin:$PATH")
Review Comment:
I found this blog post, which indicates, that the issue was fixed -
https://strimzi.io/blog/2023/01/25/running-apache-kafka-on-fips-enabled-kubernetes-cluster/
But I tried the newest image and the java is still 11. So I'm not sure what
is wrong.
--
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] kafka-ssl in fips [camel-quarkus]
JiriOndrusek commented on code in PR #6091:
URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601752001
##
integration-tests-support/certificate/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java:
##
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.test.support.certificate;
+
+import java.io.File;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import me.escoffier.certs.AliasRequest;
+import me.escoffier.certs.CertificateFiles;
+import me.escoffier.certs.CertificateGenerator;
+import me.escoffier.certs.CertificateRequest;
+import me.escoffier.certs.junit5.Alias;
+import me.escoffier.certs.junit5.Certificate;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.extension.*;
+import org.junit.platform.commons.util.AnnotationUtils;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+
+/**
+ * Extension is based on
+ *
https://github.com/cescoffier/certificate-generator/blob/main/certificate-generator-junit5/src/main/java/me/escoffier/certs/junit5/CertificateGenerationExtension.java
+ *
+ * Unfortunately there is no way of extending the original Extension with
functionality of modifying CN and
+ * SubjectAlternativeName
+ * based on docker host (required for usage with external docker host)
+ * Therefore I created a new annotation 'TestCertificates' which would use
this new extension.
+ */
+public class TestCertificateGenerationExtension implements BeforeAllCallback,
ParameterResolver {
+private static final Logger LOGGER =
Logger.getLogger(TestCertificateGenerationExtension.class);
+
+public static TestCertificateGenerationExtension
getInstance(ExtensionContext extensionContext) {
+return extensionContext.getStore(ExtensionContext.Namespace.GLOBAL)
+.get(TestCertificateGenerationExtension.class,
TestCertificateGenerationExtension.class);
+}
+
+List certificateFiles = new ArrayList<>();
+
+@Override
+public void beforeAll(ExtensionContext extensionContext) throws Exception {
+
+extensionContext.getStore(ExtensionContext.Namespace.GLOBAL)
+
.getOrComputeIfAbsent(TestCertificateGenerationExtension.class, c -> this);
+var maybe =
AnnotationUtils.findAnnotation(extensionContext.getRequiredTestClass(),
TestCertificates.class);
+if (maybe.isEmpty()) {
+return;
+}
+var annotation = maybe.get();
+
+//cn and alternativeSubjectName might be different (to reflect docker
host)
+Optional cn = resolveDockerHost();
+Optional altSubName = cn.stream().map(h ->
"DNS:%s,IP:%s".formatted(h, h)).findAny();
+
+for (Certificate certificate : annotation.certificates()) {
+String baseDir = annotation.baseDir();
+File file = new File(baseDir);
+file.mkdirs();
+CertificateGenerator generator = new
CertificateGenerator(file.toPath(), annotation.replaceIfExists());
+
+CertificateRequest request = new CertificateRequest()
+.withName(certificate.name())
+.withClientCertificate(certificate.client())
+.withFormats(Arrays.asList(certificate.formats()))
+.withCN(cn.orElse(certificate.cn()))
+.withPassword(certificate.password().isEmpty() ? null :
certificate.password())
+.withDuration(Duration.ofDays(certificate.duration()));
+
+if (cn.isPresent() && cn.get().equals(certificate.cn())) {
+LOGGER.debugf("Used CN '%s' instead of '%s' because of docker
host.", cn.get(), certificate.cn());
+LOGGER.debugf("Added SubjectAlternativeName '%s'.",
altSubName.get());
+}
+
+if (altSubName.isPresent()) {
+request.withSubjectAlternativeName(altSubName.get());
+}
+
+for (String san :
[PR] Auto label issues relating to FIPS [camel-quarkus]
jamesnetherton opened a new pull request, #6093: URL: https://github.com/apache/camel-quarkus/pull/6093 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Re evaluate golanci-lint exclusions (dupl, gofumpt, nestif) [camel-k]
github-actions[bot] commented on PR #5507: URL: https://github.com/apache/camel-k/pull/5507#issuecomment-2112637916 :heavy_check_mark: Unit test coverage report - coverage increased from 38.2% to 38.3% (**+0.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) branch regen_bot updated (894f48cb5ac -> d59bb5c33db)
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 894f48cb5ac (chores) camel-base-engine: remove performance test add d59bb5c33db Upgrade mongodb container to 7.0.9 (#14157) No new revisions were added by this update. Summary of changes: .../org/apache/camel/test/infra/mongodb/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Camel-20439: move camel-cloudevent api to camel-api [camel]
davsclaus commented on PR #14160: URL: https://github.com/apache/camel/pull/14160#issuecomment-2112593185 Update the 4.7 upgrade guide as well about this change -- 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 m709 deleted (was 99409193b2f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch m709 in repository https://gitbox.apache.org/repos/asf/camel.git was 99409193b2f camel-core - Isolate some tests that are flaky on CI (#14156) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Upgrade mongodb container to 7.0.9 (#14157)
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 d59bb5c33db Upgrade mongodb container to 7.0.9 (#14157) d59bb5c33db is described below commit d59bb5c33db341d7f668a03a570d7c4e58a29520 Author: Claus Ibsen AuthorDate: Wed May 15 15:46:49 2024 +0200 Upgrade mongodb container to 7.0.9 (#14157) * Upgrade mongodb container to 7.0.9 * Make incremental-build action generic * Ref is required when $repo/$project is specified * camel-core - Isolate some tests that are flaky on CI (#14156) - Co-authored-by: Croway --- .../org/apache/camel/test/infra/mongodb/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties index b16550cc4dc..1fe8fe2c114 100644 --- a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties +++ b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -mongodb.container=mongo:7.0.4-jammy \ No newline at end of file +mongodb.container=mongo:7.0.9-jammy \ No newline at end of file
Re: [PR] Upgrade mongodb container to 7.0.9 [camel]
davsclaus merged PR #14157: URL: https://github.com/apache/camel/pull/14157 -- 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] Re evaluate golanci-lint exclusions (dupl, gofumpt, nestif) [camel-k]
github-actions[bot] commented on PR #5507: URL: https://github.com/apache/camel-k/pull/5507#issuecomment-2112584497 :heavy_check_mark: Unit test coverage report - coverage increased from 38.2% to 38.3% (**+0.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) branch regen_bot updated (b5dcef0fda6 -> 894f48cb5ac)
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 b5dcef0fda6 camel-core - Isolate some tests that are flaky on CI (#14156) add 894f48cb5ac (chores) camel-base-engine: remove performance test No new revisions were added by this update. Summary of changes: .../camel/impl/engine/ArrayCopyBenchmark.java | 50 -- 1 file changed, 50 deletions(-) delete mode 100644 core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
Re: [PR] kafka-ssl in fips [camel-quarkus]
jamesnetherton commented on PR #6091: URL: https://github.com/apache/camel-quarkus/pull/6091#issuecomment-2112577763 If possible, it might be a good idea to test that this works ok in the Quarkus Platform before we merge this work. -- 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] kafka-ssl in fips [camel-quarkus]
jamesnetherton commented on code in PR #6091:
URL: https://github.com/apache/camel-quarkus/pull/6091#discussion_r1601633677
##
integration-tests-support/kafka/pom.xml:
##
@@ -52,6 +52,14 @@
io.quarkus
quarkus-junit4-mock
+
+org.apache.camel
+camel-util
Review Comment:
Do we need `camel-util`?
##
integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/KafkaTestResource.java:
##
@@ -18,38 +18,96 @@
import java.util.Collections;
import java.util.Map;
+import java.util.function.Function;
+import com.github.dockerjava.api.exception.NotFoundException;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.camel.quarkus.test.FipsModeUtil;
import org.eclipse.microprofile.config.ConfigProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.ContainerFetchException;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.TestcontainersConfiguration;
public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
protected static final String KAFKA_IMAGE_NAME =
ConfigProvider.getConfig().getValue("kafka.container.image", String.class);
private static final Logger LOGGER =
LoggerFactory.getLogger(KafkaTestResource.class);
private StrimziKafkaContainer container;
+private GenericContainer j17container;
@Override
public Map start() {
LOGGER.info(TestcontainersConfiguration.getInstance().toString());
try {
-container = new StrimziKafkaContainer(KAFKA_IMAGE_NAME)
-/* Added container startup logging because of
https://github.com/apache/camel-quarkus/issues/2461 */
-.withLogConsumer(frame ->
System.out.print(frame.getUtf8String()))
-.waitForRunning();
-
-container.start();
+startContainer(KAFKA_IMAGE_NAME, name -> new
StrimziKafkaContainer(name));
return Collections.singletonMap("camel.component.kafka.brokers",
container.getBootstrapServers());
} catch (Exception e) {
throw new RuntimeException(e);
}
}
+public String start(Function
containerSupplier) {
+LOGGER.info(TestcontainersConfiguration.getInstance().toString());
+
+//if FIPS environment is present, custom container using J17 has to
used because:
+// Password-based encryption support in FIPs mode was implemented in
the Red Hat build of OpenJDK 17 update 4
+if (FipsModeUtil.isFipsMode()) {
+//custom image should be cached for the next usages with following
id
+String customImageName = "camel-quarkus-test-custom-" +
KAFKA_IMAGE_NAME.replaceAll("[\\./]", "-");
+
+try {
+//in case that the image is not accessible, fetch exception is
thrown
+startContainer(customImageName, containerSupplier);
+} catch (ContainerFetchException e) {
+if (e.getCause() instanceof NotFoundException) {
+LOGGER.info("Custom image for kafka (%s) does not exist.
Has to be created.", customImageName);
+
+//start of the customized container will create the image
+//it is not possible to customize existing
StrimziKafkaContainer. Testcontainer API doe not allow
+//to customize the image.
+// This workaround can be removed once the strimzi
container with openjdk 17 is released.
+// According to
https://strimzi.io/blog/2023/01/25/running-apache-kafka-on-fips-enabled-kubernetes-cluster/
+// image should exist
+j17container = new GenericContainer(
+new ImageFromDockerfile(customImageName, false)
+.withDockerfileFromBuilder(builder ->
builder
+
.from("quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1")
+.env("JAVA_HOME",
"/usr/lib/jvm/jre-17")
+.env("PATH",
"/usr/lib/jvm/jre-17/bin:$PATH")
Review Comment:
Any idea if there's any open issues with Strimzi to see if they can switch
to JDK 17 in their container images?
If not, we should maybe create one.
##
integration-tests-support/test-support/src/main/java/org/apache/camel/quarkus/test/FipsModeUtil.java:
##
@@ -0,0 +1,58 @@
+/*
+ * 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
(camel) branch main updated: (chores) camel-base-engine: remove performance test
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 894f48cb5ac (chores) camel-base-engine: remove performance test
894f48cb5ac is described below
commit 894f48cb5ac0d08f71691dc7d446c4b611daaf05
Author: Otavio Rodolfo Piske
AuthorDate: Wed May 15 14:53:06 2024 +0200
(chores) camel-base-engine: remove performance test
---
.../camel/impl/engine/ArrayCopyBenchmark.java | 50 --
1 file changed, 50 deletions(-)
diff --git
a/core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
b/core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
deleted file mode 100644
index a727980cad0..000
---
a/core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.impl.engine;
-
-import java.util.Arrays;
-
-import org.openjdk.jmh.annotations.*;
-
-@State(Scope.Benchmark)
-public class ArrayCopyBenchmark {
-
-private static final int ARRAY_SIZE = 10; // Adjust as needed
-
-private Object[] sourceArray;
-private Object[] destArray;
-
-@Setup
-public void setup() {
-sourceArray = new Object[ARRAY_SIZE];
-destArray = new Object[ARRAY_SIZE];
-}
-
-@Benchmark
-public void systemArrayCopy() {
-System.arraycopy(sourceArray, 0, destArray, 0, ARRAY_SIZE);
-}
-
-@Benchmark
-public void arraysFill() {
-Arrays.fill(destArray, null);
-}
-
-public static void main(String[] args) throws Exception {
-org.openjdk.jmh.Main.main(args);
-}
-}
Re: [PR] (chores) camel-base-engine: remove performance test [camel]
orpiske merged PR #14159: URL: https://github.com/apache/camel/pull/14159 -- 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] (#5489) Groovy > Yaml [camel-k]
oscerd commented on PR #5497: URL: https://github.com/apache/camel-k/pull/5497#issuecomment-2112551397 > ``` > $ ./docs/local-build.sh quick > [15:31:01.130] INFO (@djencks/antora-timer): stage playbookBuilt took 0.167s > [15:31:01.132] INFO (@djencks/antora-timer): Extensions after stage playbookBuilt took 0.002s > [15:31:01.135] INFO (@djencks/antora-timer): stage beforeProcess took 0.003s > [15:31:01.136] INFO (@djencks/antora-timer): Extensions after stage beforeProcess took 0.001s > [15:31:01.229] INFO (@djencks/antora-timer): stage uiLoaded took 0.093s > [15:31:01.229] INFO (@djencks/antora-timer): Extensions after stage uiLoaded took 0s > [15:31:01.258] INFO (@djencks/antora-timer): stage contentAggregated took 0.029s > [15:31:01.259] INFO (@djencks/antora-timer): Extensions after stage contentAggregated took 0.001s > [15:31:01.262] INFO (@djencks/antora-timer): stage contentClassified took 0.003s > [15:31:01.289] INFO (@djencks/antora-timer): Extensions after stage contentClassified took 0.027s > [15:31:02.842] INFO (@djencks/antora-timer): stage documentsConverted took 1.553s > [15:31:02.842] INFO (@djencks/antora-timer): Extensions after stage documentsConverted took 0s > [15:31:02.849] INFO (@djencks/antora-timer): stage navigationBuilt took 0.007s > [15:31:02.849] INFO (@djencks/antora-timer): Extensions after stage navigationBuilt took 0s > [15:31:03.049] INFO (@djencks/antora-timer): stage pagesComposed took 0.2s > [15:31:03.049] INFO (@djencks/antora-timer): Extensions after stage pagesComposed took 0s > [15:31:03.050] INFO (@djencks/antora-timer): stage redirectsProduced took 0.001s > [15:31:03.050] INFO (@djencks/antora-timer): Extensions after stage redirectsProduced took 0s > [15:31:03.052] INFO (@djencks/antora-timer): stage siteMapped took 0.002s > [15:31:03.052] INFO (@djencks/antora-timer): Extensions after stage siteMapped took 0s > [15:31:03.052] INFO (@djencks/antora-timer): stage beforePublish took 0s > [15:31:03.052] INFO (@djencks/antora-timer): Extensions after stage beforePublish took 0s > Site generation complete! > Open file:///Users/tdiesler/git/camel-website/documentation in a browser to view your site. > [15:31:03.133] INFO (@djencks/antora-timer): stage sitePublished took 0.081s > [15:31:03.133] INFO (@djencks/antora-timer): stage sitePublished took 0s > [15:31:03.133] INFO (@djencks/antora-timer): total build time 2.17s > ``` This is good, but the full build from the website on the CI might fail anyway. It happened before. But this is great! Thanks @tdiesler -- 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] (#5489) Groovy > Yaml [camel-k]
tdiesler commented on PR #5497: URL: https://github.com/apache/camel-k/pull/5497#issuecomment-2112542048 ``` $ ./docs/local-build.sh quick [15:31:01.130] INFO (@djencks/antora-timer): stage playbookBuilt took 0.167s [15:31:01.132] INFO (@djencks/antora-timer): Extensions after stage playbookBuilt took 0.002s [15:31:01.135] INFO (@djencks/antora-timer): stage beforeProcess took 0.003s [15:31:01.136] INFO (@djencks/antora-timer): Extensions after stage beforeProcess took 0.001s [15:31:01.229] INFO (@djencks/antora-timer): stage uiLoaded took 0.093s [15:31:01.229] INFO (@djencks/antora-timer): Extensions after stage uiLoaded took 0s [15:31:01.258] INFO (@djencks/antora-timer): stage contentAggregated took 0.029s [15:31:01.259] INFO (@djencks/antora-timer): Extensions after stage contentAggregated took 0.001s [15:31:01.262] INFO (@djencks/antora-timer): stage contentClassified took 0.003s [15:31:01.289] INFO (@djencks/antora-timer): Extensions after stage contentClassified took 0.027s [15:31:02.842] INFO (@djencks/antora-timer): stage documentsConverted took 1.553s [15:31:02.842] INFO (@djencks/antora-timer): Extensions after stage documentsConverted took 0s [15:31:02.849] INFO (@djencks/antora-timer): stage navigationBuilt took 0.007s [15:31:02.849] INFO (@djencks/antora-timer): Extensions after stage navigationBuilt took 0s [15:31:03.049] INFO (@djencks/antora-timer): stage pagesComposed took 0.2s [15:31:03.049] INFO (@djencks/antora-timer): Extensions after stage pagesComposed took 0s [15:31:03.050] INFO (@djencks/antora-timer): stage redirectsProduced took 0.001s [15:31:03.050] INFO (@djencks/antora-timer): Extensions after stage redirectsProduced took 0s [15:31:03.052] INFO (@djencks/antora-timer): stage siteMapped took 0.002s [15:31:03.052] INFO (@djencks/antora-timer): Extensions after stage siteMapped took 0s [15:31:03.052] INFO (@djencks/antora-timer): stage beforePublish took 0s [15:31:03.052] INFO (@djencks/antora-timer): Extensions after stage beforePublish took 0s Site generation complete! Open file:///Users/tdiesler/git/camel-website/documentation in a browser to view your site. [15:31:03.133] INFO (@djencks/antora-timer): stage sitePublished took 0.081s [15:31:03.133] INFO (@djencks/antora-timer): stage sitePublished took 0s [15:31:03.133] INFO (@djencks/antora-timer): total build time 2.17s ``` -- 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-20439: move camel-cloudevent api to camel-api [camel]
oscerd commented on PR #14160: URL: https://github.com/apache/camel/pull/14160#issuecomment-2112537110 @christophd It should have some effect on camel k and quarkus too -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix(e2e): Route trait schema valid in OCP [camel-k]
gansheer opened a new pull request, #5506: URL: https://github.com/apache/camel-k/pull/5506 Route Trait should only contains `annotations` param in the test. As it is skipped on non-openshift infra, we missed the error in the test code. **Release Note** ```release-note fix(e2e): Route trait schema valid in OCP ``` -- 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-20439: move camel-cloudevent api to camel-api [camel]
jono-morris commented on PR #14160: URL: https://github.com/apache/camel/pull/14160#issuecomment-2112523651 /component-test aws azure google knative -- 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-20439: move camel-cloudevent api to camel-api [camel]
github-actions[bot] commented on PR #14160: URL: https://github.com/apache/camel/pull/14160#issuecomment-2112524933 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Camel-20439: move camel-cloudevent api to camel-api [camel]
github-actions[bot] commented on PR #14160: URL: https://github.com/apache/camel/pull/14160#issuecomment-2112520785 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Camel-20439: move camel-cloudevent api to camel-api [camel]
jono-morris opened a new pull request, #14160: URL: https://github.com/apache/camel/pull/14160 # Description Moved camel-cloudevents api into camel-api and removed dependencies on this component. # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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] Split MicroProfile integration tests into separate modules [camel-quarkus]
jamesnetherton opened a new pull request, #6092: URL: https://github.com/apache/camel-quarkus/pull/6092 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] (chores) camel-base-engine: remove performance test [camel]
github-actions[bot] commented on PR #14159: URL: https://github.com/apache/camel/pull/14159#issuecomment-2112443403 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] (chores) camel-base-engine: remove performance test [camel]
orpiske opened a new pull request, #14159: URL: https://github.com/apache/camel/pull/14159 Let's keep these on the camel-performance-test repo. -- 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] (#5489) Groovy > Yaml [camel-k]
oscerd commented on PR #5497: URL: https://github.com/apache/camel-k/pull/5497#issuecomment-2112436236 If we merge, let's run the ci-build for website here: https://ci-builds.apache.org/job/Camel/job/Camel.website/job/main/ in case something is broken we need to fix it soon or revert. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch main updated: Implement incremental-build gh action
This is an automated email from the ASF dual-hosted git repository.
fmariani 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 422a2f5cfa7 Implement incremental-build gh action
422a2f5cfa7 is described below
commit 422a2f5cfa71698208a35ead4656f3c4ae1f6229
Author: Croway
AuthorDate: Mon May 6 13:42:38 2024 +0200
Implement incremental-build gh action
---
.github/workflows/pr-build-main.yml | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pr-build-main.yml
b/.github/workflows/pr-build-main.yml
index d0bbb38d358..27cb745799c 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -42,8 +42,14 @@ jobs:
java-version: 17
distribution: 'temurin'
cache: 'maven'
-- name: Maven Build
- run: ./mvnw -l build.log -V --no-transfer-progress -Psourcecheck
-Dci.env.name=github.com clean install
+- name: Maven Test
+ uses: apache/camel/.github/actions/incremental-build@main
+ with:
+mode: test
+pr-id: ${{ github.event.number }}
+github-token: ${{ env.GITHUB_TOKEN_TOKEN }}
+skip-mvnd-install: 'false'
+github-repo: apache/camel-spring-boot
- name: Archive Logs
uses: actions/upload-artifact@v4
if: always()
Re: [PR] Implement incremental-build gh action [camel-spring-boot]
Croway merged PR #1147: URL: https://github.com/apache/camel-spring-boot/pull/1147 -- 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 (66610aea8da -> b5dcef0fda6)
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 66610aea8da CAMEL-20763: camel-support Handle special characters in REST templates (#14145) add 419480ed59a Make incremental-build action generic add a78cb2157d3 Ref is required when $repo/$project is specified add b5dcef0fda6 camel-core - Isolate some tests that are flaky on CI (#14156) No new revisions were added by this update. Summary of changes: .github/actions/incremental-build/action.yaml | 8 ++-- .github/actions/incremental-build/incremental-build.sh | 14 -- .../apache/camel/support/jsse/FilterParametersTest.java| 2 ++ .../camel/support/jsse/KeyManagersParametersTest.java | 4 +++- .../apache/camel/support/jsse/KeyStoreParametersTest.java | 2 +- .../camel/support/jsse/SSLContextParametersTest.java | 4 +++- .../camel/support/jsse/SecureRandomParametersTest.java | 2 ++ .../camel/support/jsse/TrustManagersParametersTest.java| 4 +++- .../org/apache/camel/support/jsse/test.properties | 2 +- 9 files changed, 29 insertions(+), 13 deletions(-)
