(camel-quarkus) branch dependabot/maven/com.unboundid-unboundid-ldapsdk-6.0.11 deleted (was 4f0aaeac75)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/com.unboundid-unboundid-ldapsdk-6.0.11 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 4f0aaeac75 Bump com.unboundid:unboundid-ldapsdk from 6.0.10 to 6.0.11 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-quarkus) branch main updated: Bump com.unboundid:unboundid-ldapsdk from 6.0.10 to 6.0.11
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 72cdb07401 Bump com.unboundid:unboundid-ldapsdk from 6.0.10 to 6.0.11 72cdb07401 is described below commit 72cdb07401b4ec463c6e6135dd85547760162c13 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Nov 30 21:26:43 2023 + Bump com.unboundid:unboundid-ldapsdk from 6.0.10 to 6.0.11 Bumps [com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) from 6.0.10 to 6.0.11. - [Release notes](https://github.com/pingidentity/ldapsdk/releases) - [Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html) - [Commits](https://github.com/pingidentity/ldapsdk/commits) --- updated-dependencies: - dependency-name: com.unboundid:unboundid-ldapsdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 738d6ad2d3..2db2907147 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ 4.13.0 ${pdfbox-version} 2.10.0 -6.0.10 +6.0.11 3.0.0-beta-10 1.12
Re: [PR] Bump com.unboundid:unboundid-ldapsdk from 6.0.10 to 6.0.11 [camel-quarkus]
jamesnetherton merged PR #5580: URL: https://github.com/apache/camel-quarkus/pull/5580 -- 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 (0fa1294b2e5 -> 33222579cc6)
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 0fa1294b2e5 CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. (#12293) add 33222579cc6 Upgrade grpc 1.59.1 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (0fa1294b2e5 -> 33222579cc6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 0fa1294b2e5 CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. (#12293) add 33222579cc6 Upgrade grpc 1.59.1 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] CAMEL-20121 reconnect SMPP session after receiving Unbound [camel]
davsclaus commented on PR #12046: URL: https://github.com/apache/camel/pull/12046#issuecomment-1837061225 @der-ambi are you able to work on the last bit -- 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] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1837002706 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 7067387253-1318-b86a5d96-bfc0-4baa-a4cf-8d549dc7efc5 * Camel Quarkus Commit: 52a0efc489243a829dda0192f7a967d04adbe319 * Quarkus Main Commit: e691b5af0fc08cfb7bc2d53e426eb7c495b38d11 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/7067387253 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
jamesnetherton opened a new issue, #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/camel-master-cron.yaml) for the [`camel-main`](https://github.com/apache/camel-quarkus/tree/camel-main) branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [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-1836994951 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 7066592274-1214-404a777e-9b9d-4f6b-8204-53cc5705230c * Camel Quarkus Commit: 845d2ecd1fe18af21531ee79174717930b1e3cf6 * Camel Main Commit: e691b5af0fc08cfb7bc2d53e426eb7c495b38d11 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/7066592274 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) 12/14: Disabled native for tarfile test - #5538
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 03cad63fe33312047c27e84c59c3290c66cfb049 Author: JiriOndrusek AuthorDate: Fri Dec 1 13:19:15 2023 +0100 Disabled native for tarfile test - #5538 --- integration-tests/tarfile/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/tarfile/pom.xml b/integration-tests/tarfile/pom.xml index fb2cd64898..4a96572f44 100644 --- a/integration-tests/tarfile/pom.xml +++ b/integration-tests/tarfile/pom.xml @@ -59,7 +59,8 @@ - + virtualDependencies
(camel-quarkus) 03/14: Fixed Joor because of CAMEL-20137
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 777b5f18a1c393e2089c5f77baab0b99c9e85542 Author: JiriOndrusek AuthorDate: Wed Nov 22 11:02:31 2023 +0100 Fixed Joor because of CAMEL-20137 --- docs/modules/ROOT/examples/languages/{joor.yml => java.yml} | 8 docs/modules/ROOT/examples/languages/joor.yml| 2 +- docs/modules/ROOT/pages/reference/extensions/joor.adoc | 9 + .../quarkus/component/joor/deployment/JoorProcessor.java | 12 ++-- .../component/joor/runtime/JoorExpressionRecorder.java | 10 +- .../apache/camel/quarkus/component/joor/it/JoorRoute.java| 6 +++--- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/docs/modules/ROOT/examples/languages/joor.yml b/docs/modules/ROOT/examples/languages/java.yml similarity index 69% copy from docs/modules/ROOT/examples/languages/joor.yml copy to docs/modules/ROOT/examples/languages/java.yml index 2d199ab3dd..1ae6c0ce4e 100644 --- a/docs/modules/ROOT/examples/languages/joor.yml +++ b/docs/modules/ROOT/examples/languages/java.yml @@ -4,10 +4,10 @@ cqArtifactId: camel-quarkus-joor cqArtifactIdBase: joor cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 2.0.0 cqNativeSince: 3.2.0 -cqCamelPartName: joor -cqCamelPartTitle: jOOR -cqCamelPartDescription: Evaluates a jOOR (Java compiled once at runtime) expression. +cqCamelPartName: java +cqCamelPartTitle: Java +cqCamelPartDescription: Evaluates a Java (Java compiled once at runtime) expression. cqExtensionPageTitle: jOOR diff --git a/docs/modules/ROOT/examples/languages/joor.yml b/docs/modules/ROOT/examples/languages/joor.yml index 2d199ab3dd..c0448be9f2 100644 --- a/docs/modules/ROOT/examples/languages/joor.yml +++ b/docs/modules/ROOT/examples/languages/joor.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-joor cqArtifactIdBase: joor cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 2.0.0 cqNativeSince: 3.2.0 cqCamelPartName: joor diff --git a/docs/modules/ROOT/pages/reference/extensions/joor.adoc b/docs/modules/ROOT/pages/reference/extensions/joor.adoc index e8af9d47a0..1cfca00282 100644 --- a/docs/modules/ROOT/pages/reference/extensions/joor.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/joor.adoc @@ -6,15 +6,15 @@ :cq-artifact-id: camel-quarkus-joor :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Evaluate a jOOR (Java compiled once at runtime) expression language. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 2.0.0 :cq-native-since: 3.2.0 ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native since##[.badge-supported]##3.2.0## +[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native since##[.badge-supported]##3.2.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## endif::[] Evaluate a jOOR (Java compiled once at runtime) expression language. @@ -22,9 +22,10 @@ Evaluate a jOOR (Java compiled once at runtime) expression language. [id="extensions-joor-whats-inside"] == What's inside +* xref:{cq-camel-components}:languages:java-language.adoc[Java language] * xref:{cq-camel-components}:languages:joor-language.adoc[jOOR language] -Please refer to the above link for usage and configuration details. +Please refer to the above links for usage and configuration details. [id="extensions-joor-maven-coordinates"] == Maven coordinates diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java index 03ef3755a7..392d824cad 100644 --- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java +++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java @@ -39,9 +39,9 @@ import org.apache.camel.CamelContext; import org.apache.camel.dsl.java.joor.CompilationUnit; import org.apache.camel.dsl.java.joor.MultiCompile; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.language.joor.JavaLanguage; import org.apache.camel.language.joor.JoorCompiler; import org.apache.camel.language.joor.JoorExpression; -import org.apache.camel.language.joor.JoorLanguage; import org.apache.camel.language.joor.JoorScriptingCompiler; import org.apache.camel.quarkus.component.joor.runtime.JoorExpressionCompiler; import org.apache.camel.quarkus.component.joor.runtime.JoorExpressionConfig; @@ -76,17 +76,17 @@ class JoorProcessor { BuildProducer producer) throws Exce
(camel-quarkus) 14/14: Disabled JTA & SQL native because of spring update #5583
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit ec9bbdb6284cb7157b448eabdd9d8f0b66889d75 Author: JiriOndrusek AuthorDate: Fri Dec 1 15:12:05 2023 +0100 Disabled JTA & SQL native because of spring update #5583 --- integration-tests/jta/pom.xml | 5 +++-- integration-tests/sql/pom.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-tests/jta/pom.xml b/integration-tests/jta/pom.xml index 017bb3d6a8..5697734c98 100644 --- a/integration-tests/jta/pom.xml +++ b/integration-tests/jta/pom.xml @@ -88,7 +88,8 @@ - + + virtualDependencies diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml index 01ec2d33ce..9587bedf78 100644 --- a/integration-tests/sql/pom.xml +++ b/integration-tests/sql/pom.xml @@ -105,7 +105,8 @@ - + + virtualDependencies
(camel-quarkus) 10/14: Fixed core eip tests throttling + generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 329e52fb25f6e97291102ba99af636d58e346550 Author: JiriOndrusek AuthorDate: Thu Nov 30 13:17:36 2023 +0100 Fixed core eip tests throttling + generated files --- .../apache/camel/quarkus/eip/it/EipResource.java | 20 +- .../org/apache/camel/quarkus/eip/it/EipRoutes.java | 4 +- .../org/apache/camel/quarkus/eip/it/EipTest.java | 33 +-- poms/bom/src/main/generated/flattened-full-pom.xml | 4 +- .../src/main/generated/flattened-reduced-pom.xml | 4 +- .../generated/flattened-reduced-verbose-pom.xml| 311 ++--- 6 files changed, 187 insertions(+), 189 deletions(-) diff --git a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipResource.java b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipResource.java index d2bf703d69..473a256219 100644 --- a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipResource.java +++ b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipResource.java @@ -48,16 +48,34 @@ public class EipResource { @Inject CamelContext context; +@Path("/routeAsync/{route}") +@POST +@Consumes(MediaType.TEXT_PLAIN) +@Produces(MediaType.TEXT_PLAIN) +public Response routeAsync(String statement, @PathParam("route") String route, @Context UriInfo uriInfo) { +return route(statement, route, uriInfo, true); +} + @Path("/route/{route}") @POST @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN) -public Response route(String statement, @PathParam("route") String route, @Context UriInfo uriInfo) { +public Response routeSync(String statement, @PathParam("route") String route, @Context UriInfo uriInfo) { +return route(statement, route, uriInfo, false); +} + +public Response route(String statement, String route, @Context UriInfo uriInfo, boolean async) { final Map headers = uriInfo.getQueryParameters().entrySet().stream() .map(e -> new AbstractMap.SimpleImmutableEntry(e.getKey(), e.getValue().get(0))) .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); try { +if (async) { +producerTemplate.asyncRequestBodyAndHeaders("direct:" + route, statement, headers, String.class); +return Response.ok().build(); +} + String result = producerTemplate.requestBodyAndHeaders("direct:" + route, statement, headers, String.class); +System.out.println(" result for " + statement + " is " + result); return Response.ok(result).build(); } catch (CamelExecutionException e) { return Response.serverError().entity(e.getMessage()).build(); diff --git a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java index f34207c615..0a454b5a94 100644 --- a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java +++ b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java @@ -28,7 +28,7 @@ import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer; @ApplicationScoped public class EipRoutes extends RouteBuilder { -public static final int THROTTLE_PERIOD = 500; +public static final int THROTTLE_TIMEOUT = 1; public static final int THROTTLE_MAXIMUM_REQUEST_COUNT = 2; public static final int WEIGHTED_1 = 2; public static final int WEIGHTED_2 = 1; @@ -124,7 +124,7 @@ public class EipRoutes extends RouteBuilder { .setBody(e -> "Hello from thread " + Thread.currentThread().getName()); from("direct:throttle") - .throttle(THROTTLE_MAXIMUM_REQUEST_COUNT).rejectExecution(true).delay(THROTTLE_PERIOD) + .throttle(THROTTLE_MAXIMUM_REQUEST_COUNT).rejectExecution(true).delay(THROTTLE_TIMEOUT) .to("mock:throttle"); from("direct:tryCatchFinally") diff --git a/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java b/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java index 31996161c9..b7bd657358 100644 --- a/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java +++ b/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java @@ -17,12 +17,9 @@ package org.apache.camel.quarkus.eip.it; import java.util.Arrays; -import java.util.HashMap; import java.util.HashSet; import
(camel-quarkus) 13/14: Disabled spring-rabbitmq because of spring update #5583
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6d1dba629b6977ec2da64b4b09dcf282f705f904 Author: JiriOndrusek AuthorDate: Fri Dec 1 14:51:41 2023 +0100 Disabled spring-rabbitmq because of spring update #5583 --- integration-tests/spring-rabbitmq/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/spring-rabbitmq/pom.xml b/integration-tests/spring-rabbitmq/pom.xml index 764b7f4640..6ba4b1b432 100644 --- a/integration-tests/spring-rabbitmq/pom.xml +++ b/integration-tests/spring-rabbitmq/pom.xml @@ -79,7 +79,8 @@ - + + virtualDependencies
(camel-quarkus) 06/14: Generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 703ba5994c2d8ba1ff9afefdfba061bbd5eff2f8 Author: JiriOndrusek AuthorDate: Thu Nov 23 08:45:20 2023 +0100 Generated files --- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 12 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 17 +++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index e1b40e12bc..e8ab79d27c 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} -6.0.22.2 +6.1.2.2 ${httpclient-version} 9.3.2.1 ${icu4j-version} diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 80901f9bc4..a8cb0c83b3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5979,32 +5979,32 @@ ca.uhn.hapi.fhir org.hl7.fhir.dstu2 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.dstu2016may -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.dstu3 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.r4 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.r5 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.utilities -6.0.22.2 +6.1.2.2 com.azure diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index b5bf28fdcf..3d4f2b0d0b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5979,32 +5979,32 @@ ca.uhn.hapi.fhir org.hl7.fhir.dstu2 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.dstu2016may -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.dstu3 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.r4 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.r5 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.utilities -6.0.22.2 +6.1.2.2 com.azure @@ -7697,6 +7697,11 @@ metrics-core 4.0.1 + +junit +junit +4.13.1 + org.reflections reflections
(camel-quarkus) 07/14: Fixed compilation issue in fhir
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit fc5bf14abd280619cdcb167686288cd304c7b3fb Author: JiriOndrusek AuthorDate: Thu Nov 23 09:10:39 2023 +0100 Fixed compilation issue in fhir --- poms/bom/pom.xml | 6 ++ poms/bom/src/main/generated/flattened-full-pom.xml| 6 ++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 11 ++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 1a3277fb9b..79253f0c01 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6031,6 +6031,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 ${hapi-fhir.version} + + +junit +junit + + ca.uhn.hapi.fhir diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a8cb0c83b3..4be756b08c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5955,6 +5955,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 6.10.0 + + +junit +junit + + ca.uhn.hapi.fhir diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 3d4f2b0d0b..45eeb83171 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5955,6 +5955,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 6.10.0 + + +junit +junit + + ca.uhn.hapi.fhir @@ -7697,11 +7703,6 @@ metrics-core 4.0.1 - -junit -junit -4.13.1 - org.reflections reflections
(camel-quarkus) 02/14: Fixed compilation issues with fhir, http + generated stuff
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0e2935689a7f817a3a40dddf85f10d883404aea7 Author: JiriOndrusek AuthorDate: Tue Nov 21 10:37:08 2023 +0100 Fixed compilation issues with fhir, http + generated stuff --- .../ROOT/pages/reference/extensions/jolt.adoc | 6 --- .../fhir/deployment/r4/FhirR4Processor.java| 2 +- pom.xml| 8 ++-- poms/bom/pom.xml | 6 +++ poms/bom/src/main/generated/flattened-full-pom.xml | 54 -- .../src/main/generated/flattened-reduced-pom.xml | 48 ++- .../generated/flattened-reduced-verbose-pom.xml| 48 ++- 7 files changed, 95 insertions(+), 77 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/jolt.adoc b/docs/modules/ROOT/pages/reference/extensions/jolt.adoc index 8d371487fc..eb12bdc6af 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jolt.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jolt.adoc @@ -45,12 +45,6 @@ ifeval::[{doc-show-user-guide-link} == true] Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. endif::[] -[id="extensions-jolt-allowcontextmapall-option-in-native-mode"] -== allowContextMapAll option in native mode - -The `allowContextMapAll` option is not supported in native mode as it requires reflective access to security sensitive camel core classes such as -`CamelContext` & `Exchange`. This is considered a security risk and thus access to the feature is not provided by default. - [id="extensions-jolt-additional-camel-quarkus-configuration"] == Additional Camel Quarkus configuration diff --git a/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java b/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java index 86581c95f6..8c71a2e1fe 100644 --- a/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java +++ b/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java @@ -43,7 +43,7 @@ import static org.apache.camel.quarkus.component.fhir.deployment.FhirUtil.getMod import static org.apache.camel.quarkus.component.fhir.deployment.FhirUtil.getResourceDefinitions; public class FhirR4Processor { -private static final String FHIR_VERSION_PROPERTIES = "org/hl7/fhir/r4/model/fhirversion.properties"; +private static final String FHIR_VERSION_PROPERTIES = "org/hl7/fhir/r4/hapi/model/fhirversion.properties"; @BuildStep(onlyIf = FhirFlags.R4Enabled.class) R4PropertiesBuildItem fhirProperties() { diff --git a/pom.xml b/pom.xml index 74d0aa4ae8..e1b40e12bc 100644 --- a/pom.xml +++ b/pom.xml @@ -98,16 +98,16 @@ 1.313 1.20.0 ${google-oauth-client-version} -0.207.0 - 1.125.8 -1.125.8 +0.208.0 + 1.125.11 + 1.125.11 23.0.1 4.0.15 1.59.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} -6.0.1 +6.0.22.2 ${httpclient-version} 9.3.2.1 ${icu4j-version} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 1a3277fb9b..9989550645 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6532,6 +6532,12 @@ org.apache.httpcomponents.client5 httpclient5 ${httpclient5.version} + + +httpcore5-h2 +org.apache.httpcomponents.core5 + + org.apache.httpcomponents.core5 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index cff163ac42..e7836a6844 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5930,7 +5930,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -6.6.2 +6.8.5 com.google.code.findbugs @@ -5949,62 +5949,62 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.6.2 +6.8.5 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.6.2 +6.8.5 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.6.2 +6.8.5 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.6.2 +6.8.5 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.6.2 +
(camel-quarkus) 05/14: Disabled tarfile tests #5538
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 63dc554832a8cc61f33d9050c80bd3df98530c67 Author: JiriOndrusek AuthorDate: Wed Nov 22 14:36:18 2023 +0100 Disabled tarfile tests #5538 --- .../quarkus/component/tarfile/it/TarfileTest.java | 2 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 32 +++--- .../src/main/generated/flattened-reduced-pom.xml | 32 +++--- .../generated/flattened-reduced-verbose-pom.xml| 32 +++--- 4 files changed, 50 insertions(+), 48 deletions(-) diff --git a/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java b/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java index aaa072c2b1..e0b59408f8 100644 --- a/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java +++ b/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java @@ -28,9 +28,11 @@ import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @QuarkusTest +@Disabled //https://github.com/apache/camel-quarkus/issues/5538 class TarfileTest { @Test diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1f631607bd..80901f9bc4 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5885,52 +5885,52 @@ ca.uhn.hapi hapi-base -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v21 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v22 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v23 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v231 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v24 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v25 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v251 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v26 -2.3 +2.5.1 ca.uhn.hapi.fhir hapi-fhir-base -6.8.5 +6.10.0 com.google.code.findbugs @@ -5949,32 +5949,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6.8.5 +6.10.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -6.8.5 +6.10.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -6.8.5 +6.10.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -6.8.5 +6.10.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -6.8.5 +6.10.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -6.8.5 +6.10.0 ca.uhn.hapi.fhir diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 2707e35a5f..b5bf28fdcf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5885,52 +5885,52 @@ ca.uhn.hapi hapi-base -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v21 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v22 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v23 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v231 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v24 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v25 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v251 -2.3 +2.5.1 ca.uhn.hapi hapi-structures-v26 -2.3 +2.5.1 ca.uhn.hapi.fhir hapi-fhir-base -6.8.5 +6.10.0 com.google.code.findbugs @@ -5949,32 +5949,32 @@ ca.uhn.hapi.fhir hapi-fhir-client -6
(camel-quarkus) 11/14: Fix of upgraded spring-version to 6.1.1
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit cd62088ad40b66ed38a2c32a7a18bcc892ef0852 Author: JiriOndrusek AuthorDate: Fri Dec 1 11:33:03 2023 +0100 Fix of upgraded spring-version to 6.1.1 --- .../support/spring/graal/SpringKotlinSubstitutions.java | 16 .../support/spring/graal/SpringSubstitutions.java| 5 - extensions-support/spring/shade/beans/pom.xml| 1 + 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java index 08c61492c5..51bed4412f 100644 --- a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java +++ b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.support.spring.graal; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Type; @@ -53,20 +51,6 @@ final class SubstituteKotlinDetector { final class SubstituteKotlinReflectionParameterNameDiscoverer { } -@TargetClass(className = "org.springframework.beans.BeanUtils$KotlinDelegate") -final class SubstituteBeanUtilsKotlinDelegate { -@Substitute -public static Constructor findPrimaryConstructor(Class clazz) { -throw new UnsupportedOperationException("Kotlin is not supported"); -} - -@Substitute -public static T instantiateClass(Constructor ctor, Object... args) -throws IllegalAccessException, InvocationTargetException, InstantiationException { -throw new UnsupportedOperationException("Kotlin is not supported"); -} -} - @TargetClass(className = "org.springframework.core.MethodParameter$KotlinDelegate") final class SubstituteMethodParameterKotlinDelegate { @Substitute diff --git a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java index b0bad899c1..559ac4b260 100644 --- a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java +++ b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java @@ -44,11 +44,6 @@ final class SubstituteDefaultParameterNameDiscoverer { final class SubstituteStandardReflectionParameterNameDiscoverer { } -@TargetClass(className = "org.springframework.core.LocalVariableTableParameterNameDiscoverer") -@Delete -final class SubstituteLocalVariableTableParameterNameDiscoverer { -} - @TargetClass(className = "org.springframework.core.io.VfsUtils") @Delete final class SubstituteVfsUtils { diff --git a/extensions-support/spring/shade/beans/pom.xml b/extensions-support/spring/shade/beans/pom.xml index 7f067ee6ed..c774af7104 100644 --- a/extensions-support/spring/shade/beans/pom.xml +++ b/extensions-support/spring/shade/beans/pom.xml @@ -70,6 +70,7 @@ org/springframework/beans/factory/groovy/** + org/springframework/beans/BeanUtils$Kotlin*
(camel-quarkus) 08/14: Resolved conflit + generated files
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 143e644dc459ce4a5f07226e2d8bbb68dc715a94 Author: JiriOndrusek AuthorDate: Fri Nov 24 09:51:31 2023 +0100 Resolved conflit + generated files --- docs/modules/ROOT/examples/others/aws-xray.yml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- .../src/main/generated/flattened-reduced-pom.xml | 2 +- .../generated/flattened-reduced-verbose-pom.xml| 327 +++-- 4 files changed, 172 insertions(+), 161 deletions(-) diff --git a/docs/modules/ROOT/examples/others/aws-xray.yml b/docs/modules/ROOT/examples/others/aws-xray.yml index 4c8eedb33b..972d9ee48d 100644 --- a/docs/modules/ROOT/examples/others/aws-xray.yml +++ b/docs/modules/ROOT/examples/others/aws-xray.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.2.0 cqNativeSince: n/a cqCamelPartName: aws-xray cqCamelPartTitle: AWS XRay -cqCamelPartDescription: Distributed tracing using AWS XRay +cqCamelPartDescription: Enable Distributed tracing using AWS XRay cqExtensionPageTitle: AWS XRay diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4be756b08c..4912a8fe2f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6788,7 +6788,7 @@ org.springframework.data spring-data-redis -3.1.2 +3.2.0 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 45eeb83171..baf09769b7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6693,7 +6693,7 @@ org.springframework.data spring-data-redis -3.1.2 +3.2.0 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 006334f190..4a67a88c8b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -5955,6 +5955,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 6.10.0 + + +junit +junit + + ca.uhn.hapi.fhir @@ -5979,32 +5985,32 @@ ca.uhn.hapi.fhir org.hl7.fhir.dstu2 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.dstu2016may -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.dstu3 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.r4 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.r5 -6.0.22.2 +6.1.2.2 ca.uhn.hapi.fhir org.hl7.fhir.utilities -6.0.22.2 +6.1.2.2 com.azure @@ -6293,12 +6299,12 @@ io.quarkiverse.messaginghub quarkus-pooled-jms -2.3.0 +2.2.0 io.quarkiverse.messaginghub quarkus-pooled-jms-deployment -2.3.0 +2.2.0 io.quarkiverse.minio @@ -6687,7 +6693,7 @@ org.springframework.data spring-data-redis -3.1.2 +3.2.0 org.springframework @@ -6753,12 +6759,12 @@ software.amazon.awssdk sdk-core -2.21.29 +2.21.17 software.amazon.awssdk http-auth-aws -2.21.29 +2.21.17 xalan @@ -7215,109 +7221,109 @@ 4.0.3 -software.amazon.awssdk -annotations -2.21.29 +software.amazon.awssdk +annotations +2.21.17 -software.amazon.awssdk -arns -2.21.29 +software.amazon.awssdk +arns +2.21.17 -software.amazon.awssdk -json-utils -2.21.29 +software.amazon.awssdk +json-utils +2.21.17 -software.amazon.awssdk -third-party-jackson-core -2.21.29 +software.amazon.awssdk +third-party-jackson-core +2.21.17 -software.amazon.awssdk -third-party-jackson-dataformat-cbor -2.21.29 +software.amazon.awssdk +third-party-jackson-dataformat-cbor +2.21.17 -software.amazon.awssdk -auth -2.21.29 +soft
(camel-quarkus) 09/14: Quick fix of fhir + fixed compilation + generated stuff
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit e5a67f7b4f5e3555e3fcd09cc43459e550c14dd9 Author: JiriOndrusek AuthorDate: Mon Nov 27 13:03:43 2023 +0100 Quick fix of fhir + fixed compilation + generated stuff --- .../org/apache/camel/quarkus/eip/it/EipRoutes.java | 2 +- poms/bom/pom.xml | 4 poms/bom/src/main/generated/flattened-full-pom.xml | 18 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 16 ++-- .../main/generated/flattened-reduced-verbose-pom.xml | 16 ++-- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java index 769ad27d18..f34207c615 100644 --- a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java +++ b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java @@ -124,7 +124,7 @@ public class EipRoutes extends RouteBuilder { .setBody(e -> "Hello from thread " + Thread.currentThread().getName()); from("direct:throttle") - .throttle(THROTTLE_MAXIMUM_REQUEST_COUNT).timePeriodMillis(THROTTLE_PERIOD).rejectExecution(true) + .throttle(THROTTLE_MAXIMUM_REQUEST_COUNT).rejectExecution(true).delay(THROTTLE_PERIOD) .to("mock:throttle"); from("direct:tryCatchFinally") diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 79253f0c01..f518d87347 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6036,6 +6036,10 @@ junit junit + +org.ogce +xpp3 + diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4912a8fe2f..78d9678b4f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5960,6 +5960,10 @@ junit junit + +org.ogce +xpp3 + @@ -6687,7 +6691,7 @@ org.springframework spring-aop -6.0.14 +6.1.1 org.springframework @@ -6702,7 +6706,7 @@ org.springframework spring-expression -6.0.14 +6.1.1 org.springframework @@ -6713,7 +6717,7 @@ org.springframework spring-jdbc -6.0.14 +6.1.1 org.springframework @@ -6728,7 +6732,7 @@ org.springframework spring-jms -6.0.14 +6.1.1 org.springframework @@ -6743,7 +6747,7 @@ org.springframework spring-messaging -6.0.14 +6.1.1 org.springframework @@ -6758,7 +6762,7 @@ org.springframework spring-orm -6.0.14 +6.1.1 org.springframework @@ -6773,7 +6777,7 @@ org.springframework spring-tx -6.0.14 +6.1.1 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index baf09769b7..fd0a204321 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5960,6 +5960,10 @@ junit junit + +org.ogce +xpp3 + @@ -6607,7 +6611,7 @@ org.springframework spring-aop -6.0.14 +6.1.1 org.springframework @@ -6622,7 +6626,7 @@ org.springframework spring-expression -6.0.14 +6.1.1 org.springframework @@ -6633,7 +6637,7 @@ org.springframework spring-jdbc -6.0.14 +6.1.1 org.springframework @@ -6648,7 +6652,7 @@ org.springframework spring-jms -6.0.14 +6.1.1 org.springframework @@ -6663,7 +6667,7 @@ org.springframework spring-messaging -6.0.14 +6.1.1 or
(camel-quarkus) 04/14: Different fix of http version conflict, CAMEL-20142
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 7e0bb40535e0207e79833c80ea90039e046366b1 Author: JiriOndrusek AuthorDate: Wed Nov 22 12:45:54 2023 +0100 Different fix of http version conflict, CAMEL-20142 --- poms/bom/pom.xml | 6 -- poms/bom/src/main/generated/flattened-full-pom.xml| 6 -- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 -- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 -- 4 files changed, 24 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9989550645..1a3277fb9b 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6532,12 +6532,6 @@ org.apache.httpcomponents.client5 httpclient5 ${httpclient5.version} - - -httpcore5-h2 -org.apache.httpcomponents.core5 - - org.apache.httpcomponents.core5 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e7836a6844..1f631607bd 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6455,12 +6455,6 @@ org.apache.httpcomponents.client5 httpclient5 5.2.1 - - -org.apache.httpcomponents.core5 -httpcore5-h2 - - org.apache.httpcomponents.core5 diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index b4b9a39ca1..2707e35a5f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6400,12 +6400,6 @@ org.apache.httpcomponents.client5 httpclient5 5.2.1 - - -org.apache.httpcomponents.core5 -httpcore5-h2 - - org.apache.httpcomponents.core5 diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 3df4bbbabe..dd1a985d58 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6400,12 +6400,6 @@ org.apache.httpcomponents.client5 httpclient5 5.2.1 - - -org.apache.httpcomponents.core5 -httpcore5-h2 - - org.apache.httpcomponents.core5
(camel-quarkus) branch camel-main updated (32526fecd0 -> ec9bbdb628)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 32526fecd0 Disabled JTA & SQL native because of spring update #5583 discard 39799787de Disabled spring-rabbitmq because of spring update #5583 discard 42fdd5e0bf Disabled native for tarfile test - #5538 discard 66a3fd9578 Fix of upgraded spring-version to 6.1.1 discard 46be93865c Fixed core eip tests throttling + generated files discard 1ef26f9496 Quick fix of fhir + fixed compilation + generated stuff discard cb66f17af3 Resolved conflit + generated files discard 5e191925d1 Fixed compilation issue in fhir discard 5a2069e8db Generated files discard 78ce5ac0a3 Disabled tarfile tests #5538 discard e205da2f2d Different fix of http version conflict, CAMEL-20142 discard cf2f605883 Fixed Joor because of CAMEL-20137 discard b808053904 Fixed compilation issues with fhir, http + generated stuff discard 87e7564fba Upgrade Camel to 4.3.0 add e691b5af0f Add CI workflow steps to test on JDK 21 new 92aac60f58 Upgrade Camel to 4.3.0 new 0e2935689a Fixed compilation issues with fhir, http + generated stuff new 777b5f18a1 Fixed Joor because of CAMEL-20137 new 7e0bb40535 Different fix of http version conflict, CAMEL-20142 new 63dc554832 Disabled tarfile tests #5538 new 703ba5994c Generated files new fc5bf14abd Fixed compilation issue in fhir new 143e644dc4 Resolved conflit + generated files new e5a67f7b4f Quick fix of fhir + fixed compilation + generated stuff new 329e52fb25 Fixed core eip tests throttling + generated files new cd62088ad4 Fix of upgraded spring-version to 6.1.1 new 03cad63fe3 Disabled native for tarfile test - #5538 new 6d1dba629b Disabled spring-rabbitmq because of spring update #5583 new ec9bbdb628 Disabled JTA & SQL native because of spring update #5583 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 (32526fecd0) \ N -- N -- N refs/heads/camel-main (ec9bbdb628) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/camel-master-cron.yaml | 57 +++ .github/workflows/ci-build.yaml| 62 ++ .github/workflows/quarkus-master-cron.yaml | 57 +++ 3 files changed, 152 insertions(+), 24 deletions(-)
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] closed issue #2927: [CI] - Camel Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2927 -- 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-1836989876 Build fixed with: * Camel Quarkus Commit: ec9bbdb6284cb7157b448eabdd9d8f0b66889d75 * Camel Main Commit: e691b5af0fc08cfb7bc2d53e426eb7c495b38d11 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/7066592274 -- 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.0.x updated (2a265b46d -> ff5dd6ab5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 2a265b46d chore: nightly SBOM update new d32d9882d chore: changelog automatic update new ff5dd6ab5 chore: nightly SBOM update The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
(camel-k) 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit ff5dd6ab5f509bcd5a5e68c53b3503e26536d01e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 2 01:12:18 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index b68704d77..7d8fbe651 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:5eebd54e-4694-4ef5-9807-5f09f079cd22", + "serialNumber": "urn:uuid:e78268e0-d3ce-40cd-9be7-b58f2e577504", "version": 1, "metadata": { -"timestamp": "2023-12-01T01:13:17Z", +"timestamp": "2023-12-02T01:12:18Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231130003725-6c7301188670?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231202011039-d32d9882d643?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231130003725-6c7301188670", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231130003725-6c7301188670?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231202011039-d32d9882d643", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231202011039-d32d9882d643?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k";, @@ -4021,7 +4021,7 @@ ], "dependencies": [ { - "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231130003725-6c7301188670?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231202011039-d32d9882d643?type=module", "dependsOn": [ "pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module", "pkg:golang/github.com/container-tools/spectrum@v0.6.29?type=module",
(camel-k) 01/02: 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.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d32d9882d643b2806181110be15ee2fa2ea279b8 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 2 01:10:39 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c1a5b09a..8f54b291c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - TestSecretHotReload failure [\#4902](https://github.com/apache/camel-k/issues/4902) - Native image builds failing with dependencies from private repository [\#4892](https://github.com/apache/camel-k/issues/4892) - SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" when running an integration [\#4882](https://github.com/apache/camel-k/issues/4882) +- Coverage report sends message 3 times [\#4875](https://github.com/apache/camel-k/issues/4875) - OLM upgrade test channel failing [\#4855](https://github.com/apache/camel-k/issues/4855) - Camel K 2.1 documentation still contains information on using local files for runtime resources despite it is no more supported [\#4853](https://github.com/apache/camel-k/issues/4853) - TestCamelTrait flaky test [\#4845](https://github.com/apache/camel-k/issues/4845)
(camel-k) 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 990124c0a386ca72803ebd120f15dcef7b3a5e3f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 2 00:28:09 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index 080a8c0c8..9735c6ac9 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:5e0f8b30-534f-49c1-86b3-6116848e2528", + "serialNumber": "urn:uuid:0de80896-2573-4e6b-95eb-2f8e1f3dd974", "version": 1, "metadata": { -"timestamp": "2023-12-01T00:28:17Z", +"timestamp": "2023-12-02T00:28:09Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231127171711-3bbf56640917?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231202002633-146fe181e05e?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231127171711-3bbf56640917", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231127171711-3bbf56640917?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231202002633-146fe181e05e", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231202002633-146fe181e05e?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k";, @@ -3853,7 +3853,7 @@ ], "dependencies": [ { - "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231127171711-3bbf56640917?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231202002633-146fe181e05e?type=module", "dependsOn": [ "pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module", "pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
(camel-k) 01/02: 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.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 146fe181e05efaa19d5a75b4c9bd77b9599bc399 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Dec 2 00:26:33 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c1a5b09a..8f54b291c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - TestSecretHotReload failure [\#4902](https://github.com/apache/camel-k/issues/4902) - Native image builds failing with dependencies from private repository [\#4892](https://github.com/apache/camel-k/issues/4892) - SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" when running an integration [\#4882](https://github.com/apache/camel-k/issues/4882) +- Coverage report sends message 3 times [\#4875](https://github.com/apache/camel-k/issues/4875) - OLM upgrade test channel failing [\#4855](https://github.com/apache/camel-k/issues/4855) - Camel K 2.1 documentation still contains information on using local files for runtime resources despite it is no more supported [\#4853](https://github.com/apache/camel-k/issues/4853) - TestCamelTrait flaky test [\#4845](https://github.com/apache/camel-k/issues/4845)
(camel-k) branch release-2.1.x updated (c5ab2cfe5 -> 990124c0a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from c5ab2cfe5 chore: nightly SBOM update new 146fe181e chore: changelog automatic update new 990124c0a chore: nightly SBOM update The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1031: URL: https://github.com/apache/camel-spring-boot/pull/1031 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
(camel-k) 02/02: chore: nightly SBOM update
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 commit 138647c376a77854c1cf3c70f13cf15a9bd1385e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 1 23:42:41 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index 6e71f8097..716581276 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:a1579877-43da-46c1-a20a-81ce5b9c6c65", + "serialNumber": "urn:uuid:95fd28bb-754f-4c77-8a5d-9bdfd74cd39c", "version": 1, "metadata": { -"timestamp": "2023-11-30T23:42:48Z", +"timestamp": "2023-12-01T23:42:41Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231130233954-c05f69835de2?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231201233950-eee09b8b9016?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231130233954-c05f69835de2", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231130233954-c05f69835de2?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231201233950-eee09b8b9016", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231201233950-eee09b8b9016?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k";, @@ -3853,7 +3853,7 @@ ], "dependencies": [ { - "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231130233954-c05f69835de2?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231201233950-eee09b8b9016?type=module", "dependsOn": [ "pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module", "pkg:golang/github.com/container-tools/spectrum@v0.6.42?type=module",
(camel-k) branch main updated (568b0962c -> 138647c37)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 568b0962c chore(ci): Upgrade kindest image to kubernetes 1.27 new eee09b8b9 chore: changelog automatic update new 138647c37 chore: nightly SBOM update The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 4 camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 10 insertions(+), 6 deletions(-)
(camel-k) 01/02: chore: changelog automatic update
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 commit eee09b8b901656913fe9cca02413af685ad72305 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 1 23:39:50 2023 + chore: changelog automatic update --- CHANGELOG.md | 4 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e145a88..b0b2c931e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - TestSecretHotReload failure [\#4902](https://github.com/apache/camel-k/issues/4902) - Native image builds failing with dependencies from private repository [\#4892](https://github.com/apache/camel-k/issues/4892) - SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" when running an integration [\#4882](https://github.com/apache/camel-k/issues/4882) +- Coverage report sends message 3 times [\#4875](https://github.com/apache/camel-k/issues/4875) - OLM upgrade test channel failing [\#4855](https://github.com/apache/camel-k/issues/4855) - Camel K 2.1 documentation still contains information on using local files for runtime resources despite it is no more supported [\#4853](https://github.com/apache/camel-k/issues/4853) - TestCamelTrait flaky test [\#4845](https://github.com/apache/camel-k/issues/4845) @@ -27,6 +28,9 @@ **Merged pull requests:** +- fix\(e2e\): Set default configuration knative http yaks test [\#4952](https://github.com/apache/camel-k/pull/4952) ([gansheer](https://github.com/gansheer)) +- chore\(ci\): Upgrade kind action and image to kubernetes 1.27 [\#4946](https://github.com/apache/camel-k/pull/4946) ([gansheer](https://github.com/gansheer)) +- chore\(test\): Health kamelet test cleanup [\#4945](https://github.com/apache/camel-k/pull/4945) ([gansheer](https://github.com/gansheer)) - chore\(deps\): bump ch.qos.logback:logback-classic from 1.3.7 to 1.3.12 in /java/maven-logging [\#4944](https://github.com/apache/camel-k/pull/4944) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump ch.qos.logback:logback-core from 1.3.7 to 1.3.12 in /java/maven-logging [\#4943](https://github.com/apache/camel-k/pull/4943) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump golang.org/x/time from 0.4.0 to 0.5.0 [\#4935](https://github.com/apache/camel-k/pull/4935) ([dependabot[bot]](https://github.com/apps/dependabot))
Re: [PR] CAMEL-20174: camel-ssh: Provide support to configure algorithms [camel]
davsclaus commented on code in PR #12294: URL: https://github.com/apache/camel/pull/12294#discussion_r1412538994 ## components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java: ## @@ -62,6 +64,18 @@ public class SshConfiguration implements Cloneable { private String shellPrompt; @UriParam(label = "advanced", defaultValue = "100") private long sleepForShellPrompt; +@UriParam(label = "security") +private String kex; +@UriParam(label = "security") +private String ciphers; +@UriParam(label = "security") +private String macs; +@UriParam(label = "security") +private String signatures; +@UriParam(label = "advanced") +private String compressions; +@UriParam(label = "advanced,producer,consumer") Review Comment: producer and consumer is default, (ie. common), so this can just be "advanced" -- 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-20174: camel-ssh: Provide support to configure algorithms [camel]
github-actions[bot] commented on PR #12294: URL: https://github.com/apache/camel/pull/12294#issuecomment-1836643610 :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-20174: camel-ssh: Provide support to configure algorithms [camel]
luigidemasi opened a new pull request, #12294: URL: https://github.com/apache/camel/pull/12294 (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] java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [camel-k]
lsergio commented on issue #4955: URL: https://github.com/apache/camel-k/issues/4955#issuecomment-1836607564 @squakez I checked the container and the artifacts are there. However, to be able to be see them, I had to edit the generated deployment and change the securityContext from: `securityContext: {}` to ``` securityContext: runAsUser: 0 ``` And the list of files shows me: ``` ./dependencies/app: total 4 -rw-r--r-- 1 root root 2658 Dec 1 16:48 camel-k-integration-2.1.0.jar ./dependencies/lib: total 24 drwxr-sr-x 2 root root 4096 Dec 1 16:48 boot drwxr-sr-x 2 root root 16384 Dec 1 16:48 main ./dependencies/lib/boot: total 1708 -rw-r--r-- 1 root root 9341 Dec 1 16:48 io.github.crac.org-crac-0.1.3.jar -rw-r--r-- 1 root root 43387 Dec 1 16:48 io.quarkus.quarkus-bootstrap-runner-3.2.6.Final.jar -rw-r--r-- 1 root root 45294 Dec 1 16:48 io.quarkus.quarkus-development-mode-spi-3.2.6.Final.jar ``` (the list was truncated, as it was too long) And after this change the integration also starts successfully. -- 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 (9014f4436d2 -> 0fa1294b2e5)
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 9014f4436d2 CAMEL-20158 await executor termination after shutdown (#12291) add 0fa1294b2e5 CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. (#12293) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/main/KameletMain.java| 172 ++--- .../main/console/DependencyDownloaderConsole.java | 27 +++- .../camel/main/download/DependencyDownloader.java | 10 ++ .../main/download/MavenDependencyDownloader.java | 10 ++ .../camel/tooling/maven/MavenDownloader.java | 30 .../camel/tooling/maven/MavenDownloaderImpl.java | 81 +++--- .../camel/tooling/maven/MavenResolverTest.java | 2 +- 7 files changed, 171 insertions(+), 161 deletions(-)
(camel) branch offline deleted (was d9a98cacf6b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch offline in repository https://gitbox.apache.org/repos/asf/camel.git was d9a98cacf6b CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. (#12293)
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 0fa1294b2e5 CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. (#12293) 0fa1294b2e5 is described below commit 0fa1294b2e5919e36577366d68032aba723122c9 Author: Claus Ibsen AuthorDate: Fri Dec 1 19:07:37 2023 +0100 CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. (#12293) --- .../java/org/apache/camel/main/KameletMain.java| 172 ++--- .../main/console/DependencyDownloaderConsole.java | 27 +++- .../camel/main/download/DependencyDownloader.java | 10 ++ .../main/download/MavenDependencyDownloader.java | 10 ++ .../camel/tooling/maven/MavenDownloader.java | 30 .../camel/tooling/maven/MavenDownloaderImpl.java | 81 +++--- .../camel/tooling/maven/MavenResolverTest.java | 2 +- 7 files changed, 171 insertions(+), 161 deletions(-) diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java index b893cdd603d..7effdfae500 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java @@ -355,40 +355,41 @@ public class KameletMain extends MainCommandLineSupport { DefaultCamelContext answer = new DefaultCamelContext(false); // setup backlog recorder from very start answer.getCamelContextExtension().setStartupStepRecorder(new BacklogStartupStepRecorder()); -if (download) { -ClassLoader dynamicCL = createApplicationContextClassLoader(answer); -answer.setApplicationContextClassLoader(dynamicCL); - PluginHelper.getPackageScanClassResolver(answer).addClassLoader(dynamicCL); - PluginHelper.getPackageScanResourceResolver(answer).addClassLoader(dynamicCL); - -KnownReposResolver known = new KnownReposResolver(); -known.loadKnownDependencies(); -MavenDependencyDownloader downloader = new MavenDependencyDownloader(); -downloader.setKnownReposResolver(known); -downloader.setClassLoader(dynamicCL); -downloader.setCamelContext(answer); -downloader.setVerbose(verbose); -downloader.setRepos(repos); -downloader.setFresh(fresh); -downloader.setMavenSettings(mavenSettings); -downloader.setMavenSettingsSecurity(mavenSettingsSecurity); -if (downloadListener != null) { -downloader.addDownloadListener(downloadListener); -} -downloader.addDownloadListener(new AutoConfigureDownloadListener()); -downloader.addArtifactDownloadListener(new TypeConverterLoaderDownloadListener()); -downloader.addArtifactDownloadListener(new BasePackageScanDownloadListener()); -// register as extension -try { -answer.addService(downloader); -} catch (Exception e) { -throw RuntimeCamelException.wrapRuntimeException(e); -} +ClassLoader dynamicCL = createApplicationContextClassLoader(answer); +answer.setApplicationContextClassLoader(dynamicCL); + PluginHelper.getPackageScanClassResolver(answer).addClassLoader(dynamicCL); + PluginHelper.getPackageScanResourceResolver(answer).addClassLoader(dynamicCL); + +KnownReposResolver knownRepos = new KnownReposResolver(); +knownRepos.loadKnownDependencies(); +MavenDependencyDownloader downloader = new MavenDependencyDownloader(); +downloader.setDownload(download); +downloader.setKnownReposResolver(knownRepos); +downloader.setClassLoader(dynamicCL); +downloader.setCamelContext(answer); +downloader.setVerbose(verbose); +downloader.setRepos(repos); +downloader.setFresh(fresh); +downloader.setMavenSettings(mavenSettings); +downloader.setMavenSettingsSecurity(mavenSettingsSecurity); +if (downloadListener != null) { +downloader.addDownloadListener(downloadListener); +} +downloader.addDownloadListener(new AutoConfigureDownloadListener()); +downloader.addArtifactDownloadListener(new TypeConverterLoaderDownloadListener()); +downloader.addArtifactDownloadListener(new BasePackageScanDownloadListener()); -// in case we use circuit breakers -CircuitBreakerDownloader.registerDownloadReifiers(); +// register as extension +try { +answer.addService(downloader); +} catch (Exception e) { +throw RuntimeCamelException.wrapRuntimeExceptio
Re: [PR] CAMEL-20173: camel-jbang - Run with download=false should set maven i… [camel]
davsclaus merged PR #12293: URL: https://github.com/apache/camel/pull/12293 -- 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-20173: camel-jbang - Run with download=false should set maven i… [camel]
davsclaus opened a new pull request, #12293: URL: https://github.com/apache/camel/pull/12293 …n offline mode. # 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 offline created (now d9a98cacf6b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch offline in repository https://gitbox.apache.org/repos/asf/camel.git at d9a98cacf6b CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. This branch includes the following new commits: new d9a98cacf6b CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. 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-20173: camel-jbang - Run with download=false should set maven in offline mode.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch offline in repository https://gitbox.apache.org/repos/asf/camel.git commit d9a98cacf6b1d0ef9c97021c53d1686ff0163a0f Author: Claus Ibsen AuthorDate: Fri Dec 1 18:43:08 2023 +0100 CAMEL-20173: camel-jbang - Run with download=false should set maven in offline mode. --- .../java/org/apache/camel/main/KameletMain.java| 172 ++--- .../main/console/DependencyDownloaderConsole.java | 27 +++- .../camel/main/download/DependencyDownloader.java | 10 ++ .../main/download/MavenDependencyDownloader.java | 10 ++ .../camel/tooling/maven/MavenDownloader.java | 30 .../camel/tooling/maven/MavenDownloaderImpl.java | 81 +++--- .../camel/tooling/maven/MavenResolverTest.java | 2 +- 7 files changed, 171 insertions(+), 161 deletions(-) diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java index b893cdd603d..7effdfae500 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java @@ -355,40 +355,41 @@ public class KameletMain extends MainCommandLineSupport { DefaultCamelContext answer = new DefaultCamelContext(false); // setup backlog recorder from very start answer.getCamelContextExtension().setStartupStepRecorder(new BacklogStartupStepRecorder()); -if (download) { -ClassLoader dynamicCL = createApplicationContextClassLoader(answer); -answer.setApplicationContextClassLoader(dynamicCL); - PluginHelper.getPackageScanClassResolver(answer).addClassLoader(dynamicCL); - PluginHelper.getPackageScanResourceResolver(answer).addClassLoader(dynamicCL); - -KnownReposResolver known = new KnownReposResolver(); -known.loadKnownDependencies(); -MavenDependencyDownloader downloader = new MavenDependencyDownloader(); -downloader.setKnownReposResolver(known); -downloader.setClassLoader(dynamicCL); -downloader.setCamelContext(answer); -downloader.setVerbose(verbose); -downloader.setRepos(repos); -downloader.setFresh(fresh); -downloader.setMavenSettings(mavenSettings); -downloader.setMavenSettingsSecurity(mavenSettingsSecurity); -if (downloadListener != null) { -downloader.addDownloadListener(downloadListener); -} -downloader.addDownloadListener(new AutoConfigureDownloadListener()); -downloader.addArtifactDownloadListener(new TypeConverterLoaderDownloadListener()); -downloader.addArtifactDownloadListener(new BasePackageScanDownloadListener()); -// register as extension -try { -answer.addService(downloader); -} catch (Exception e) { -throw RuntimeCamelException.wrapRuntimeException(e); -} +ClassLoader dynamicCL = createApplicationContextClassLoader(answer); +answer.setApplicationContextClassLoader(dynamicCL); + PluginHelper.getPackageScanClassResolver(answer).addClassLoader(dynamicCL); + PluginHelper.getPackageScanResourceResolver(answer).addClassLoader(dynamicCL); + +KnownReposResolver knownRepos = new KnownReposResolver(); +knownRepos.loadKnownDependencies(); +MavenDependencyDownloader downloader = new MavenDependencyDownloader(); +downloader.setDownload(download); +downloader.setKnownReposResolver(knownRepos); +downloader.setClassLoader(dynamicCL); +downloader.setCamelContext(answer); +downloader.setVerbose(verbose); +downloader.setRepos(repos); +downloader.setFresh(fresh); +downloader.setMavenSettings(mavenSettings); +downloader.setMavenSettingsSecurity(mavenSettingsSecurity); +if (downloadListener != null) { +downloader.addDownloadListener(downloadListener); +} +downloader.addDownloadListener(new AutoConfigureDownloadListener()); +downloader.addArtifactDownloadListener(new TypeConverterLoaderDownloadListener()); +downloader.addArtifactDownloadListener(new BasePackageScanDownloadListener()); -// in case we use circuit breakers -CircuitBreakerDownloader.registerDownloadReifiers(); +// register as extension +try { +answer.addService(downloader); +} catch (Exception e) { +throw RuntimeCamelException.wrapRuntimeException(e); } + +// in case we use circuit breakers +CircuitBreakerDownloader.registerDownloadReifiers(); + if (silent || "*".equals(stubPattern)) { // turn off auto-wiring when runn
Re: [PR] Add basic support of virtual threads [camel]
github-actions[bot] commented on PR #12292: URL: https://github.com/apache/camel/pull/12292#issuecomment-1836484761 :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] Add basic support of virtual threads [camel]
essobedo opened a new pull request, #12292: URL: https://github.com/apache/camel/pull/12292 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 01/01: Add basic support of virtual threads
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch virtual-threads-basic-support in repository https://gitbox.apache.org/repos/asf/camel.git commit 3c70161eb902b1238c728601783a62b41f564bf5 Author: Nicolas Filotto AuthorDate: Fri Dec 1 18:13:12 2023 +0100 Add basic support of virtual threads --- core/camel-support/pom.xml | 49 + .../camel/support/DefaultThreadPoolFactory.java| 213 + core/camel-util/pom.xml| 47 + .../apache/camel/util/concurrent/ThreadType.java | 30 +++ .../camel/util/concurrent/ThreadTypeAware.java | 23 +++ .../camel/util/concurrent/CamelThreadFactory.java | 86 + .../apache/camel/util/concurrent/ThreadType.java | 38 7 files changed, 486 insertions(+) diff --git a/core/camel-support/pom.xml b/core/camel-support/pom.xml index 32c6688c907..2ede683e498 100644 --- a/core/camel-support/pom.xml +++ b/core/camel-support/pom.xml @@ -85,4 +85,53 @@ + + +java-21-sources + +[21,) + + + + +org.apache.maven.plugins +maven-compiler-plugin +${maven-compiler-plugin-version} + + +default-compile +compile + +compile + + + +compile-java-21 +compile + +compile + + +21 + ${project.basedir}/src/main/java21 + true + + + + + +org.apache.maven.plugins +maven-jar-plugin + + + +true + + + + + + + + diff --git a/core/camel-support/src/main/java21/org/apache/camel/support/DefaultThreadPoolFactory.java b/core/camel-support/src/main/java21/org/apache/camel/support/DefaultThreadPoolFactory.java new file mode 100644 index 000..323216f2f9d --- /dev/null +++ b/core/camel-support/src/main/java21/org/apache/camel/support/DefaultThreadPoolFactory.java @@ -0,0 +1,213 @@ +/* + * 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.support; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +import org.apache.camel.CamelContext; +import org.apache.camel.CamelContextAware; +import org.apache.camel.StaticService; +import org.apache.camel.spi.ThreadPoolFactory; +import org.apache.camel.spi.ThreadPoolProfile; +import org.apache.camel.support.service.ServiceSupport; +import org.apache.camel.util.concurrent.RejectableScheduledThreadPoolExecutor; +import org.apache.camel.util.concurrent.RejectableThreadPoolExecutor; +import org.apache.camel.util.concurrent.SizedScheduledExecutorService; +import org.apache.camel.util.concurrent.ThreadType; +import org.apache.camel.util.concurrent.ThreadTypeAware; + +/** + * Factory for
(camel) branch virtual-threads-basic-support created (now 3c70161eb90)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch virtual-threads-basic-support in repository https://gitbox.apache.org/repos/asf/camel.git at 3c70161eb90 Add basic support of virtual threads This branch includes the following new commits: new 3c70161eb90 Add basic support of virtual threads The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Re: [PR] Add CI workflow steps to test on JDK 21 [camel-quarkus]
jamesnetherton merged PR #5581: URL: https://github.com/apache/camel-quarkus/pull/5581 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Add CI workflow steps to test on JDK 21
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e691b5af0f Add CI workflow steps to test on JDK 21 e691b5af0f is described below commit e691b5af0fc08cfb7bc2d53e426eb7c495b38d11 Author: James Netherton AuthorDate: Fri Dec 1 08:22:28 2023 + Add CI workflow steps to test on JDK 21 Fixes #5332 --- .github/workflows/camel-master-cron.yaml | 57 +++ .github/workflows/ci-build.yaml| 62 ++ .github/workflows/quarkus-master-cron.yaml | 57 +++ 3 files changed, 152 insertions(+), 24 deletions(-) diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml index 58241eba18..9985ccc8c4 100644 --- a/.github/workflows/camel-master-cron.yaml +++ b/.github/workflows/camel-master-cron.yaml @@ -292,7 +292,7 @@ jobs: strategy: fail-fast: false matrix: -java: [ '17' ] +java: [ '17', '21' ] env: MAVEN_OPTS: -Xmx3000m steps: @@ -307,13 +307,6 @@ jobs: df -h / tar -xzf ../maven-repo.tgz -C ~ df -h / - hostname - hostname -f - hostname -A - HOSTS_LINE="127.0.0.1 $(hostname -f) $(hostname -A)" - echo "HOSTS_LINE=$HOSTS_LINE" - echo "${HOSTS_LINE}" | sudo tee -a /etc/hosts - cat /etc/hosts - name: Checkout uses: actions/checkout@v4 with: @@ -342,6 +335,54 @@ jobs: run: | ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt) + integration-tests-alternative-jdk: +runs-on: ubuntu-latest +needs: initial-mvn-install +env: + MAVEN_OPTS: -Xmx3000m +steps: + - name: Checkout +uses: actions/checkout@v4 +with: + ref: camel-main + fetch-depth: 0 + - name: Reclaim Disk Space +run: | + df -h / + echo "Reclaiming disk space..." + sudo rm -rf /opt/ghc \ + rm -rf /opt/pipx \ + rm -rf /usr/local/go \ + rm -rf /usr/local/lib/android \ + rm -rf /usr/local/share/boost \ + rm -rf /usr/share/dotnet \ + rm -rf /usr/share/rust \ + rm -rf /usr/share/swift + df -h / + - name: Set up JDK 21 +uses: actions/setup-java@v4 +with: + distribution: 'temurin' + java-version: '21' + - name: Download Maven Repo +uses: actions/download-artifact@v3 +with: + name: maven-repo + path: .. + - name: Extract Maven Repo +shell: bash +run: | + df -h / + tar -xzf ../maven-repo.tgz -C ~ + df -h / + - name: cd integration-tests && mvn clean verify +run: | + cd integration-tests + ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ +-Dformatter.skip -Dimpsort.skip -Denforcer.skip \ +--fail-at-end \ +clean verify + integration-tests-alternative-platform: runs-on: ${{ matrix.os }} needs: initial-mvn-install diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index e8b17d9fd8..aeb0e75a46 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -363,7 +363,7 @@ jobs: strategy: fail-fast: false matrix: -java: [ '17' ] +java: [ '17', '21' ] env: MAVEN_OPTS: -Xmx3000m steps: @@ -392,13 +392,6 @@ jobs: df -h / tar -xzf ../maven-repo.tgz -C ~ df -h / - hostname - hostname -f - hostname -A - HOSTS_LINE="127.0.0.1 $(hostname -f) $(hostname -A)" - echo "HOSTS_LINE=$HOSTS_LINE" - echo "${HOSTS_LINE}" | sudo tee -a /etc/hosts - cat /etc/hosts - name: cd integration-tests-jvm && mvn clean test run: | cd integration-tests-jvm @@ -407,6 +400,59 @@ jobs: --fail-at-end \ clean test + integration-tests-alternative-jdk: +runs-on: ubuntu-latest +needs: initial-mvn-install +if: github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'JVM') +env: + MAVEN_OPTS: -Xmx3000m +steps: + - name: Setup oss-snapshots profile +if: github.ref == 'refs/heads/quarkus-main' || github.base_ref == 'quarkus-main' +run: | + echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT" >> $GITH
Re: [I] Reinstate CI workflow job `integration-tests-alternative-jdk` for JDK 21 [camel-quarkus]
jamesnetherton closed issue #5332: Reinstate CI workflow job `integration-tests-alternative-jdk` for JDK 21 URL: https://github.com/apache/camel-quarkus/issues/5332 -- 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] Coverage report sends message 3 times [camel-k]
squakez closed issue #4875: Coverage report sends message 3 times URL: https://github.com/apache/camel-k/issues/4875 -- 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] Coverage report sends message 3 times [camel-k]
squakez commented on issue #4875: URL: https://github.com/apache/camel-k/issues/4875#issuecomment-1836299887 It seems this is no longer happening. Closing. -- 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 (7e0dedbec2e -> 9014f4436d2)
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 7e0dedbec2e CAMEL-20163: cleanup parsing HTTP status range (camel-vertx-http) add 9014f4436d2 CAMEL-20158 await executor termination after shutdown (#12291) No new revisions were added by this update. Summary of changes: .../org/apache/camel/processor/ThrottlerTest.java | 23 ++ .../camel/processor/ThrottlingGroupingTest.java| 17 2 files changed, 28 insertions(+), 12 deletions(-)
Re: [I] Ability to override resources for the quarkus-native task [camel-k]
squakez commented on issue #4956: URL: https://github.com/apache/camel-k/issues/4956#issuecomment-1836293900 Yes. This seems to be a bug. We swallow any configuration provided by the user. -- 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] java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [camel-k]
squakez commented on issue #4955: URL: https://github.com/apache/camel-k/issues/4955#issuecomment-1836286658 It seems to be a problem with the container, like the application was not really pushed. Can you verify if the generated container has the required artifacts? Please check the image which is running the Pod. Also, consider we've deprecated Kaniko [1], so, if there is some problem there we won't be able to fix. Try to use default Spectrum or Jib strategy [2]. [1] https://camel.apache.org/blog/2023/10/camel-k-2-1/ [2] https://camel.apache.org/camel-k/next/installation/advanced/build-config.html#publish-strategy -- 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] Ability to apply node selectors/affinity configuration [camel-k]
squakez commented on issue #4958: URL: https://github.com/apache/camel-k/issues/4958#issuecomment-1836288307 Makes sense. Feel free to contribute to the feature if you can. -- 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-20158: await executor termination after shutdown [camel]
davsclaus merged PR #12291: URL: https://github.com/apache/camel/pull/12291 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20158 await executor termination after shutdown (#12291)
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 9014f4436d2 CAMEL-20158 await executor termination after shutdown (#12291) 9014f4436d2 is described below commit 9014f4436d2d1c8ae5ab0fca942f447a32f7eb68 Author: Jono Morris AuthorDate: Sat Dec 2 04:14:02 2023 +1300 CAMEL-20158 await executor termination after shutdown (#12291) --- .../org/apache/camel/processor/ThrottlerTest.java | 23 ++ .../camel/processor/ThrottlingGroupingTest.java| 17 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java index 7072bb1d110..b49770d1f13 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; // time-bound that does not run well in shared environments @DisabledOnOs(OS.WINDOWS) @@ -56,8 +57,7 @@ public class ThrottlerTest extends ContextTestSupport { } assertMockEndpointsSatisfied(); } finally { -executor.awaitTermination(1000, TimeUnit.MILLISECONDS); -executor.shutdownNow(); +shutdownAndAwait(executor); } } @@ -84,8 +84,7 @@ public class ThrottlerTest extends ContextTestSupport { try { sendMessagesWithHeaderExpression(executor, resultEndpoint, CONCURRENT_REQUESTS, MESSAGE_COUNT); } finally { -executor.awaitTermination(1000, TimeUnit.MILLISECONDS); -executor.shutdownNow(); +shutdownAndAwait(executor); } } @@ -114,8 +113,7 @@ public class ThrottlerTest extends ContextTestSupport { resultEndpoint.reset(); sendMessagesWithHeaderExpression(executor, resultEndpoint, 4, MESSAGE_COUNT); } finally { -executor.awaitTermination(1000, TimeUnit.MILLISECONDS); -executor.shutdownNow(); +shutdownAndAwait(executor); } } @@ -156,8 +154,7 @@ public class ThrottlerTest extends ContextTestSupport { receivingEndpoint.assertIsSatisfied(); } } finally { -executor.awaitTermination(1000, TimeUnit.MILLISECONDS); -executor.shutdownNow(); +shutdownAndAwait(executor); } } @@ -185,6 +182,16 @@ public class ThrottlerTest extends ContextTestSupport { .forEach(b -> template.sendBody(endpoint, b)); } +private void shutdownAndAwait(final ExecutorService executorService) { +executorService.shutdown(); +try { +assertTrue(executorService.awaitTermination(10, TimeUnit.SECONDS), +"Test ExecutorService shutdown is not expected to take longer than 10 seconds."); +} catch (InterruptedException e) { +fail("Test ExecutorService shutdown is not expected to be interrupted."); +} +} + @Override protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java index 2c11829333c..8639310ecdf 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; @Isolated public class ThrottlingGroupingTest extends ContextTestSupport { @@ -109,8 +110,7 @@ public class ThrottlingGroupingTest extends ContextTestSupport { receivingEndpoint.assertIsSatisfied(); } } finally { -executor.awaitTermination(1000, TimeUnit.MILLISECONDS); -executor.shutdownNow(); +shutdownAndAwait(executor); } } @@ -123,8 +123,7 @@ public class ThrottlingGroupingTest extends ContextTestSupport { try { sendMessagesWithHeaderExpression(executor, resultEndpoint, CONCURRENT_REQUESTS, MESSAGE_COUNT); } finally { -executor.awaitTermination(1000, TimeUnit.MILLISECONDS); -executor.shutdownNow(); +s
Re: [PR] feat: import external Camel applications [camel-k]
github-actions[bot] commented on PR #4942: URL: https://github.com/apache/camel-k/pull/4942#issuecomment-1836280874 :camel: **Thank you for contributing!** Code Coverage Report :warning: - Coverage changed: 33.6% --> 33.5% (Coverage difference: **-.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-k) branch main updated (fffd6c749 -> 568b0962c)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from fffd6c749 chore(test): Health kamelet test cleanup new 2c1b31379 chore(ci): Upgrade node-action version new 568b0962c chore(ci): Upgrade kindest image to kubernetes 1.27 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/actions/kamel-config-cluster-kind/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[PR] fix(e2e): Execute helm upgrade test only on main branch [camel-k]
gansheer opened a new pull request, #4959: URL: https://github.com/apache/camel-k/pull/4959 Ref #4923 Restricting helm upgrade test to main branch as it requires the last release chart. **Release Note** ```release-note fix(e2e): Execute helm upgrade test only on main branch ``` -- 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) 02/02: chore(ci): Upgrade kindest image to kubernetes 1.27
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 568b0962c23b323a4a712089d3483aa0f69ec7c9 Author: Gaelle Fournier AuthorDate: Thu Nov 30 15:18:49 2023 +0100 chore(ci): Upgrade kindest image to kubernetes 1.27 --- .github/actions/kamel-config-cluster-kind/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/kamel-config-cluster-kind/action.yml b/.github/actions/kamel-config-cluster-kind/action.yml index 8232f757b..c6c52bcd3 100644 --- a/.github/actions/kamel-config-cluster-kind/action.yml +++ b/.github/actions/kamel-config-cluster-kind/action.yml @@ -27,7 +27,7 @@ runs: if: ${{ env.CLUSTER_KIND_CONFIGURED != 'true' }} with: version: v0.19.0 -node_image: kindest/node:v1.26.4@sha256:f4c0d87be03d6bea69f5e5dc0adb678bb498a190ee5c38422bf751541cebe92e +node_image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b cpu: 3 - id: info
Re: [PR] chore(ci): Upgrade kind action and image to kubernetes 1.27 [camel-k]
squakez merged PR #4946: URL: https://github.com/apache/camel-k/pull/4946 -- 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(test): Health kamelet test cleanup
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new fffd6c749 chore(test): Health kamelet test cleanup fffd6c749 is described below commit fffd6c749a1b55ca4c6f299fdfb9e175fb55af8e Author: Gaelle Fournier AuthorDate: Wed Nov 29 18:07:31 2023 +0100 chore(test): Health kamelet test cleanup Ref #4922 --- e2e/common/traits/health_test.go | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go index 40575b5c8..0d4656b4d 100644 --- a/e2e/common/traits/health_test.go +++ b/e2e/common/traits/health_test.go @@ -25,11 +25,12 @@ package traits import ( "encoding/json" "fmt" - "github.com/onsi/gomega/gstruct" "strings" "testing" "time" + "github.com/onsi/gomega/gstruct" + camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" . "github.com/onsi/gomega" @@ -237,13 +238,15 @@ func TestHealthTrait(t *testing.T) { t.Run("Readiness condition with stopped binding", func(t *testing.T) { name := RandomizedSuffixName("stopped-binding") + source := RandomizedSuffixName("my-health-timer-source") + sink := RandomizedSuffixName("my-health-log-sink") - Expect(CreateTimerKamelet(ns, "my-health-timer-source")()).To(Succeed()) - Expect(CreateLogKamelet(ns, "my-health-log-sink")()).To(Succeed()) + Expect(CreateTimerKamelet(ns, source)()).To(Succeed()) + Expect(CreateLogKamelet(ns, sink)()).To(Succeed()) Expect(KamelBindWithID(operatorID, ns, - "my-health-timer-source", - "my-health-log-sink", + source, + sink, "-p", "source.message=Magicstring!", "-p", "sink.loggerName=binding", "--annotation", "trait.camel.apache.org/health.enabled=true", @@ -354,6 +357,8 @@ func TestHealthTrait(t *testing.T) { // Clean-up Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) + Expect(DeleteKamelet(ns, source)).To(Succeed()) + Expect(DeleteKamelet(ns, sink)).To(Succeed()) }) t.Run("Readiness condition with never ready route", func(t *testing.T) {
(camel-k) branch main updated: fix(e2e): Set default configuration knative http yaks test
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 0b9f2476c fix(e2e): Set default configuration knative http yaks test 0b9f2476c is described below commit 0b9f2476c621c2ff50e002b8e62619b082a1c2fa Author: Gaelle Fournier AuthorDate: Thu Nov 30 17:05:34 2023 +0100 fix(e2e): Set default configuration knative http yaks test --- e2e/yaks/common/knative-sinkbinding-http/sinkbinding.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/yaks/common/knative-sinkbinding-http/sinkbinding.feature b/e2e/yaks/common/knative-sinkbinding-http/sinkbinding.feature index e5503b57b..73e58336d 100644 --- a/e2e/yaks/common/knative-sinkbinding-http/sinkbinding.feature +++ b/e2e/yaks/common/knative-sinkbinding-http/sinkbinding.feature @@ -2,8 +2,8 @@ Feature: Camel K can run source HTTP endpoint in sinkbinding mode Background: Given Kubernetes resource polling configuration - | maxAttempts | 1 | - | delayBetweenAttempts | 500 | + | maxAttempts | 40 | + | delayBetweenAttempts | 3000 | Scenario: Integration knative-service starts with no errors Given wait for condition=Ready on Kubernetes custom resource integration/rest2channel in integration.camel.apache.org/v1
Re: [PR] chore(test): Health kamelet test cleanup [camel-k]
squakez merged PR #4945: URL: https://github.com/apache/camel-k/pull/4945 -- 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) 01/02: chore(ci): Upgrade node-action version
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 2c1b31379ca09bd5774f85172de4217d460fd3ae Author: Gaelle Fournier AuthorDate: Thu Nov 30 15:13:31 2023 +0100 chore(ci): Upgrade node-action version --- .github/actions/kamel-config-cluster-kind/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/kamel-config-cluster-kind/action.yml b/.github/actions/kamel-config-cluster-kind/action.yml index aa4729c20..8232f757b 100644 --- a/.github/actions/kamel-config-cluster-kind/action.yml +++ b/.github/actions/kamel-config-cluster-kind/action.yml @@ -23,7 +23,7 @@ runs: steps: - id: install-cluster name: Install Cluster - uses: container-tools/kind-action@7075d1458484493c6a92d4604cb27b87de0f8107 + uses: container-tools/kind-action@v2.0.1 if: ${{ env.CLUSTER_KIND_CONFIGURED != 'true' }} with: version: v0.19.0
Re: [PR] fix(e2e): Set default configuration knative http yaks test [camel-k]
squakez merged PR #4952: URL: https://github.com/apache/camel-k/pull/4952 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] feat: import external Camel applications [camel-k]
github-actions[bot] commented on PR #4942: URL: https://github.com/apache/camel-k/pull/4942#issuecomment-1836270692 :camel: **Thank you for contributing!** Code Coverage Report :warning: - Coverage changed: 33.6% --> 33.5% (Coverage difference: **-.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] feat: import external Camel applications [camel-k]
github-actions[bot] commented on PR #4942: URL: https://github.com/apache/camel-k/pull/4942#issuecomment-1836254910 :camel: **Thank you for contributing!** Code Coverage Report :warning: - Coverage changed: 33.6% --> 33.5% (Coverage difference: **-.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] feat: import external Camel applications [camel-k]
squakez commented on code in PR #4942: URL: https://github.com/apache/camel-k/pull/4942#discussion_r1412209801 ## pkg/controller/integration/integration_controller_import.go: ## @@ -0,0 +1,249 @@ +/* +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 integration + +import ( + "context" + + v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" + "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait" + "github.com/apache/camel-k/v2/pkg/client" + "github.com/apache/camel-k/v2/pkg/util/log" + "github.com/apache/camel-k/v2/pkg/util/patch" + appsv1 "k8s.io/api/apps/v1" + batchv1 "k8s.io/api/batch/v1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + servingv1 "knative.dev/serving/pkg/apis/serving/v1" + ctrl "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" +) + +// nonManagedCamelAppEnqueueRequestsFromMapFunc represent the function to discover the Integration which has to be woke up: it creates a synthetic +// Integration if the Integration does not exist. This is used to import external Camel applications. +func nonManagedCamelAppEnqueueRequestsFromMapFunc(ctx context.Context, c client.Client, adp NonManagedCamelApplicationAdapter) []reconcile.Request { + if adp.GetIntegrationName() == "" { + return []reconcile.Request{} + } + it := v1.NewIntegration(adp.GetIntegrationNameSpace(), adp.GetIntegrationName()) + err := c.Get(ctx, ctrl.ObjectKeyFromObject(&it), &it) + if err != nil { + if k8serrors.IsNotFound(err) { + // We must perform this check to make sure the resource is not being deleted. + // In such case it makes no sense to create an Integration after it. + err := c.Get(ctx, ctrl.ObjectKeyFromObject(adp.GetAppObj()), adp.GetAppObj()) + if err != nil { + if k8serrors.IsNotFound(err) { + return []reconcile.Request{} + } + log.Errorf(err, "Some error happened while trying to get %s %s resource", adp.GetName(), adp.GetKind()) + } + createSyntheticIntegration(&it, adp) Review Comment: Done. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus-examples) branch main updated: Use Strimzi as the Kafka devservices image as it works on Power architecture
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/main by this push: new 12aabb1 Use Strimzi as the Kafka devservices image as it works on Power architecture 12aabb1 is described below commit 12aabb14b214834f744a5c1edaadcca334a1330b Author: James Netherton AuthorDate: Fri Dec 1 14:12:03 2023 + Use Strimzi as the Kafka devservices image as it works on Power architecture --- kafka/README.adoc | 2 +- kafka/src/main/resources/application.properties | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kafka/README.adoc b/kafka/README.adoc index 2071133..51821ff 100644 --- a/kafka/README.adoc +++ b/kafka/README.adoc @@ -14,7 +14,7 @@ The example application requires a Kafka instance. You do not need to provide the Kafka instance yourself as long as you play with the example code in dev mode (a.k.a. `mvn quarkus:dev` - read more https://quarkus.io/guides/getting-started#development-mode[here] or as long as you only run the supplied tests (`mvn test`). -In those situations, Quarkus tooling starts a Redpanda image for you via https://quarkus.io/guides/kafka-dev-services[Quarkus Dev Services] +In those situations, Quarkus tooling starts a Strimzi image for you via https://quarkus.io/guides/kafka-dev-services[Quarkus Dev Services] and it also configures the application so that you do not need touch anything in `application.properties`. == Start in Development mode diff --git a/kafka/src/main/resources/application.properties b/kafka/src/main/resources/application.properties index e1196bd..52381be 100644 --- a/kafka/src/main/resources/application.properties +++ b/kafka/src/main/resources/application.properties @@ -15,6 +15,9 @@ ## limitations under the License. ## --- +# Use Strimzi as it's power architecture compatible +quarkus.kafka.devservices.provider = strimzi + # Kafka topic Name kafka.topic.name=test
Re: [PR] Use Strimzi as the Kafka devservices image as it works on Power architecture [camel-quarkus-examples]
jamesnetherton merged PR #188: URL: https://github.com/apache/camel-quarkus-examples/pull/188 -- 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] Use Strimzi as the Kafka devservices image as it works on Power architecture [camel-quarkus-examples]
jamesnetherton opened a new pull request, #188: URL: https://github.com/apache/camel-quarkus-examples/pull/188 Sending to `main` instead of `camel-quarkus-main` as it makes life easier for folks testing examples on Power. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch camel-main updated: Disabled JTA & SQL native because of spring update #5583
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new 32526fecd0 Disabled JTA & SQL native because of spring update #5583 32526fecd0 is described below commit 32526fecd09cfe868618feb4fb6041115844124f Author: JiriOndrusek AuthorDate: Fri Dec 1 15:12:05 2023 +0100 Disabled JTA & SQL native because of spring update #5583 --- integration-tests/jta/pom.xml | 5 +++-- integration-tests/sql/pom.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-tests/jta/pom.xml b/integration-tests/jta/pom.xml index 017bb3d6a8..5697734c98 100644 --- a/integration-tests/jta/pom.xml +++ b/integration-tests/jta/pom.xml @@ -88,7 +88,8 @@ - + + virtualDependencies diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml index 01ec2d33ce..9587bedf78 100644 --- a/integration-tests/sql/pom.xml +++ b/integration-tests/sql/pom.xml @@ -105,7 +105,8 @@ - + + virtualDependencies
Re: [I] [camel-main] JTA & Spring-rabbitmq native fails after upgrade of spring to 6.1.1 [camel-quarkus]
JiriOndrusek commented on issue #5583: URL: https://github.com/apache/camel-quarkus/issues/5583#issuecomment-1836179511 The same issues blocks JTA -- 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-20158: await executor termination after shutdown [camel]
jono-morris opened a new pull request, #12291: URL: https://github.com/apache/camel/pull/12291 Shutdown the executor cleanly so that it doesn't produce any warnings due to thread interruption. # 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. -- 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-20158: await executor termination after shutdown [camel]
github-actions[bot] commented on PR #12291: URL: https://github.com/apache/camel/pull/12291#issuecomment-1836169195 :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-quarkus) branch camel-main updated: Disabled spring-rabbitmq because of spring update #5583
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new 39799787de Disabled spring-rabbitmq because of spring update #5583 39799787de is described below commit 39799787de53d1e75741758ef51a71bb52254c4e Author: JiriOndrusek AuthorDate: Fri Dec 1 14:51:41 2023 +0100 Disabled spring-rabbitmq because of spring update #5583 --- integration-tests/spring-rabbitmq/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/spring-rabbitmq/pom.xml b/integration-tests/spring-rabbitmq/pom.xml index 764b7f4640..6ba4b1b432 100644 --- a/integration-tests/spring-rabbitmq/pom.xml +++ b/integration-tests/spring-rabbitmq/pom.xml @@ -79,7 +79,8 @@ - + + virtualDependencies
(camel) branch regen_bot updated (5fdb524e70d -> 7e0dedbec2e)
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 5fdb524e70d Update docs add 7e0dedbec2e CAMEL-20163: cleanup parsing HTTP status range (camel-vertx-http) No new revisions were added by this update. Summary of changes: .../camel/component/vertx/http/VertxHttpEndpoint.java| 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-)
Re: [PR] CAMEL-20163: cleanup parsing HTTP status range (camel-vertx-http) [camel]
orpiske merged PR #12284: URL: https://github.com/apache/camel/pull/12284 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20163: cleanup parsing HTTP status range (camel-vertx-http)
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 7e0dedbec2e CAMEL-20163: cleanup parsing HTTP status range (camel-vertx-http) 7e0dedbec2e is described below commit 7e0dedbec2e99e8e1f749ecf57124820e60d142f Author: Otavio Rodolfo Piske AuthorDate: Thu Nov 30 18:37:01 2023 -0300 CAMEL-20163: cleanup parsing HTTP status range (camel-vertx-http) --- .../camel/component/vertx/http/VertxHttpEndpoint.java| 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpEndpoint.java b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpEndpoint.java index 8d7170915b2..dcdb4bf47b7 100644 --- a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpEndpoint.java +++ b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpEndpoint.java @@ -31,6 +31,7 @@ import org.apache.camel.http.base.HttpHelper; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.support.DefaultEndpoint; +import org.apache.camel.support.http.HttpUtil; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; @@ -60,18 +61,23 @@ public class VertxHttpEndpoint extends DefaultEndpoint { @Override protected void doInit() throws Exception { String range = configuration.getOkStatusCodeRange(); +parseStatusRange(range); +} + +private void parseStatusRange(String range) { if (!range.contains(",")) { -// default is 200-299 so lets optimize for this -if (range.contains("-")) { -minOkRange = Integer.parseInt(StringHelper.before(range, "-")); -maxOkRange = Integer.parseInt(StringHelper.after(range, "-")); -} else { +if (!HttpUtil.parseStatusRange(range, this::setRanges)) { minOkRange = Integer.parseInt(range); maxOkRange = minOkRange; } } } +private void setRanges(int minOkRange, int maxOkRange) { +this.minOkRange = minOkRange; +this.maxOkRange = maxOkRange; +} + @Override public Producer createProducer() throws Exception { return new VertxHttpProducer(this);
[PR] fix(e2e): Kustomize registry check [camel-k]
gansheer opened a new pull request, #4957: URL: https://github.com/apache/camel-k/pull/4957 Ref #4954 Ensure IP is ready before checking its status configuration **Release Note** ```release-note fix(e2e): Kustomize registry check ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] Ability to override resources for the quarkus-native task [camel-k]
lsergio opened a new issue, #4956: URL: https://github.com/apache/camel-k/issues/4956 ### Requirement As a developer, I'm trying to speed up the native build process by providing more resources to the quarkus-native build task. ### Problem I created an Integration with the following traits: ``` traits: quarkus: buildMode: - native builder: tasksRequestMemory: - "quarkus-native:2000m" tasksRequestCPU: - "quarkus-native:8Gi" ``` in order to provide more resources to the quarkus-native phase of the build process. However, the build pod was still created with 1 cpu and 4Gi: ``` - command: - /bin/bash - -c - cd maven && ./mvnw package -Dquarkus.package.type=native --global-settings settings.xml image: quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17 name: quarkus-native resources: requests: cpu: "1" memory: 4Gi volumeMounts: - mountPath: /builder/kit-clktoa002nnjtch78vg0 name: camel-k-builder - mountPath: /var/run/secrets/kubernetes.io/serviceaccount name: kube-api-access-gdlpv readOnly: true workingDir: /builder/kit-clktoa002nnjtch78vg0 ``` ### Proposal The code might just check if there is configuration for the quarkus-native phase for any of the cpu/memory request or limit configurations and not use the default one if found. ### Open questions _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (a68e412c751 -> 5fdb524e70d)
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 a68e412c751 CAMEL-20164: camel-jbang - Add camel get consumer command add 5fdb524e70d Update docs No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[I] java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [camel-k]
lsergio opened a new issue, #4955: URL: https://github.com/apache/camel-k/issues/4955 ### What happened? I'm trying to run a basic integration with Camel K 2.1 and it fails to start. ### Steps to reproduce 1. Setup a gcr repository as described in https://camel.apache.org/camel-k/2.1.x/installation/registry/gcr.html. 2. Install kamel using the following command: kamel install --olm=false --build-publish-strategy=Kaniko --registry gcr.io --organization yourprojectid --registry-secret kaniko-secret 3. Create a secret for pulling the images from GCR and configure the pull-secret trait in the IntegrationPlatform object: traits: pull-secret: secretName: gcr-json-key 4. Create an Integration. In my case I used one like this: ``` apiVersion: camel.apache.org/v1 kind: Integration metadata: name: test spec: sources: - name: main.groovy content: |- rest("/test-mode") .post() .to("direct:start") from("direct:start").to("log:info") ``` 5. Wait for the builder to finish and create the integration pod. 6. Check the Integration pod log. There will be this error: ``` Error: Could not find or load main class io.quarkus.bootstrap.runner.QuarkusEntryPoint Caused by: java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint ``` The full log is added to the log output field. ### Relevant log output ```shell exec java -cp ./resources:/etc/camel/application.properties:/etc/camel/conf.d/_resources:/etc/camel/resources:/etc/camel/sources/main.groovy:dependencies/app/camel-k-integration-2.1.0.jar:dependencies/lib/boot/io.github.crac.org-crac-0.1.3.jar:dependencies/lib/boot/io.quarkus.quarkus-bootstrap-runner-3.2.6.Final.jar:dependencies/lib/boot/io.quarkus.quarkus-development-mode-spi-3.2.6.Final.jar:dependencies/lib/boot/io.quarkus.quarkus-vertx-latebound-mdc-provider-3.2.6.Final.jar:dependencies/lib/boot/io.smallrye.common.smallrye-common-io-2.1.0.jar:dependencies/lib/boot/jakarta.json.jakarta.json-api-2.1.2.jar:dependencies/lib/boot/org.eclipse.parsson.parsson-1.1.2.jar:dependencies/lib/boot/org.graalvm.sdk.graal-sdk-23.0.1.jar:dependencies/lib/boot/org.jboss.logging.jboss-logging-3.5.1.Final.jar:dependencies/lib/boot/org.jboss.logmanager.jboss-logmanager-embedded-1.1.1.jar:dependencies/lib/boot/org.wildfly.common.wildfly-common-1.5.4.Final-format-001.jar:dependencies/lib/main/com.aayu shatharva.brotli4j.brotli4j-1.12.0.jar:dependencies/lib/main/com.aayushatharva.brotli4j.native-linux-x86_64-1.12.0.jar:dependencies/lib/main/com.aayushatharva.brotli4j.service-1.12.0.jar:dependencies/lib/main/com.fasterxml.jackson.core.jackson-annotations-2.15.2.jar:dependencies/lib/main/com.fasterxml.jackson.core.jackson-core-2.15.2.jar:dependencies/lib/main/com.fasterxml.jackson.core.jackson-databind-2.15.2.jar:dependencies/lib/main/com.fasterxml.jackson.dataformat.jackson-dataformat-yaml-2.15.2.jar:dependencies/lib/main/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.15.2.jar:dependencies/lib/main/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.15.2.jar:dependencies/lib/main/com.fasterxml.jackson.module.jackson-module-parameter-names-2.15.2.jar:dependencies/lib/main/com.github.mifmif.generex-1.0.2.jar:dependencies/lib/main/dk.brics.automaton.automaton-1.11-8.jar:dependencies/lib/main/io.fabric8.kubernetes-client-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernete s-client-api-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-httpclient-vertx-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-admissionregistration-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-apiextensions-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-apps-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-autoscaling-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-batch-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-certificates-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-common-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-coordination-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-core-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-discovery-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-events-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-extensions-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-flowcont rol-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-gatewayapi-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-metrics-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-networking-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-node-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-policy-6.7.2.jar:dependencies/lib/main/io.fabric8.kubernetes-model-rbac-6.7.2.jar:dependencies/lib/main/io.fabric8.kube
(camel) branch main updated: Update docs
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 5fdb524e70d Update docs 5fdb524e70d is described below commit 5fdb524e70da08dac56149e07e4bc64604180509 Author: Claus Ibsen AuthorDate: Fri Dec 1 14:00:17 2023 +0100 Update docs --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index b402046aea3..6e36e24ba63 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2247,7 +2247,9 @@ then you see an error (in red) with stacktrace that hopefully can help you out h === Transforming directly from Camel DSL source In the example above we externalize the transformation into a template file named `transform.json`. -However, its also possible to transform directly in the Camel DSL route. +However, it's possible to transform directly in the Camel DSL route. + +NOTE: Currently Java DSL is not working in --watch mode (reload on change) In the following we cover the json-transform example from: https://github.com/apache/camel-kamelets-examples/tree/main/jbang/json-transform
(camel) branch regen_bot updated (71588a8a849 -> a68e412c751)
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 71588a8a849 Regen add a68e412c751 CAMEL-20164: camel-jbang - Add camel get consumer command No new revisions were added by this update. Summary of changes: .../camel/impl/console/ConsumerDevConsole.java | 30 .../jbang/core/commands/process/ListConsumer.java | 42 ++ 2 files changed, 72 insertions(+)
(camel) branch main updated: CAMEL-20164: camel-jbang - Add camel get consumer command
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 a68e412c751 CAMEL-20164: camel-jbang - Add camel get consumer command a68e412c751 is described below commit a68e412c7512b26a027a9baf5e07862c083b5ee5 Author: Claus Ibsen AuthorDate: Fri Dec 1 13:31:50 2023 +0100 CAMEL-20164: camel-jbang - Add camel get consumer command --- .../camel/impl/console/ConsumerDevConsole.java | 30 .../jbang/core/commands/process/ListConsumer.java | 42 ++ 2 files changed, 72 insertions(+) diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java index 50db3511a6f..97e2f81cd37 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ConsumerDevConsole.java @@ -18,6 +18,7 @@ package org.apache.camel.impl.console; import java.lang.management.ManagementFactory; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -27,9 +28,11 @@ import javax.management.ObjectName; import org.apache.camel.Route; import org.apache.camel.api.management.ManagedCamelContext; import org.apache.camel.api.management.mbean.ManagedConsumerMBean; +import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.api.management.mbean.ManagedSchedulePollConsumerMBean; import org.apache.camel.spi.annotations.DevConsole; import org.apache.camel.support.console.AbstractDevConsole; +import org.apache.camel.util.TimeUtils; import org.apache.camel.util.json.JsonObject; @DevConsole("consumer") @@ -135,6 +138,7 @@ public class ConsumerDevConsole extends AbstractDevConsole { if (mcc != null) { for (Route route : getCamelContext().getRoutes()) { String id = route.getId(); +ManagedRouteMBean mr = mcc.getManagedRoute(id); ManagedConsumerMBean mc = mcc.getManagedConsumer(id); if (mc != null) { JsonObject jo = new JsonObject(); @@ -207,6 +211,32 @@ public class ConsumerDevConsole extends AbstractDevConsole { // ignore } } + +if (mr != null) { +JsonObject stats = new JsonObject(); +stats.put("exchangesTotal", mr.getExchangesTotal()); +stats.put("exchangesFailed", mr.getExchangesFailed()); +stats.put("exchangesInflight", mr.getExchangesInflight()); +stats.put("meanProcessingTime", mr.getMeanProcessingTime()); +stats.put("maxProcessingTime", mr.getMaxProcessingTime()); +stats.put("minProcessingTime", mr.getMinProcessingTime()); +if (mr.getExchangesTotal() > 0) { +stats.put("lastProcessingTime", mr.getLastProcessingTime()); +stats.put("deltaProcessingTime", mr.getDeltaProcessingTime()); +} +Date last = mr.getLastExchangeCompletedTimestamp(); +if (last != null) { +String ago = TimeUtils.printSince(last.getTime()); +stats.put("sinceLastCompletedExchange", ago); +} +last = mr.getLastExchangeFailureTimestamp(); +if (last != null) { +String ago = TimeUtils.printSince(last.getTime()); +stats.put("sinceLastFailedExchange", ago); +} +jo.put("statistics", stats); +} + list.add(jo); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java index 1c7ed264db8..6121497385d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListConsumer.java @@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.core.commands.process; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import com.github.freva.asciitable.AsciiTable; import com.github.freva.asciitable.Column; @@ -103,8 +104,25 @@ public cl
Re: [I] [quarkus-main] Tarfile enable tests when common-compress 1.25.0 is consumed from Quarkus [camel-quarkus]
JiriOndrusek commented on issue #5538: URL: https://github.com/apache/camel-quarkus/issues/5538#issuecomment-1836027783 Native profile is disabled 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-quarkus) branch camel-main updated: Disabled native for tarfile test - #5538
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new 42fdd5e0bf Disabled native for tarfile test - #5538 42fdd5e0bf is described below commit 42fdd5e0bfbc9f7a2e6b57230c6e5e180868bdd4 Author: JiriOndrusek AuthorDate: Fri Dec 1 13:19:15 2023 +0100 Disabled native for tarfile test - #5538 --- integration-tests/tarfile/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/tarfile/pom.xml b/integration-tests/tarfile/pom.xml index fb2cd64898..4a96572f44 100644 --- a/integration-tests/tarfile/pom.xml +++ b/integration-tests/tarfile/pom.xml @@ -59,7 +59,8 @@ - + virtualDependencies
(camel) branch regen_bot updated (300573de749 -> 71588a8a849)
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 300573de749 Regen for commit 693082e00c00dcb12e643564d9f13bc1b08b7ab3 add 71588a8a849 Regen No new revisions were added by this update. Summary of changes: .../org/apache/camel/support/http/HttpUtil.java| 27 -- 1 file changed, 15 insertions(+), 12 deletions(-)
(camel-kamelets) branch regen_bot updated (c23e7106 -> 7f541208)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from c23e7106 Regen for commit 278151eaad50203d47821ec08e8b78a105bd (#1760) add e228c7cd Updated CHANGELOG.md add 7f541208 Bump actions/setup-java from 3 to 4 (#1761) No new revisions were added by this update. Summary of changes: .github/workflows/ci-build.yml | 4 ++-- .github/workflows/generate-sbom-main.yml | 2 +- .github/workflows/java-tests.yaml| 2 +- .github/workflows/main-push-regen.yaml | 2 +- .github/workflows/yaks-tests.yaml| 2 +- CHANGELOG.md | 1 + 6 files changed, 7 insertions(+), 6 deletions(-)
(camel-kamelets) branch dependabot/github_actions/actions/setup-java-4 deleted (was ced0a7d8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/setup-java-4 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was ced0a7d8 Bump actions/setup-java from 3 to 4 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] Bump actions/setup-java from 3 to 4 [camel-kamelets]
oscerd merged PR #1761: URL: https://github.com/apache/camel-kamelets/pull/1761 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: 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 71588a8a849 Regen 71588a8a849 is described below commit 71588a8a84937828a06f394dac38b705110acc5b Author: Claus Ibsen AuthorDate: Fri Dec 1 13:08:27 2023 +0100 Regen --- .../org/apache/camel/support/http/HttpUtil.java| 27 -- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java index dfdaaea9b97..67515da2842 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java @@ -169,9 +169,10 @@ public final class HttpUtil { /** * Parse a HTTP status range and passes the values to the consumer method - * @param range the HTTP status range in the format "XXX-YYY" (i.e.: 200-299) - * @param consumer a consumer method to receive the parse ranges - * @return true if the range was parsed or false otherwise + * + * @param rangethe HTTP status range in the format "XXX-YYY" (i.e.: 200-299) + * @param consumer a consumer method to receive the parse ranges + * @return true if the range was parsed or false otherwise */ public static boolean parseStatusRange(String range, BiConsumer consumer) { // default is 200-299 so lets optimize for this @@ -195,17 +196,19 @@ public final class HttpUtil { } /** - * Iterates over a list of values and passes them to the consumer after applying the filter strategy. This is mostly used to - * simplify setting headers for HTTP responses + * Iterates over a list of values and passes them to the consumer after applying the filter strategy. This is mostly + * used to simplify setting headers for HTTP responses + * * @param headerFilterStrategy the filter strategy to apply - * @param exchange an exchange to apply the header strategy - * @param it the iterator providing the values - * @param tc a type converter instance so that the values can be converted to string - * @param key a key associated with the values being iterated - * @param consumer a consumer method to receive the converted values. It can receive either a list of values or a single - * value. + * @param exchange an exchange to apply the header strategy + * @param it the iterator providing the values + * @param tc a type converter instance so that the values can be converted to string + * @param key a key associated with the values being iterated + * @param consumer a consumer method to receive the converted values. It can receive either a list of + * values or a single value. */ -public static void applyHeader(HeaderFilterStrategy headerFilterStrategy, Exchange exchange, Iterator it, +public static void applyHeader( +HeaderFilterStrategy headerFilterStrategy, Exchange exchange, Iterator it, TypeConverter tc, String key, BiConsumer, String> consumer) { String firstValue = null; List values = null;
(camel-kamelets) branch main updated: Bump actions/setup-java from 3 to 4 (#1761)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 7f541208 Bump actions/setup-java from 3 to 4 (#1761) 7f541208 is described below commit 7f541208be389156dc8e95fb6609b715a30bcc31 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Dec 1 13:09:12 2023 +0100 Bump actions/setup-java from 3 to 4 (#1761) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-build.yml | 4 ++-- .github/workflows/generate-sbom-main.yml | 2 +- .github/workflows/java-tests.yaml| 2 +- .github/workflows/main-push-regen.yaml | 2 +- .github/workflows/yaks-tests.yaml| 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 27b8f3cc..4fdb72e8 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -52,7 +52,7 @@ jobs: with: persist-credentials: false - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 @@ -79,7 +79,7 @@ jobs: with: persist-credentials: false - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml index efcc07b6..42d7b7c5 100644 --- a/.github/workflows/generate-sbom-main.yml +++ b/.github/workflows/generate-sbom-main.yml @@ -39,7 +39,7 @@ jobs: with: persist-credentials: false - name: Set up JDK ${{ matrix.java }} -uses: actions/setup-java@v3 +uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 63f480f8..46d95da5 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -39,7 +39,7 @@ jobs: with: persist-credentials: false - name: Set up JDK -uses: actions/setup-java@v3 +uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/main-push-regen.yaml b/.github/workflows/main-push-regen.yaml index b73d3d56..e6c6d250 100644 --- a/.github/workflows/main-push-regen.yaml +++ b/.github/workflows/main-push-regen.yaml @@ -35,7 +35,7 @@ jobs: with: persist-credentials: false - name: Set up JDK -uses: actions/setup-java@v3 +uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/yaks-tests.yaml b/.github/workflows/yaks-tests.yaml index b785f826..6c2c386f 100644 --- a/.github/workflows/yaks-tests.yaml +++ b/.github/workflows/yaks-tests.yaml @@ -52,7 +52,7 @@ jobs: with: persist-credentials: false - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17