Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
davsclaus closed pull request #1155: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1155 -- 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 dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 deleted (was d5cef1084c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was d5cef1084c Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated: Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 (#6122)
This is an automated email from the ASF dual-hosted git repository. zhfeng 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 c4ee52f1fb Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 (#6122) c4ee52f1fb is described below commit c4ee52f1fb8b8f03b68244c116dd9211f1685bf7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 28 11:00:54 2024 +0800 Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 (#6122) Bumps net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0. --- updated-dependencies: - dependency-name: net.revelc.code:impsort-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index add620920f..5eecdb708b 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ 3.3.0 2.23.0 3.0.0 -1.9.0 +1.10.0 1.2.3 1.7 4.5
Re: [PR] Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 [camel-quarkus]
zhfeng merged PR #6122: URL: https://github.com/apache/camel-quarkus/pull/6122 -- 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] Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.15.0 to 2.16.0 [camel-quarkus]
github-actions[bot] commented on PR #6121: URL: https://github.com/apache/camel-quarkus/pull/6121#issuecomment-2134192761 :warning: :warning: :warning: Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/9261978695 Please check the workflow result before merging. :warning: :warning: :warning: -- 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 dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 updated (fc1a859c32 -> 220edb953a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from fc1a859c32 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom add 220edb953a Auto generated changes for dependabot commit fc1a859c32c39a67f349f12bf8ac0860b177ef70 No new revisions were added by this update. Summary of changes: pom.xml|2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2525 ++-- .../src/main/generated/flattened-reduced-pom.xml | 106 +- .../generated/flattened-reduced-verbose-pom.xml| 306 +-- 4 files changed, 1472 insertions(+), 1467 deletions(-)
(camel-quarkus) branch dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 updated (3f4079f939 -> d5cef1084c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 3f4079f939 Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 add 852f4a31a7 Fixup rest-openapi doc add d5cef1084c Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 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 (3f4079f939) \ N -- N -- N refs/heads/dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 (d5cef1084c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc | 1 + 1 file changed, 1 insertion(+)
(camel-quarkus) branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 updated (776db29721 -> fc1a859c32)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 776db29721 Auto generated changes for dependabot commit 5ecfe85ee137c0a1976d501de477a9d6354b1751 discard 5ecfe85ee1 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom add 852f4a31a7 Fixup rest-openapi doc add fc1a859c32 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom 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 (776db29721) \ N -- N -- N refs/heads/dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 (fc1a859c32) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../pages/reference/extensions/rest-openapi.adoc |1 + pom.xml|2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2525 ++-- .../src/main/generated/flattened-reduced-pom.xml | 106 +- .../generated/flattened-reduced-verbose-pom.xml| 306 +-- 5 files changed, 1468 insertions(+), 1472 deletions(-)
Re: [PR] Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 [camel-quarkus]
zhfeng commented on PR #6122: URL: https://github.com/apache/camel-quarkus/pull/6122#issuecomment-2134190325 @dependabot rebase -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.15.0 to 2.16.0 [camel-quarkus]
zhfeng commented on PR #6121: URL: https://github.com/apache/camel-quarkus/pull/6121#issuecomment-2134190166 @dependabot rebase -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Fixup rest-openapi doc
This is an automated email from the ASF dual-hosted git repository. zhfeng 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 852f4a31a7 Fixup rest-openapi doc 852f4a31a7 is described below commit 852f4a31a76840c78b0873c3fc33961345a0e478 Author: Zheng Feng AuthorDate: Tue May 28 09:03:54 2024 +0800 Fixup rest-openapi doc --- docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc index ca259535e4..e87b100198 100644 --- a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc @@ -127,6 +127,7 @@ quarkus.native.resources.includes=contract.json + [id="extensions-rest-openapi-additional-camel-quarkus-configuration"] == Additional Camel Quarkus configuration
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-2134175216 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 9261522178-1392-1ef8edf0-f69e-4c52-8e93-3aafb4c4a8f5 * Camel Quarkus Commit: eaac76aeced1b5ce3c22ae23039d34c59284bb05 * Camel Main Commit: 825571eb9335153618aa5cf45dc33984509fc371 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9261522178 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1155: URL: https://github.com/apache/camel-spring-boot/pull/1155 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Consider using metav1.Condition instead of own condition structs [camel-k]
github-actions[bot] commented on issue #5191: URL: https://github.com/apache/camel-k/issues/5191#issuecomment-2134164284 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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-karavan) branch main updated: Optimize statuses
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new ab580062 Optimize statuses
ab580062 is described below
commit ab580062686f2e536d61277321140ea012eaa75d
Author: Marat Gubaidullin
AuthorDate: Mon May 27 19:16:17 2024 -0400
Optimize statuses
---
.../karavan/status/ContainerStatusListener.java| 4 +-
.../apache/camel/karavan/status/StatusService.java | 68 --
.../karavan/status/docker/DockerStatusService.java | 2 +-
.../status/kubernetes/KubernetesStatusService.java | 21 +++
4 files changed, 24 insertions(+), 71 deletions(-)
diff --git
a/karavan-statuses/src/main/java/org/apache/camel/karavan/status/ContainerStatusListener.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/status/ContainerStatusListener.java
index 4e0b2d3d..301d7518 100644
---
a/karavan-statuses/src/main/java/org/apache/camel/karavan/status/ContainerStatusListener.java
+++
b/karavan-statuses/src/main/java/org/apache/camel/karavan/status/ContainerStatusListener.java
@@ -59,8 +59,8 @@ public class ContainerStatusListener {
}
@ConsumeEvent(value = CMD_CLEAN_STATUSES, blocking = true)
-void cleanContainersStatuses(JsonArray list) {
-List statusesInDocker = list.stream().map(o ->
((JsonObject)o).mapTo(ContainerStatus.class)).toList();
+void cleanContainersStatuses(String data) {
+List statusesInDocker =
dockerAPI.collectContainersStatuses();
List namesInDocker =
statusesInDocker.stream().map(ContainerStatus::getContainerName).toList();
List statusesInCache =
statusCache.getContainerStatuses(environment);
// clean deleted
diff --git
a/karavan-statuses/src/main/java/org/apache/camel/karavan/status/StatusService.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/status/StatusService.java
deleted file mode 100644
index 2a64f743..
---
a/karavan-statuses/src/main/java/org/apache/camel/karavan/status/StatusService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karavan.status;
-
-import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.Startup;
-import io.quarkus.runtime.StartupEvent;
-import jakarta.enterprise.event.Observes;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import org.apache.camel.karavan.config.ConfigService;
-import org.apache.camel.karavan.status.docker.DockerAPI;
-import org.apache.camel.karavan.status.kubernetes.KubernetesStatusService;
-import org.eclipse.microprofile.health.HealthCheck;
-import org.eclipse.microprofile.health.HealthCheckResponse;
-import org.eclipse.microprofile.health.Liveness;
-import org.jboss.logging.Logger;
-
-import java.io.IOException;
-
-@Startup
-@Liveness
-@Singleton
-public class StatusService implements HealthCheck {
-
-private static final Logger LOGGER =
Logger.getLogger(StatusService.class.getName());
-
-@Inject
-KubernetesStatusService kubernetesStatusService;
-
-@Inject
-DockerAPI dockerAPI;
-
-@Override
-public HealthCheckResponse call() {
-return HealthCheckResponse.up("Karavan");
-}
-
-void onStart(@Observes StartupEvent ev) throws Exception {
-LOGGER.info("Status Listeners: starting...");
-if (ConfigService.inKubernetes()) {
-kubernetesStatusService.startInformers();
-}
-LOGGER.info("Status Listeners: started");
-}
-
-void onStop(@Observes ShutdownEvent ev) throws IOException {
-LOGGER.info("Status Listeners: stopping...");
-if (ConfigService.inKubernetes()) {
-kubernetesStatusService.stopInformers();
-}
-LOGGER.info("Status Listeners: stopped");
-}
-}
diff --git
a/karavan-statuses/src/main/java/org/apache/camel/karavan/status/docker/DockerStatusService.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/status/docker/DockerStatusService.java
index 8e98c839..b72461fd 100644
---
(camel-karavan) branch main updated: Fix #1299
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 001e1450 Fix #1299
001e1450 is described below
commit 001e1450607b150ea216b2bfcdd41a9e1ef0bf03
Author: Marat Gubaidullin
AuthorDate: Mon May 27 18:31:25 2024 -0400
Fix #1299
---
.../.mvn/wrapper/maven-wrapper.properties | 0
{karavan-status => karavan-statuses}/mvnw | 0
{karavan-status => karavan-statuses}/mvnw.cmd | 0
{karavan-status => karavan-statuses}/pom.xml | 0
.../src/main/java/org/apache/camel/karavan/config/ConfigService.java | 0
.../src/main/java/org/apache/camel/karavan/config/Configuration.java | 0
.../main/java/org/apache/camel/karavan/status/CamelStatusListener.java| 0
.../src/main/java/org/apache/camel/karavan/status/CamelStatusService.java | 0
.../java/org/apache/camel/karavan/status/ContainerStatusListener.java | 0
.../src/main/java/org/apache/camel/karavan/status/StatusCache.java| 0
.../src/main/java/org/apache/camel/karavan/status/StatusConstants.java| 0
.../src/main/java/org/apache/camel/karavan/status/StatusEvents.java | 0
.../src/main/java/org/apache/camel/karavan/status/StatusService.java | 0
.../src/main/java/org/apache/camel/karavan/status/docker/DockerAPI.java | 0
.../java/org/apache/camel/karavan/status/docker/DockerStatusService.java | 0
.../src/main/java/org/apache/camel/karavan/status/docker/DockerUtils.java | 0
.../apache/camel/karavan/status/kubernetes/DeploymentEventHandler.java| 0
.../apache/camel/karavan/status/kubernetes/DeploymentStatusListener.java | 0
.../apache/camel/karavan/status/kubernetes/KubernetesStatusService.java | 0
.../java/org/apache/camel/karavan/status/kubernetes/PodEventHandler.java | 0
.../org/apache/camel/karavan/status/kubernetes/ServiceEventHandler.java | 0
.../org/apache/camel/karavan/status/kubernetes/ServiceStatusListener.java | 0
.../src/main/java/org/apache/camel/karavan/status/model/CamelStatus.java | 0
.../java/org/apache/camel/karavan/status/model/CamelStatusRequest.java| 0
.../main/java/org/apache/camel/karavan/status/model/CamelStatusValue.java | 0
.../main/java/org/apache/camel/karavan/status/model/ContainerPort.java| 0
.../main/java/org/apache/camel/karavan/status/model/ContainerStatus.java | 0
.../main/java/org/apache/camel/karavan/status/model/DeploymentStatus.java | 0
.../src/main/java/org/apache/camel/karavan/status/model/GroupedKey.java | 0
.../main/java/org/apache/camel/karavan/status/model/ServiceStatus.java| 0
30 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/karavan-status/.mvn/wrapper/maven-wrapper.properties
b/karavan-statuses/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from karavan-status/.mvn/wrapper/maven-wrapper.properties
rename to karavan-statuses/.mvn/wrapper/maven-wrapper.properties
diff --git a/karavan-status/mvnw b/karavan-statuses/mvnw
similarity index 100%
rename from karavan-status/mvnw
rename to karavan-statuses/mvnw
diff --git a/karavan-status/mvnw.cmd b/karavan-statuses/mvnw.cmd
similarity index 100%
rename from karavan-status/mvnw.cmd
rename to karavan-statuses/mvnw.cmd
diff --git a/karavan-status/pom.xml b/karavan-statuses/pom.xml
similarity index 100%
rename from karavan-status/pom.xml
rename to karavan-statuses/pom.xml
diff --git
a/karavan-status/src/main/java/org/apache/camel/karavan/config/ConfigService.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/config/ConfigService.java
similarity index 100%
rename from
karavan-status/src/main/java/org/apache/camel/karavan/config/ConfigService.java
rename to
karavan-statuses/src/main/java/org/apache/camel/karavan/config/ConfigService.java
diff --git
a/karavan-status/src/main/java/org/apache/camel/karavan/config/Configuration.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/config/Configuration.java
similarity index 100%
rename from
karavan-status/src/main/java/org/apache/camel/karavan/config/Configuration.java
rename to
karavan-statuses/src/main/java/org/apache/camel/karavan/config/Configuration.java
diff --git
a/karavan-status/src/main/java/org/apache/camel/karavan/status/CamelStatusListener.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/status/CamelStatusListener.java
similarity index 100%
rename from
karavan-status/src/main/java/org/apache/camel/karavan/status/CamelStatusListener.java
rename to
karavan-statuses/src/main/java/org/apache/camel/karavan/status/CamelStatusListener.java
diff --git
a/karavan-status/src/main/java/org/apache/camel/karavan/status/CamelStatusService.java
b/karavan-statuses/src/main/java/org/apache/camel/karavan/status/CamelStatusService.java
similarity index 100%
(camel-karavan) 05/05: Fix #1299
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 6587a7e9b048b2c64f00d2be56e6fcf086d96358
Author: Marat Gubaidullin
AuthorDate: Mon May 27 18:27:07 2024 -0400
Fix #1299
---
.github/workflows/app-oidc.yml | 12
.github/workflows/app.yml | 12
karavan-app/pom.xml| 2 +-
karavan-projects/pom.xml | 2 +-
karavan-status/pom.xml | 2 +-
pom.xml| 2 +-
6 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/app-oidc.yml b/.github/workflows/app-oidc.yml
index 88cdd811..4dd5548b 100644
--- a/.github/workflows/app-oidc.yml
+++ b/.github/workflows/app-oidc.yml
@@ -52,6 +52,18 @@ jobs:
- name: Create Multi Platfrom Builder
run: docker buildx create --use --platform=linux/arm64,linux/amd64
--name multi-platform-builder
+ - name: Build parent
+working-directory: ./karavan/
+run: mvn clean install -N
+
+ - name: Build statuses
+working-directory: ./karavan/karavan-statuses
+run: mvn clean install
+
+ - name: Build projects
+working-directory: ./karavan/karavan-projects
+run: mvn clean install
+
- name: Build application
working-directory: ./karavan/karavan-app
run: |
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 6fe42611..2f58d00b 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -52,6 +52,18 @@ jobs:
- name: Create Multi Platfrom Builder
run: docker buildx create --use --platform=linux/arm64,linux/amd64
--name multi-platform-builder
+ - name: Build parent
+working-directory: ./karavan/
+run: mvn clean install -N
+
+ - name: Build statuses
+working-directory: ./karavan/karavan-statuses
+run: mvn clean install
+
+ - name: Build projects
+working-directory: ./karavan/karavan-projects
+run: mvn clean install
+
- name: Build application
working-directory: ./karavan/karavan-app
run: |
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 4c9e7234..04a3bd6a 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -66,7 +66,7 @@
org.apache.camel.karavan
-karavan-status
+karavan-statuses
${project.version}
diff --git a/karavan-projects/pom.xml b/karavan-projects/pom.xml
index 701a8abe..562dbe9e 100644
--- a/karavan-projects/pom.xml
+++ b/karavan-projects/pom.xml
@@ -57,7 +57,7 @@
org.apache.camel.karavan
-karavan-status
+karavan-statuses
${project.version}
diff --git a/karavan-status/pom.xml b/karavan-status/pom.xml
index 0de03963..f1256074 100644
--- a/karavan-status/pom.xml
+++ b/karavan-status/pom.xml
@@ -24,7 +24,7 @@
karavan-parent
4.7.0
-karavan-status
+karavan-statuses
3.11.0
diff --git a/pom.xml b/pom.xml
index 1b1a623d..b14ca442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
4.7.0
pom
-karavan-status
+karavan-statuses
karavan-projects
karavan-app
(camel-karavan) branch main updated (e4a9d77d -> 6587a7e9)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from e4a9d77d Fix #1297
new d7d82f32 Karavan status service
new ca733a41 Status service that works
new dc1b853c Modules
new 5c125d8e Modules
new 6587a7e9 Fix #1299
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/app-oidc.yml | 12 +
.github/workflows/app.yml | 12 +
karavan-app/pom.xml| 28 +-
.../karavan/{service => }/KaravanService.java | 50 +--
.../karavan/{service => }/RegistryService.java | 17 +-
.../org/apache/camel/karavan/api/AuthResource.java | 27 +-
.../apache/camel/karavan/api/BuildResource.java| 16 +-
.../camel/karavan/api/ComponentResources.java | 2 +-
.../camel/karavan/api/ConfigurationResource.java | 8 +-
.../camel/karavan/api/ContainerResource.java | 134 +++---
.../apache/camel/karavan/api/DevModeResource.java | 56 ++-
.../apache/camel/karavan/api/ImagesResource.java | 16 +-
.../camel/karavan/api/InfrastructureResource.java | 73 ++--
.../apache/camel/karavan/api/KameletResources.java | 25 +-
.../apache/camel/karavan/api/LogWatchResource.java | 21 +-
.../camel/karavan/api/NotificationResource.java| 2 +-
.../camel/karavan/api/ProjectFileResource.java | 22 +-
.../camel/karavan/api/ProjectGitResource.java | 6 +-
.../apache/camel/karavan/api/ProjectResource.java | 52 ++-
.../apache/camel/karavan/api/StatusResource.java | 50 +--
.../apache/camel/karavan/manager/CamelManager.java | 165
.../ManagerConstants.java} | 35 +-
.../NotificationManager.java} | 11 +-
.../camel/karavan/manager/ProjectManager.java | 133 ++
.../{ => manager}/docker/DockerEventListener.java | 14 +-
.../{ => manager}/docker/DockerForKaravan.java | 34 +-
.../docker/DockerLogCallback.java} | 6 +-
.../docker/DockerManager.java} | 157 ++-
.../docker/DockerPullCallback.java}| 6 +-
.../camel/karavan/manager/docker/DockerUtils.java | 92
.../kubernetes/KubernetesManager.java} | 90 +---
.../apache/camel/karavan/service/CamelService.java | 261
.../karavan/service/ContainerStatusService.java| 149 ---
.../camel/karavan/service/ProjectService.java | 468 -
.../.mvn/wrapper/maven-wrapper.properties | 0
{karavan-app => karavan-projects}/mvnw | 0
{karavan-app => karavan-projects}/mvnw.cmd | 0
{karavan-app => karavan-projects}/pom.xml | 121 +-
.../apache/camel/karavan/project}/CodeService.java | 85 ++--
.../karavan/project}/DockerComposeConverter.java | 6 +-
.../apache/camel/karavan/project}/GitService.java | 6 +-
.../camel/karavan/project/ProjectEvents.java | 15 +-
.../camel/karavan/project/ProjectService.java | 277
.../camel/karavan/project/ProjectStarter.java | 192 +
.../camel/karavan/project/ProjectsCache.java | 87
.../karavan/project}/model/DockerCompose.java | 2 +-
.../project}/model/DockerComposeHealthCheck.java | 2 +-
.../project}/model/DockerComposeNetwork.java | 2 +-
.../project}/model/DockerComposeService.java | 2 +-
.../camel/karavan/project}/model/GitConfig.java| 2 +-
.../camel/karavan/project}/model/GitRepo.java | 2 +-
.../camel/karavan/project}/model/GitRepoFile.java | 2 +-
.../camel/karavan/project}/model/GroupedKey.java | 10 +-
.../camel/karavan/project}/model/Project.java | 10 +-
.../camel/karavan/project}/model/ProjectFile.java | 10 +-
.../karavan/project}/model/RegistryConfig.java | 2 +-
.../src/main/resources/services/devservices.yaml | 0
.../resources/templates/builder-env.properties | 0
.../resources/templates/components-blocklist.txt | 0
.../main/resources/templates/configmap.jkube.yaml | 0
.../templates/database-bean-template.camel.yaml| 0
.../main/resources/templates/deployment.jkube.yaml | 0
.../templates/docker-application.properties| 0
.../src/main/resources/templates/docker-build.sh | 0
.../main/resources/templates/docker-compose.yaml | 0
.../main/resources/templates/ingress.jkube.yaml| 0
.../resources/templates/kamelets-blocklist.txt | 0
.../templates/kubernetes-application.properties| 2 -
.../main/resources/templates/kubernetes-build.sh | 0
.../templates/messaging-bean-template.camel.yaml | 0
.../templates/openshift-application.properties | 1 -
(camel-karavan) 01/05: Karavan status service
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit d7d82f32618fef182cd9b46bc84c7f112e37e18d Author: Marat Gubaidullin AuthorDate: Mon May 27 12:07:13 2024 -0400 Karavan status service --- .../.mvn/wrapper/maven-wrapper.properties | 18 ++ karavan-status/mvnw| 308 ++ karavan-status/mvnw.cmd| 205 karavan-status/pom.xml | 179 +++ .../camel/karavan/status/CamelStatusListener.java | 125 .../camel/karavan/status/CamelStatusService.java | 62 .../apache/camel/karavan/status/ConfigService.java | 78 + .../karavan/status/ContainerStatusListener.java| 121 +++ .../camel/karavan/status/KaravanStatusCache.java | 188 +++ .../camel/karavan/status/KaravanStatusEvents.java | 33 ++ .../camel/karavan/status/KaravanStatusService.java | 67 .../camel/karavan/status/StatusConstants.java | 46 +++ .../camel/karavan/status/docker/DockerAPI.java | 102 ++ .../karavan/status/docker/DockerStatusService.java | 60 .../camel/karavan/status/docker/DockerUtils.java | 153 + .../status/kubernetes/DeploymentEventHandler.java | 103 ++ .../kubernetes/DeploymentStatusListener.java | 47 +++ .../status/kubernetes/KubernetesStatusService.java | 150 + .../karavan/status/kubernetes/PodEventHandler.java | 160 + .../status/kubernetes/ServiceEventHandler.java | 98 ++ .../status/kubernetes/ServiceStatusListener.java | 46 +++ .../camel/karavan/status/model/CamelStatus.java| 67 .../karavan/status/model/CamelStatusRequest.java | 47 +++ .../karavan/status/model/CamelStatusValue.java | 57 .../camel/karavan/status/model/Configuration.java | 87 + .../camel/karavan/status/model/ContainerPort.java | 55 .../karavan/status/model/ContainerStatus.java | 356 + .../karavan/status/model/DeploymentStatus.java | 116 +++ .../camel/karavan/status/model/GroupedKey.java | 85 + .../camel/karavan/status/model/ServiceStatus.java | 113 +++ .../src/main/resources/application.properties | 29 ++ 31 files changed, 3361 insertions(+) diff --git a/karavan-status/.mvn/wrapper/maven-wrapper.properties b/karavan-status/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index ..70f4f50f --- /dev/null +++ b/karavan-status/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/karavan-status/mvnw b/karavan-status/mvnw new file mode 100755 index ..8d937f4c --- /dev/null +++ b/karavan-status/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# +# 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. +# + +# +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +#
Re: [I] Split application to modules [camel-karavan]
mgubaidullin closed issue #1299: Split application to modules URL: https://github.com/apache/camel-karavan/issues/1299 -- 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] Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #6122: URL: https://github.com/apache/camel-quarkus/pull/6122 Bumps net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0. [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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 dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 created (now 3f4079f939)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/net.revelc.code-impsort-maven-plugin-1.10.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 3f4079f939 Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 No new revisions were added by this update.
Re: [PR] Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.15.0 to 2.16.0 [camel-quarkus]
github-actions[bot] commented on PR #6121: URL: https://github.com/apache/camel-quarkus/pull/6121#issuecomment-2134070959 :warning: :warning: :warning: Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/9260470120 Please check the workflow result before merging. :warning: :warning: :warning: -- 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 dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 updated (5ecfe85ee1 -> 776db29721)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 5ecfe85ee1 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom add 776db29721 Auto generated changes for dependabot commit 5ecfe85ee137c0a1976d501de477a9d6354b1751 No new revisions were added by this update. Summary of changes: pom.xml|2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2525 ++-- .../src/main/generated/flattened-reduced-pom.xml | 106 +- .../generated/flattened-reduced-verbose-pom.xml| 306 +-- 4 files changed, 1472 insertions(+), 1467 deletions(-)
(camel-quarkus) branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 created (now 5ecfe85ee1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.16.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 5ecfe85ee1 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom No new revisions were added by this update.
[PR] Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.15.0 to 2.16.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #6121: URL: https://github.com/apache/camel-quarkus/pull/6121 Bumps [io.quarkiverse.amazonservices:quarkus-amazon-services-bom](https://github.com/quarkiverse/quarkus-amazon-services) from 2.15.0 to 2.16.0. Release notes Sourced from https://github.com/quarkiverse/quarkus-amazon-services/releases;>io.quarkiverse.amazonservices:quarkus-amazon-services-bom's releases. 2.16.0 What's Changed fix: Service in devservices by https://github.com/holomekc;>@holomekc in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1252;>quarkiverse/quarkus-amazon-services#1252 docs: add holomekc as a contributor for code by https://github.com/allcontributors;>@allcontributors in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1253;>quarkiverse/quarkus-amazon-services#1253 feat: produce trace-enabled Sqs client when telemetry is enabled by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1259;>quarkiverse/quarkus-amazon-services#1259 build(deps): bump software.amazon.awssdk.crt:aws-crt from 0.29.18 to 0.29.19 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1272;>quarkiverse/quarkus-amazon-services#1272 build(deps): bump quarkus.version from 3.10.0 to 3.11.0 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1274;>quarkiverse/quarkus-amazon-services#1274 build(deps): bump software.amazon.awssdk:bom from 2.25.44 to 2.25.60 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1277;>quarkiverse/quarkus-amazon-services#1277 chore: release 2.16.0 by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1278;>quarkiverse/quarkus-amazon-services#1278 New Contributors https://github.com/holomekc;>@holomekc made their first contribution in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/1252;>quarkiverse/quarkus-amazon-services#1252 Full Changelog: https://github.com/quarkiverse/quarkus-amazon-services/compare/2.15.0...2.16.0;>https://github.com/quarkiverse/quarkus-amazon-services/compare/2.15.0...2.16.0 Commits https://github.com/quarkiverse/quarkus-amazon-services/commit/9c8ff8f591d57dbd58a557b205a096c069029d9e;>9c8ff8f [maven-release-plugin] prepare release 2.16.0 https://github.com/quarkiverse/quarkus-amazon-services/commit/73690151215620c83938e3a39612b93a031602fb;>7369015 Update the latest release version 2.16.0 in documentation https://github.com/quarkiverse/quarkus-amazon-services/commit/e89b60a04bc4345f6ac1434114f3d1907f9212aa;>e89b60a chore: release 2.16.0 (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1278;>#1278) https://github.com/quarkiverse/quarkus-amazon-services/commit/d23682ce24cdd29206614a77c5faed6afbf3a090;>d23682c build(deps): bump software.amazon.awssdk:bom from 2.25.44 to 2.25.60 (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1277;>#1277) https://github.com/quarkiverse/quarkus-amazon-services/commit/3cc41b9e6c5c2fa4ceb38826851908ec3d17d158;>3cc41b9 build(deps): bump quarkus.version from 3.10.0 to 3.11.0 (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1274;>#1274) https://github.com/quarkiverse/quarkus-amazon-services/commit/1741a0c9e9c52adefd6d9c49ebfe4fc21a1b5248;>1741a0c --- (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1272;>#1272) https://github.com/quarkiverse/quarkus-amazon-services/commit/e92cdd476a95497dbcfacfd1000fd86cba6939e7;>e92cdd4 docs: fix nav links https://github.com/quarkiverse/quarkus-amazon-services/commit/eb11d6dbb94ae030670e7eadb6d7e6eb631a77c1;>eb11d6d feat: produce trace-enabled Sqs client when telemetry is enabled (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1259;>#1259) https://github.com/quarkiverse/quarkus-amazon-services/commit/4d0175be45e5d241be7ed2d2f2391de253e431a8;>4d0175b docs: add holomekc as a contributor for code (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1253;>#1253) https://github.com/quarkiverse/quarkus-amazon-services/commit/31bda51cd3659ab87e66c5df7a231402cd58d619;>31bda51 fix: use correct localstack service to get sqs endpoint (https://redirect.github.com/quarkiverse/quarkus-amazon-services/issues/1252;>#1252) Additional commits viewable in https://github.com/quarkiverse/quarkus-amazon-services/compare/2.15.0...2.16.0;>compare view [![Dependabot compatibility
Re: [I] Kamelets versioning or Kamelets Catalog definition [camel-k]
Exether commented on issue #4395: URL: https://github.com/apache/camel-k/issues/4395#issuecomment-2133994280 We definitely thought about this option (renaming kamelets in case of non compatible change), but it quickly seemed unpractical for the following reasons: Kamelet management: - It can be difficult to evaluate if a change needs to create a new version. - In case of a jar changes, several kamelets could require a name change. - This leads to a lot of duplication as we also need to keep the previous kamelets. - It will be difficult to tell if an old kamelet can be removed to keep the overall number low. Routes and config management: - It requires all routes using this kamelet to be updated to use the new one. - It requires to change all the property names for this kamelet in all deployments. - There would be a risk to have several versions of the same library if we freeze older kamelets versions dependencies. -- 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 dependabot/maven/aws-lambda/camel-quarkus-main/maven-78e14a790e created (now 90ab2f0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-lambda/camel-quarkus-main/maven-78e14a790e in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git at 90ab2f0 Bump the maven group across 21 directories with 4 updates No new revisions were added by this update.
[PR] Bump the maven group across 21 directories with 4 updates [camel-quarkus-examples]
dependabot[bot] opened a new pull request, #220: URL: https://github.com/apache/camel-quarkus-examples/pull/220 Bumps the maven group with 1 update in the /aws-lambda directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /cluster-leader-election directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /cxf-soap directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /file-bindy-ftp directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /file-split-log-xml directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /health directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /http-log directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jdbc-datasource directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jms-jpa directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jpa-idempotent-repository directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /jta-jpa directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /kafka directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /kamelet-chucknorris directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 2 updates in the /message-bridge directory: net.revelc.code:impsort-maven-plugin and [org.assertj:assertj-core](https://github.com/assertj/assertj). Bumps the maven group with 1 update in the /observability directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /platform-http-security-keycloak directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /rest-json directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /timer-log directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 3 updates in the /timer-log-kotlin directory: net.revelc.code:impsort-maven-plugin, org.jetbrains.kotlin:kotlin-maven-allopen and org.jetbrains.kotlin:kotlin-maven-plugin. Bumps the maven group with 1 update in the /timer-log-main directory: net.revelc.code:impsort-maven-plugin. Bumps the maven group with 1 update in the /vertx-websocket-chat directory: net.revelc.code:impsort-maven-plugin. Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `net.revelc.code:impsort-maven-plugin` from 1.9.0 to 1.10.0 Updates `org.assertj:assertj-core` from 3.25.3 to 3.26.0 Release notes Sourced from https://github.com/assertj/assertj/releases;>org.assertj:assertj-core's releases. v.3.26.0 :boom: Breaking Changes Core Delegate OptionalDouble value comparison to Double.compare in hasValue assertion https://redirect.github.com/assertj/assertj/issues/3411;>#3411 This fixes the comparison of NaN values which wasn't working the way the hasValue Javadoc describes. The previous behavior can be obtained with getAsDouble: assertThat(OptionalDouble.of(Double.NaN).getAsDouble()).isSameAs(Double.NaN); :no_entry_sign: Deprecated Core Deprecate ObjectAssertFactory in favor of Assertions.assertThat(Object) Deprecate AssertionErrorFactory in favor of AssertionErrorCreator Deprecate catchThrowableOfType(ThrowingCallable, Class) in favor of catchThrowableOfType(Class, ThrowingCallable) https://redirect.github.com/assertj/assertj/issues/2823;>#2823 Deprecate assertThat(Iterable, AssertFactory), assertThat(Iterable, Class) and their respective then variants https://redirect.github.com/assertj/assertj/issues/3453;>#3453 :sparkles: New Features Core Support multiple AfterAssertionErrorCollected callbacks
Re: [I] Integration reporting error before the progress deadline timeout expires [camel-k]
lsergio commented on issue #5552: URL: https://github.com/apache/camel-k/issues/5552#issuecomment-2133923396 After the new node is created, the Integration status changes to Ready = true. The impact on my side is that the Error triggers the wrong workflow on my monitoring application. -- 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 saxon fix [camel-karaf]
ozgurkisir-qlik commented on PR #298: URL: https://github.com/apache/camel-karaf/pull/298#issuecomment-2133916891 ### How to test camel-saxon? Install camel-blueprint and camel-saxon features `feature:install camel-blueprint` `feature:install camel-saxon` Unzip and copy camel-saxon-blueprint , message1.xml and myTransform.xq files under /deploy folder of karaf. Observe the logs , which transforms message1.xml to another format regarding myTransform.xq file. `log:tail` [camel-xquery-blueprint.zip](https://github.com/apache/camel-karaf/files/15459036/camel-xquery-blueprint.zip) -- 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 saxon fix [camel-karaf]
ozgurkisir-qlik opened a new pull request, #298: URL: https://github.com/apache/camel-karaf/pull/298 camel-saxon - missing dependecy is added -- 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] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616244242
##
features/src/main/feature/camel-features.xml:
##
@@ -1089,23 +1089,23 @@
mvn:com.google.api-client/google-api-client/${google-api-client-version}
mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}
mvn:org.threeten/threetenbp/1.6.8
-wrap:mvn:com.google.api/api-common/2.28.0
-wrap:mvn:com.google.api/gax/2.45.0
-wrap:mvn:com.google.api/gax-httpjson/2.45.0
-wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0
-wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}
-wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-auth-library-oauth2-http-version}
-wrap:mvn:com.google.cloud/google-cloud-core/2.35.0
-wrap:mvn:com.google.cloud/google-cloud-core-http/2.35.0
-wrap:mvn:com.google.cloud/google-cloud-storage/2.35.0
-wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
-wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}
-wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
-wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
-wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
-wrap:mvn:io.grpc/grpc-api/${grpc-version}
-wrap:mvn:io.opencensus/opencensus-api/0.31.1
-wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+wrap:mvn:com.google.api/api-common/2.28.0$Bundle-Version=2.28.0
+wrap:mvn:com.google.api/gax/2.45.0$Bundle-Version=2.45.0
+wrap:mvn:com.google.api/gax-httpjson/2.45.0$Bundle-Version=2.45.0
+wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0$Bundle-Version=0.0.0.v1-rev20240209-2_0_0
Review Comment:
yes, I've tested it in karaf 4.4.6 and it's supported
--
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] Integration reporting timeout error before the timeout expires [camel-k]
lsergio opened a new issue, #5552: URL: https://github.com/apache/camel-k/issues/5552 ### What happened? I have Camel-K running on an EKS cluster with autoscaling groups scaling up to 20 nodes. At the moment this was reported, 8 nodes were running, and I created a new Integration object. There was no room for a new pod in the running nodes, so Kubernetes spawned a new one. However, the Integration reported as Error immediately, even before the Deployment progress deadline expired. This is the Integration report: ``` - lastTransitionTime: "2024-05-27T17:42:16Z" lastUpdateTime: "2024-05-27T17:42:16Z" message: '0/8 nodes are available: 1 node(s) were unschedulable, 7 Insufficient cpu. preemption: 0/8 nodes are available: 1 Preemption is not helpful for scheduling, 7 No preemption victims found for incoming pod..' reason: Error status: "False" type: Ready ``` And this is the Deployment status: ``` status: conditions: - lastTransitionTime: "2024-05-27T17:42:16Z" lastUpdateTime: "2024-05-27T17:42:16Z" message: Deployment does not have minimum availability. reason: MinimumReplicasUnavailable status: "False" type: Available - lastTransitionTime: "2024-05-27T17:42:16Z" lastUpdateTime: "2024-05-27T17:42:16Z" message: ReplicaSet "deploy-4f2a232d-fec3-42ad-b437-b5c47fcf1804-copy-5dbc986949" is progressing. reason: ReplicaSetUpdated status: "True" type: Progressing ``` As we can see, the deployment is still progressing. I expected the status to be Error only after the progress deadline expired. ### Steps to reproduce _No response_ ### Relevant log output _No response_ ### Camel K version 2.2.0 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616299275
##
features/src/main/feature/camel-features.xml:
##
@@ -827,35 +827,35 @@
wrap
jackson
http-client
-wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}
-wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1
+wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}
+wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1
+wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1
Review Comment:
Done
##
features/src/main/feature/camel-features.xml:
##
@@ -827,35 +827,35 @@
wrap
jackson
http-client
-wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}
-wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1
+wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}
+wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1
+wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1
+wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1$Bundle-Version=8.12.1
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
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r161629
##
features/src/main/feature/camel-features.xml:
##
@@ -827,35 +827,35 @@
wrap
jackson
http-client
-wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}
-wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1
+wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}
+wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1
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
Re: [PR] (chores) ci: fix vulnerability by using directly referenced action [camel]
essobedo commented on PR #14252: URL: https://github.com/apache/camel/pull/14252#issuecomment-2133842462 /component-test bean -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karaf) branch 276/integration-test-framework updated (dc7e303b -> d3adefb0)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 276/integration-test-framework in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard dc7e303b Move camel-seda and camel-file into the same class discard 3784abdd Add multi camel context support discard edbc8413 Allow to provide additional required features using the annotation discard a82ca87d Use a common annotation for static hints discard f279e7b9 Add support of integration tests with blueprint discard 8bfd0360 Move camel-seda and camel-file into same module discard 00890d8c Add the CamelRouteSupplier discard d2b28542 Ref #276: Propose an integration test framework discard e3c28a67 Add camel jetty integration test (#276) add 5dbfcfac Upgrade to Camel 4.6 (#296) add 0c4618aa Add camel jetty integration test (#276) add 5770c45d Ref #276: Propose an integration test framework add 5caddc1e Add the CamelRouteSupplier add f012a78a Move camel-seda and camel-file into same module add 0ceaa535 Add support of integration tests with blueprint add 5c2f4b1a Use a common annotation for static hints add d074eb27 Allow to provide additional required features using the annotation add 3b347718 Add multi camel context support add bb9b0fd2 Move camel-seda and camel-file into the same class add d3adefb0 Adapt to Camel 4.6 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 (dc7e303b) \ N -- N -- N refs/heads/276/integration-test-framework (d3adefb0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: components/camel-activemq/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-arangodb/pom.xml | 2 +- components/camel-as2/pom.xml | 2 +- components/camel-asn1/pom.xml | 2 +- components/camel-asterisk/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-attachments/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- components/camel-aws/camel-aws-cloudtrail/pom.xml | 2 +- components/camel-aws/camel-aws-config/pom.xml | 2 +- .../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +- components/camel-aws/camel-aws-xray/pom.xml| 2 +- components/camel-aws/camel-aws2-athena/pom.xml | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- components/camel-aws/camel-aws2-ddb/pom.xml| 2 +- components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- components/camel-aws/camel-aws2-eks/pom.xml| 2 +- .../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +- components/camel-aws/camel-aws2-iam/pom.xml| 2 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +- components/camel-aws/camel-aws2-kms/pom.xml| 2 +- components/camel-aws/camel-aws2-lambda/pom.xml | 2 +- components/camel-aws/camel-aws2-mq/pom.xml | 2 +- components/camel-aws/camel-aws2-msk/pom.xml| 2 +- components/camel-aws/camel-aws2-redshift/pom.xml | 2 +- components/camel-aws/camel-aws2-s3/pom.xml | 2 +- components/camel-aws/camel-aws2-ses/pom.xml| 2 +- components/camel-aws/camel-aws2-sns/pom.xml| 2 +- components/camel-aws/camel-aws2-sqs/pom.xml| 2 +- .../camel-aws/camel-aws2-step-functions/pom.xml| 2 +- components/camel-aws/camel-aws2-sts/pom.xml| 2 +- components/camel-aws/camel-aws2-timestream/pom.xml | 2 +- components/camel-aws/camel-aws2-translate/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 2 +- components/camel-azure/camel-azure-files/pom.xml | 2 +- .../camel-azure/camel-azure-key-vault/pom.xml | 2 +- .../camel-azure-schema-registry/pom.xml| 2 +- .../camel-azure/camel-azure-servicebus/pom.xml | 2 +- .../camel-azure/camel-azure-storage-blob/pom.xml | 2 +- .../camel-azure-storage-datalake/pom.xml | 2 +- .../camel-azure/camel-azure-storage-queue/pom.xml
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616262862
##
features/src/main/feature/camel-features.xml:
##
@@ -756,10 +756,10 @@
camel-core
-wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}
+wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}$Bundle-Version=2.5.2.jakarta4
Review Comment:
The version coming from the version placeholder doesn't work
`2.5.2-jakarta4`
```
karaf@root()> feature:install camel-datasonnet
org.osgi.framework.BundleException: Could not create bundle object.
at org.apache.felix.framework.Felix.installBundle(Felix.java:3339)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundle0(BundleIdBasedRegion.java:120)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundleAtLocation(BundleIdBasedRegion.java:100)
at
org.apache.karaf.features.internal.service.BundleInstallSupportImpl.installBundle(BundleInstallSupportImpl.java:135)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.installBundle(FeaturesServiceImpl.java:1145)
at
org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:906)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.doProvision(FeaturesServiceImpl.java:1069)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.lambda$doProvisionInThread$13(FeaturesServiceImpl.java:1004)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
Caused by: java.lang.IllegalArgumentException: invalid version
"2.5.2-jakarta4": non-numeric "2-jakarta4"
at org.osgi.framework.Version.parseInt(Version.java:169)
at org.osgi.framework.Version.(Version.java:134)
at org.osgi.framework.Version.valueOf(Version.java:255)
at org.osgi.framework.Version.parseVersion(Version.java:226)
at
org.apache.felix.framework.util.manifestparser.ManifestParser.(ManifestParser.java:129)
at
org.apache.felix.framework.BundleRevisionImpl.(BundleRevisionImpl.java:117)
at
org.apache.felix.framework.BundleImpl.createRevision(BundleImpl.java:1290)
at org.apache.felix.framework.BundleImpl.(BundleImpl.java:114)
at org.apache.felix.framework.Felix.installBundle(Felix.java:3287)
... 12 more
Caused by: java.lang.NumberFormatException: For input string: "2-jakarta4"
at
java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:67)
at java.base/java.lang.Integer.parseInt(Integer.java:668)
at java.base/java.lang.Integer.parseInt(Integer.java:786)
at org.osgi.framework.Version.parseInt(Version.java:167)
... 20 more
```
--
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] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616263380
##
features/src/main/feature/camel-features.xml:
##
@@ -2332,8 +2332,8 @@
camel-core
-wrap:mvn:com.prowidesoftware/pw-swift-core/SRU2023-10.1.13
-wrap:mvn:com.prowidesoftware/pw-iso20022/${prowide-version}
+wrap:mvn:com.prowidesoftware/pw-swift-core/SRU2023-10.1.13$Bundle-Version=0.0.0.SRU2023-10_1_13
+wrap:mvn:com.prowidesoftware/pw-iso20022/${prowide-version}$Bundle-Version=0.0.0.SRU2023-10_1_4
Review Comment:
The version coming from the version placeholder doesn't work
`SRU2023-10.1.4`
```
karaf@root()> feature:install camel-swift
org.osgi.framework.BundleException: Could not create bundle object.
at org.apache.felix.framework.Felix.installBundle(Felix.java:3339)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundle0(BundleIdBasedRegion.java:120)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundleAtLocation(BundleIdBasedRegion.java:100)
at
org.apache.karaf.features.internal.service.BundleInstallSupportImpl.installBundle(BundleInstallSupportImpl.java:135)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.installBundle(FeaturesServiceImpl.java:1145)
at
org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:906)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.doProvision(FeaturesServiceImpl.java:1069)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.lambda$doProvisionInThread$13(FeaturesServiceImpl.java:1004)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
Caused by: java.lang.IllegalArgumentException: invalid version
"SRU2023-10.1.4": non-numeric "SRU2023-10"
at org.osgi.framework.Version.parseInt(Version.java:169)
at org.osgi.framework.Version.(Version.java:126)
at org.osgi.framework.Version.valueOf(Version.java:255)
at org.osgi.framework.Version.parseVersion(Version.java:226)
at
org.apache.felix.framework.util.manifestparser.ManifestParser.(ManifestParser.java:129)
at
org.apache.felix.framework.BundleRevisionImpl.(BundleRevisionImpl.java:117)
at
org.apache.felix.framework.BundleImpl.createRevision(BundleImpl.java:1290)
at org.apache.felix.framework.BundleImpl.(BundleImpl.java:114)
at org.apache.felix.framework.Felix.installBundle(Felix.java:3287)
... 12 more
Caused by: java.lang.NumberFormatException: For input string: "SRU2023-10"
at
java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:67)
at java.base/java.lang.Integer.parseInt(Integer.java:668)
at java.base/java.lang.Integer.parseInt(Integer.java:786)
at org.osgi.framework.Version.parseInt(Version.java:167)
... 20 more
```
##
features/src/main/feature/camel-features.xml:
##
@@ -2539,13 +2539,13 @@
mvn:org.jxmpp/jxmpp-jid/0.6.4
mvn:org.jxmpp/jxmpp-core/0.6.4
mvn:org.jxmpp/jxmpp-util-cache/0.6.4
-wrap:mvn:org.minidns/minidns-core/${minidns-version}
-wrap:mvn:xpp3/xpp3/${xpp3-version}
+wrap:mvn:org.minidns/minidns-core/${minidns-version}$Bundle-Version=${minidns-version}
+wrap:mvn:xpp3/xpp3/${xpp3-version}$Bundle-Version=1.1.0.4c
Review Comment:
The version coming from the version placeholder doesn't work
`1.1.4c`
```
karaf@root()> feature:install camel-xmpp
org.osgi.framework.BundleException: Could not create bundle object.
at org.apache.felix.framework.Felix.installBundle(Felix.java:3339)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundle0(BundleIdBasedRegion.java:120)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundleAtLocation(BundleIdBasedRegion.java:100)
at
org.apache.karaf.features.internal.service.BundleInstallSupportImpl.installBundle(BundleInstallSupportImpl.java:135)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.installBundle(FeaturesServiceImpl.java:1145)
at
org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:906)
at
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616263265
##
features/src/main/feature/camel-features.xml:
##
@@ -1414,9 +1414,9 @@
camel-core
jackson
-wrap:mvn:net.thisptr/jackson-jq/${jackson-jq-version}$overwrite=mergeExport-Package=net*;version=${jackson-jq-version}
-wrap:mvn:org.jruby.jcodings/jcodings/1.0.58
-wrap:mvn:org.jruby.joni/joni/2.2.1
+wrap:mvn:net.thisptr/jackson-jq/${jackson-jq-version}$overwrite=mergeBundle-Version=1.0.0.preview_20240207Export-Package=net*;version=${jackson-jq-version}
Review Comment:
The version coming from the version placeholder doesn't work
`1.0.0-preview.20240207`
```
karaf@root()> feature:install camel-jq
org.osgi.framework.BundleException: Could not create bundle object.
at org.apache.felix.framework.Felix.installBundle(Felix.java:3339)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundle0(BundleIdBasedRegion.java:120)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundleAtLocation(BundleIdBasedRegion.java:100)
at
org.apache.karaf.features.internal.service.BundleInstallSupportImpl.installBundle(BundleInstallSupportImpl.java:135)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.installBundle(FeaturesServiceImpl.java:1145)
at
org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:906)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.doProvision(FeaturesServiceImpl.java:1069)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.lambda$doProvisionInThread$13(FeaturesServiceImpl.java:1004)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
Caused by: java.lang.IllegalArgumentException: invalid version
"1.0.0-preview.20240207": non-numeric "0-preview"
at org.osgi.framework.Version.parseInt(Version.java:169)
at org.osgi.framework.Version.(Version.java:134)
at org.osgi.framework.Version.valueOf(Version.java:255)
at org.osgi.framework.Version.parseVersion(Version.java:226)
at
org.apache.felix.framework.util.manifestparser.ManifestParser.(ManifestParser.java:129)
at
org.apache.felix.framework.BundleRevisionImpl.(BundleRevisionImpl.java:117)
at
org.apache.felix.framework.BundleImpl.createRevision(BundleImpl.java:1290)
at org.apache.felix.framework.BundleImpl.(BundleImpl.java:114)
at org.apache.felix.framework.Felix.installBundle(Felix.java:3287)
... 12 more
Caused by: java.lang.NumberFormatException: For input string: "0-preview"
at
java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:67)
at java.base/java.lang.Integer.parseInt(Integer.java:668)
at java.base/java.lang.Integer.parseInt(Integer.java:786)
at org.osgi.framework.Version.parseInt(Version.java:167)
... 20 more
```
##
features/src/main/feature/camel-features.xml:
##
@@ -1822,30 +1822,30 @@
jackson
guava
-wrap:mvn:com.github.openstack4j.core/openstack4j-core/${openstack4j-version}$overwrite=mergeImport-Package=com.fasterxml*,com.github*,javax*,org*,com.google*;version='[33,34)'
-wrap:mvn:com.github.openstack4j.core.connectors/openstack4j-okhttp/${openstack4j-version}$overwrite=mergeImport-Package=com.fasterxml*,okhttp3*,javax*,org*;resolution:=optional,com.google*;version='[33,34)'
-wrap:mvn:com.github.java-json-tools/json-patch/${json-patch-version}$overwrite=mergeExport-Package=com.github.fge*;version=${json-patch-version}Import-Package=com.fasterxml*,com.github*;javax*
-wrap:mvn:com.github.java-json-tools/jackson-coreutils/2.0$overwrite=mergeExport-Package=com.github.fge*;version=2.0Import-Package=com.fasterxml*,com.github*;javax*
+wrap:mvn:com.github.openstack4j.core/openstack4j-core/${openstack4j-version}$overwrite=mergeBundle-Version=${openstack4j-version}Import-Package=com.fasterxml*,com.github*,javax*,org*,com.google*;version='[33,34)'
+wrap:mvn:com.github.openstack4j.core.connectors/openstack4j-okhttp/${openstack4j-version}$overwrite=mergeBundle-Version=${openstack4j-version}Import-Package=com.fasterxml*,okhttp3*,javax*,org*;resolution:=optional,com.google*;version='[33,34)'
+
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616262862
##
features/src/main/feature/camel-features.xml:
##
@@ -756,10 +756,10 @@
camel-core
-wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}
+wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}$Bundle-Version=2.5.2.jakarta4
Review Comment:
Yes
`2.5.2-jakarta4`
```
karaf@root()> feature:install camel-datasonnet
org.osgi.framework.BundleException: Could not create bundle object.
at org.apache.felix.framework.Felix.installBundle(Felix.java:3339)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundle0(BundleIdBasedRegion.java:120)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundleAtLocation(BundleIdBasedRegion.java:100)
at
org.apache.karaf.features.internal.service.BundleInstallSupportImpl.installBundle(BundleInstallSupportImpl.java:135)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.installBundle(FeaturesServiceImpl.java:1145)
at
org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:906)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.doProvision(FeaturesServiceImpl.java:1069)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.lambda$doProvisionInThread$13(FeaturesServiceImpl.java:1004)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
Caused by: java.lang.IllegalArgumentException: invalid version
"2.5.2-jakarta4": non-numeric "2-jakarta4"
at org.osgi.framework.Version.parseInt(Version.java:169)
at org.osgi.framework.Version.(Version.java:134)
at org.osgi.framework.Version.valueOf(Version.java:255)
at org.osgi.framework.Version.parseVersion(Version.java:226)
at
org.apache.felix.framework.util.manifestparser.ManifestParser.(ManifestParser.java:129)
at
org.apache.felix.framework.BundleRevisionImpl.(BundleRevisionImpl.java:117)
at
org.apache.felix.framework.BundleImpl.createRevision(BundleImpl.java:1290)
at org.apache.felix.framework.BundleImpl.(BundleImpl.java:114)
at org.apache.felix.framework.Felix.installBundle(Felix.java:3287)
... 12 more
Caused by: java.lang.NumberFormatException: For input string: "2-jakarta4"
at
java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:67)
at java.base/java.lang.Integer.parseInt(Integer.java:668)
at java.base/java.lang.Integer.parseInt(Integer.java:786)
at org.osgi.framework.Version.parseInt(Version.java:167)
... 20 more
```
--
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 essobedo/fix-rce-in-comment-action updated (e9aa1728803 -> b4612b6613f)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action in repository https://gitbox.apache.org/repos/asf/camel.git discard e9aa1728803 (chores) ci: fix vulnerability by using directly referenced action add b4612b6613f (chores) ci: fix vulnerability by using directly referenced action 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 (e9aa1728803) \ N -- N -- N refs/heads/essobedo/fix-rce-in-comment-action (b4612b6613f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/actions/component-test/action.yaml| 4 ++-- .github/actions/create-or-update-comment | 1 - components/camel-ignite/.gitignore => .gitmodules | 0 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 16 .github/actions/create-or-update-comment copy components/camel-ignite/.gitignore => .gitmodules (100%)
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616251067
##
features/src/main/feature/camel-features.xml:
##
@@ -540,28 +540,28 @@
camel-cloudevents
azure
-wrap:mvn:com.azure/azure-core-amqp/2.9.1
-wrap:mvn:com.azure/azure-messaging-servicebus/7.15.1
+wrap:mvn:com.azure/azure-core-amqp/2.9.1$Bundle-Version=2.9.1
+wrap:mvn:com.azure/azure-messaging-servicebus/7.15.1$Bundle-Version=7.15.1
mvn:org.apache.camel.karaf/camel-azure-servicebus/${project.version}
camel-cloudevents
azure-storage
-wrap:mvn:com.azure/azure-storage-blob/12.25.2
-wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}
+wrap:mvn:com.azure/azure-storage-blob/12.25.2$Bundle-Version=12.25.2
+wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}$Bundle-Version=12.0.0.beta_19
Review Comment:
The version coming from the version placeholder doesn't work
`12.0.0-beta.19`
```
karaf@root()> feature:install camel-azure-storage-blob
org.osgi.framework.BundleException: Could not create bundle object.
at org.apache.felix.framework.Felix.installBundle(Felix.java:3339)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundle0(BundleIdBasedRegion.java:120)
at
org.eclipse.equinox.internal.region.BundleIdBasedRegion.installBundleAtLocation(BundleIdBasedRegion.java:100)
at
org.apache.karaf.features.internal.service.BundleInstallSupportImpl.installBundle(BundleInstallSupportImpl.java:135)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.installBundle(FeaturesServiceImpl.java:1145)
at
org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:906)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.doProvision(FeaturesServiceImpl.java:1069)
at
org.apache.karaf.features.internal.service.FeaturesServiceImpl.lambda$doProvisionInThread$13(FeaturesServiceImpl.java:1004)
at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
Caused by: java.lang.IllegalArgumentException: invalid version
"12.0.0-beta.19": non-numeric "0-beta"
at org.osgi.framework.Version.parseInt(Version.java:169)
at org.osgi.framework.Version.(Version.java:134)
at org.osgi.framework.Version.valueOf(Version.java:255)
at org.osgi.framework.Version.parseVersion(Version.java:226)
at
org.apache.felix.framework.util.manifestparser.ManifestParser.(ManifestParser.java:129)
at
org.apache.felix.framework.BundleRevisionImpl.(BundleRevisionImpl.java:117)
at
org.apache.felix.framework.BundleImpl.createRevision(BundleImpl.java:1290)
at org.apache.felix.framework.BundleImpl.(BundleImpl.java:114)
at org.apache.felix.framework.Felix.installBundle(Felix.java:3287)
... 12 more
Caused by: java.lang.NumberFormatException: For input string: "0-beta"
at
java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:67)
at java.base/java.lang.Integer.parseInt(Integer.java:668)
at java.base/java.lang.Integer.parseInt(Integer.java:786)
at org.osgi.framework.Version.parseInt(Version.java:167)
... 20 more
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[PR] (chores) ci: fix vulnerability by using directly referenced action [camel]
essobedo opened a new pull request, #14252: URL: https://github.com/apache/camel/pull/14252 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616244242
##
features/src/main/feature/camel-features.xml:
##
@@ -1089,23 +1089,23 @@
mvn:com.google.api-client/google-api-client/${google-api-client-version}
mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}
mvn:org.threeten/threetenbp/1.6.8
-wrap:mvn:com.google.api/api-common/2.28.0
-wrap:mvn:com.google.api/gax/2.45.0
-wrap:mvn:com.google.api/gax-httpjson/2.45.0
-wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0
-wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}
-wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-auth-library-oauth2-http-version}
-wrap:mvn:com.google.cloud/google-cloud-core/2.35.0
-wrap:mvn:com.google.cloud/google-cloud-core-http/2.35.0
-wrap:mvn:com.google.cloud/google-cloud-storage/2.35.0
-wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
-wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}
-wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
-wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
-wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
-wrap:mvn:io.grpc/grpc-api/${grpc-version}
-wrap:mvn:io.opencensus/opencensus-api/0.31.1
-wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+wrap:mvn:com.google.api/api-common/2.28.0$Bundle-Version=2.28.0
+wrap:mvn:com.google.api/gax/2.45.0$Bundle-Version=2.45.0
+wrap:mvn:com.google.api/gax-httpjson/2.45.0$Bundle-Version=2.45.0
+wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0$Bundle-Version=0.0.0.v1-rev20240209-2_0_0
Review Comment:
yes, I've tested it and it's supported
--
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: (chores) ci: fix vulnerability by using directly referenced action
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch essobedo/fix-rce-in-comment-action
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e9aa1728803565f53b09f5036b8d25a0d47877f2
Author: Nicolas Filotto
AuthorDate: Mon May 27 17:38:40 2024 +0200
(chores) ci: fix vulnerability by using directly referenced action
---
.github/actions/component-test/action.yaml | 4 ++--
.github/workflows/pr-comment.yml | 2 +-
.gitmodules| 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index 4c1b456d1d5..ddbd53b4bb6 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -65,7 +65,7 @@ runs:
path: tests.log
- name: Success comment
if: success()
- uses: ./.github/actions/create-or-update-comment
+ uses: peter-evans/create-or-update-comment@v3
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
@@ -75,7 +75,7 @@ runs:
**Result** :white_check_mark: The tests passed successfully
- name: Failure comment
if: failure()
- uses: ./.github/actions/create-or-update-comment
+ uses: peter-evans/create-or-update-comment@v3
with:
comment-id: ${{ inputs.comment-id }}
edit-mode: replace
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index a1fbb7e743f..4c41152a19e 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -47,7 +47,7 @@ jobs:
with:
ref: ${{ env.pr_sha }}
submodules: recursive
- - uses: ./.github/actions/create-or-update-comment
+ - uses: peter-evans/create-or-update-comment@v3
with:
issue-number: ${{ github.event.issue.number }}
body: |
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e10cc9959c1..000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".github/actions/create-or-update-comment"]
- path = .github/actions/create-or-update-comment
- url = https://github.com/peter-evans/create-or-update-comment.git
(camel) branch essobedo/fix-rce-in-comment-action created (now e9aa1728803)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch essobedo/fix-rce-in-comment-action in repository https://gitbox.apache.org/repos/asf/camel.git at e9aa1728803 (chores) ci: fix vulnerability by using directly referenced action This branch includes the following new commits: new e9aa1728803 (chores) ci: fix vulnerability by using directly referenced action 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 Bundle-Version to all wrapped bundles [camel-karaf]
essobedo commented on PR #297: URL: https://github.com/apache/camel-karaf/pull/297#issuecomment-2133694302 It is merged now, could you please rebase and fix the conflict -- 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] Add Bundle-Version to all wrapped bundles [camel-karaf]
essobedo commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616171568
##
features/src/main/feature/camel-features.xml:
##
@@ -540,28 +540,28 @@
camel-cloudevents
azure
-wrap:mvn:com.azure/azure-core-amqp/2.9.1
-wrap:mvn:com.azure/azure-messaging-servicebus/7.15.1
+wrap:mvn:com.azure/azure-core-amqp/2.9.1$Bundle-Version=2.9.1
+wrap:mvn:com.azure/azure-messaging-servicebus/7.15.1$Bundle-Version=7.15.1
mvn:org.apache.camel.karaf/camel-azure-servicebus/${project.version}
camel-cloudevents
azure-storage
-wrap:mvn:com.azure/azure-storage-blob/12.25.2
-wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}
+wrap:mvn:com.azure/azure-storage-blob/12.25.2$Bundle-Version=12.25.2
+wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}$Bundle-Version=12.0.0.beta_19
Review Comment:
Why don't you use the maven property to set the version?
##
features/src/main/feature/camel-features.xml:
##
@@ -827,35 +827,35 @@
wrap
jackson
http-client
-wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}
-wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1
-wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1
+wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}
+wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1
+wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1
+wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1$Bundle-Version=8.12.1
Review Comment:
we are supposed to use `elasticsearch-java-client-sniffer-version`
##
features/src/main/feature/camel-features.xml:
##
@@ -1089,23 +1089,23 @@
mvn:com.google.api-client/google-api-client/${google-api-client-version}
mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}
mvn:org.threeten/threetenbp/1.6.8
-wrap:mvn:com.google.api/api-common/2.28.0
-wrap:mvn:com.google.api/gax/2.45.0
-wrap:mvn:com.google.api/gax-httpjson/2.45.0
-wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0
-wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}
-wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-auth-library-oauth2-http-version}
-wrap:mvn:com.google.cloud/google-cloud-core/2.35.0
-wrap:mvn:com.google.cloud/google-cloud-core-http/2.35.0
-wrap:mvn:com.google.cloud/google-cloud-storage/2.35.0
-wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
-wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}
-wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}
-wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}
-wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=mergeImport-Package=com.google.common*;version="[33,34)",*
-wrap:mvn:io.grpc/grpc-api/${grpc-version}
-wrap:mvn:io.opencensus/opencensus-api/0.31.1
-wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1
+wrap:mvn:com.google.api/api-common/2.28.0$Bundle-Version=2.28.0
+wrap:mvn:com.google.api/gax/2.45.0$Bundle-Version=2.45.0
+wrap:mvn:com.google.api/gax-httpjson/2.45.0$Bundle-Version=2.45.0
+wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0$Bundle-Version=0.0.0.v1-rev20240209-2_0_0
Review Comment:
Is-this format supported?
##
features/src/main/feature/camel-features.xml:
##
@@ -756,10 +756,10 @@
camel-core
-wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}
+wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}$Bundle-Version=2.5.2.jakarta4
Review Comment:
ditto. Is the version format compatible? If not let's avoid setting a version
##
features/src/main/feature/camel-features.xml:
##
@@ -827,35 +827,35 @@
wrap
jackson
http-client
-wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}
-wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1
-
(camel-quarkus) 07/11: Handle DebuggerJmxConnectorService being present in the camel core
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4fce4a21b99bfa25a8be5667570b1b22df471e30
Author: James Netherton
AuthorDate: Tue May 21 14:45:47 2024 +0100
Handle DebuggerJmxConnectorService being present in the camel core
---
.../core/deployment/CamelDebugProcessor.java | 46 +++
.../DebuggerJmxConnectorServiceSubstitutions.java | 67 ++
.../camel/quarkus/main/CoreMainResource.java | 31 ++
.../main/src/main/resources/application.properties | 2 +
.../apache/camel/quarkus/main/CoreMainTest.java| 18 ++
.../quarkus/component/management/it/Routes.java| 2 +
.../src/main/resources/application.properties | 3 +
.../component/management/it/ManagementTest.java| 14 +
8 files changed, 183 insertions(+)
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java
new file mode 100644
index 00..5ee593c439
--- /dev/null
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.core.deployment;
+
+import java.util.function.BooleanSupplier;
+import java.util.stream.StreamSupport;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.BuildSteps;
+import io.quarkus.deployment.builditem.AllowJNDIBuildItem;
+import org.eclipse.microprofile.config.ConfigProvider;
+
+/**
+ * Build steps relating to camel debugging support. This is primarily required
due to camel-main
+ * having the capability to enable debugging features that live in the Camel
core such as the
+ * DebuggerJmxConnectorService
+ */
+@BuildSteps(onlyIf = CamelDebugProcessor.CamelDebugConfigurationPresent.class)
+public class CamelDebugProcessor {
+@BuildStep
+AllowJNDIBuildItem allowJNDI() {
+return new AllowJNDIBuildItem();
+}
+
+static final class CamelDebugConfigurationPresent implements
BooleanSupplier {
+@Override
+public boolean getAsBoolean() {
+return
StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(),
false)
+.anyMatch(key -> key.startsWith("camel.debug"));
+}
+}
+}
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java
new file mode 100644
index 00..866bcb7f89
--- /dev/null
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.core.graal;
+
+import java.io.IOException;
+import java.util.function.BooleanSupplier;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
+import
(camel-quarkus) 08/11: Generated files
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit b0eb1ca2819fa4ec7d2adf3eead670a2c1497331 Author: JiriOndrusek AuthorDate: Thu May 23 08:54:34 2024 +0200 Generated files --- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 45f3116752..6fe4c3102d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7047,7 +7047,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7230,7 +7230,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1a76787031..7313b9b230 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6966,7 +6966,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7134,7 +7134,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk 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 2e3a833b7f..563cf53bba 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6966,7 +6966,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7134,7 +7134,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk
(camel-quarkus) 06/11: Generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit e3af352cc4984155fa69036e3d08a1a8fc6ae6d1 Author: JiriOndrusek AuthorDate: Tue May 21 09:25:54 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++-- .../bom/src/main/generated/flattened-reduced-pom.xml | 20 ++-- .../main/generated/flattened-reduced-verbose-pom.xml | 20 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index cb77f48158..45f3116752 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6226,7 +6226,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6245,12 +6245,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6265,22 +6265,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6725,17 +6725,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d1ea676d78..1a76787031 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6226,7 +6226,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6245,12 +6245,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6265,22 +6265,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6685,17 +6685,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 742a1e4460..2e3a833b7f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6226,7 +6226,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6245,12 +6245,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6265,22 +6265,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0
(camel-quarkus) 11/11: fixed test-framework/junit5 + generated changes
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit eaac76aeced1b5ce3c22ae23039d34c59284bb05
Author: JiriOndrusek
AuthorDate: Mon May 27 17:17:01 2024 +0200
fixed test-framework/junit5 + generated changes
---
.../pages/reference/extensions/rest-openapi.adoc | 1 +
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../quarkus/test/common/AbstractCallbacksTest.java | 8 --
.../test/common/CallbacksPerTestFalse01Test.java | 3 ---
.../test/common/CallbacksPerTestTrue01Test.java| 3 ---
.../test/junit5/patterns/DebugJUnit5Test.java | 6 +
.../patterns/DebugNoLazyTypeConverterTest.java | 6 +
.../quarkus/test/junit5/patterns/DebugTest.java| 6 +
.../test/junit5/patterns/TestDebugBreakpoint.java | 29 ++
10 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc
b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc
index ca259535e4..e87b100198 100644
--- a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc
@@ -127,6 +127,7 @@ quarkus.native.resources.includes=contract.json
+
[id="extensions-rest-openapi-additional-camel-quarkus-configuration"]
== Additional Camel Quarkus configuration
diff --git
a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 253ef63aa4..96dbe3295d 100644
---
a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++
b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -22,7 +22,7 @@
#
---
name: "Camel ActiveMQ"
-description: "Send messages to (or consume from) Apache ActiveMQ. This
component extends the Camel JMS component"
+description: "Send messages to (or consume from) Apache ActiveMQ 5.x. This
component extends the Camel JMS component"
metadata:
icon-url:
"https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg;
guide:
"https://camel.apache.org/camel-quarkus/latest/reference/extensions/activemq.html;
diff --git
a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 6ecbc7bde8..4b4f84c9ba 100644
---
a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++
b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -30,3 +30,4 @@ metadata:
- "integration"
status:
- "stable"
+ - "deprecated"
\ No newline at end of file
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
index 77c6b64c7f..597ccc7df7 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
+++
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
@@ -39,7 +39,6 @@ import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
import org.apache.camel.util.StopWatch;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport {
@@ -48,7 +47,6 @@ public abstract class AbstractCallbacksTest extends
CamelQuarkusTestSupport {
public enum Callback {
postTearDown,
-doSetup,
preSetup,
postSetup,
contextCreation,
@@ -69,12 +67,6 @@ public abstract class AbstractCallbacksTest extends
CamelQuarkusTestSupport {
this.afterClassTestName = afterClassTestName;
}
-@BeforeEach
-protected void createTmpFiles() throws Exception {
-createTmpFile(testName, Callback.doSetup);
-createTmpFile(afterClassTestName, Callback.doSetup);
-}
-
@Override
protected CamelContext createCamelContext() throws Exception {
createTmpFile(testName, Callback.contextCreation);
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java
index e10d0ce525..591a40eb5c 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java
+++
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java
@@ -39,9
(camel-quarkus) branch camel-main updated (c9f96bf967 -> eaac76aece)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard c9f96bf967 Fix of compilation error in test-framework discard 37ca909d7c Generated poms discard d853a6d490 Generated files discard d31ba7659d Handle DebuggerJmxConnectorService being present in the camel core discard dd9c162962 Generated poms discard 06496ae691 Generated files discard 8f9d78b834 Fixed knative + generated files discard c001f3dccc generated poms discard 0c87dd3ac1 Fixed debug + generated poms discard 337f09e6ee Upgrade Camel to 4.7.0 add e51be75a61 Update license-maven-plugin to 4.5 add 55b35a6f58 Document available configuration methods for the Infinispan extension add 8952f9d0ea Add debugging to test-summary-report action add f4e9d46a6a Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 add 112ff86cce Add test report object debugging to test-summary-report action add 917745414f Migrate from camel.main.debugging to camel.debug config prefix add 95b20582e7 Disabled Crypto tests in FIPS add 3313c0648d Split MicroProfile integration tests into separate modules add e4c3ee10e6 Auto label issues relating to FIPS add 33501630ed Upgrade Quarkus to 3.11.0.CR1 add 7c190913e3 Increase Xmx to 3500m for Validate PR workflow add 901e0beba9 Clean up leftovers from removed non-camel-main based runtime add ffc8c12d34 Use more correct convention with configuring datasource add e46046465c Pin test report action junit2json package version to 3.1.7 as later releases are currently broken add 760152d5a5 Regen SBOM from commit e46046465c80bbea8878cf3ee4b99a01f97a2a60 (#6105) add c86e750782 Use a consistent release version for CompilationProvider add c530f19242 Upgrade jolokia to 2.0.2 add 5df03317ad --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... add 83b7ab2004 Add support for openapi-contract-first development add e226c10ca6 Add tests for supervised routes with MicroProfile health add 0e2bf904a3 Fix test report action handling of error & failure objects add 3f2162b5c0 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.14.0 to 2.15.0 add ae5a010870 --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... add 3ddfa549f3 Add contract first development section in rest-openapi doc (#6115) add 1de918f30a Kafka tests in fips add 07972593de Upgrade Quarkus to 3.11.0 add 21f2f49cf1 Add me.escoffier.certs:certificate-generator-junit5 to dependabot config add 96a758b666 Remove broken link that causes website to fail add 228ea1fec9 Fixup 3ddfa549f3 Add contract first development section in rest-openapi doc (#6115) add bce51ca301 Upgrade to Quarkus CXF 3.11.0 add a8f4527157 --- updated-dependencies: - dependency-name: me.escoffier.certs:certificate-generator-junit5 dependency-type: direct:production update-type: version-update:semver-minor ... add c134fe4e46 Remove broken link that causes website to fail add 825571eb93 Regen SBOM from commit c134fe4e4698e51c0b78876317079b1c8402f2ff (#6120) new 3ad6359bc3 Upgrade Camel to 4.7.0 new 931df2b6da Fixed debug + generated poms new 431c87700a generated poms new ca77c8410d Fixed knative + generated files new 5c5fedd043 Generated files new e3af352cc4 Generated poms new 4fce4a21b9 Handle DebuggerJmxConnectorService being present in the camel core new b0eb1ca281 Generated files new 0008a34517 Generated poms new 21e3f98296 Fix of compilation error in test-framework new eaac76aece fixed test-framework/junit5 + generated changes 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 (c9f96bf967) \ N -- N -- N refs/heads/camel-main (eaac76aece) 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 11 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:
(camel-quarkus) 02/11: Fixed debug + generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 931df2b6da03df679ffdd28a1776e6ab7e79db6d Author: JiriOndrusek AuthorDate: Wed May 15 09:25:44 2024 +0200 Fixed debug + generated poms --- .../java/org/apache/camel/quarkus/component/debug/it/DebugTest.java | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java b/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java index b2f5a41742..2098c7b436 100644 --- a/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java +++ b/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java @@ -34,9 +34,9 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean; import org.junit.jupiter.api.Test; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_HOST; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_REGISTRY_PORT; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_SERVICE_URL_PATH; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_HOST; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_REGISTRY_PORT; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_SERVICE_URL_PATH; import static org.awaitility.Awaitility.await; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 070df87432..967b51357b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6398,7 +6398,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 2f8b426899..ec1548f695 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6398,7 +6398,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging 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 baaf54a409..3abcb6061b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6398,7 +6398,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging
(camel-quarkus) 09/11: Generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0008a345179fbd26da2d20d4e202fdc80f293b6f Author: JiriOndrusek AuthorDate: Mon May 27 08:40:08 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 6fe4c3102d..4447617527 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7077,7 +7077,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7092,7 +7092,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7103,7 +7103,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7118,7 +7118,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7133,7 +7133,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7148,7 +7148,7 @@ org.springframework spring-orm -6.1.7 +6.1.8 org.springframework @@ -7163,7 +7163,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 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 7313b9b230..17914b03ad 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6996,7 +6996,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7011,7 +7011,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7022,7 +7022,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7037,7 +7037,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7052,7 +7052,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7067,7 +7067,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 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 563cf53bba..b4c8a8a01f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6996,7 +6996,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7011,7 +7011,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7022,7 +7022,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7037,7 +7037,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7052,7 +7052,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7067,7 +7067,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework
(camel-quarkus) 03/11: generated poms
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 431c87700a730da2f8cbfce958fbfd797751a5c6 Author: JiriOndrusek AuthorDate: Wed May 15 13:09:41 2024 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 967b51357b..f967c5be86 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6568,7 +6568,7 @@ io.projectreactor.netty reactor-netty -1.1.18 +1.1.19 io.quarkiverse.freemarker diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index ec1548f695..25d87ef70f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6538,7 +6538,7 @@ io.projectreactor.netty reactor-netty -1.1.18 +1.1.19 io.quarkiverse.freemarker 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 3abcb6061b..bfbf3da7db 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6538,7 +6538,7 @@ io.projectreactor.netty reactor-netty -1.1.18 +1.1.19 io.quarkiverse.freemarker
(camel-quarkus) 10/11: Fix of compilation error in test-framework
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 21e3f98296c2b9553cf8a86e1ecf481ba509ccc2
Author: JiriOndrusek
AuthorDate: Mon May 27 16:05:44 2024 +0200
Fix of compilation error in test-framework
---
.../camel/quarkus/test/CamelQuarkusTestSupport.java | 2 +-
.../quarkus/test/common/AbstractCallbacksTest.java | 17 -
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
index 70910d51d8..62c1a21af7 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
@@ -267,7 +267,7 @@ public class CamelQuarkusTestSupport extends
CamelTestSupport
* Method is not intended to be overridden.
*/
@Override
-protected final void doQuarkusCheck() {
+protected final void unsupportedCheck() {
//can run on Quarkus
//log warning in case that at least one RouteBuilder in the registry,
it might mean, that unintentionally
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
index 4d9d7b5501..77c6b64c7f 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
+++
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
@@ -36,15 +36,15 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.apache.camel.quarkus.test.junit5.patterns.DebugJUnit5Test;
import org.apache.camel.util.StopWatch;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport {
-private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class);
+private static final Logger LOG =
Logger.getLogger(AbstractCallbacksTest.class);
public enum Callback {
postTearDown,
@@ -69,6 +69,12 @@ public abstract class AbstractCallbacksTest extends
CamelQuarkusTestSupport {
this.afterClassTestName = afterClassTestName;
}
+@BeforeEach
+protected void createTmpFiles() throws Exception {
+createTmpFile(testName, Callback.doSetup);
+createTmpFile(afterClassTestName, Callback.doSetup);
+}
+
@Override
protected CamelContext createCamelContext() throws Exception {
createTmpFile(testName, Callback.contextCreation);
@@ -83,13 +89,6 @@ public abstract class AbstractCallbacksTest extends
CamelQuarkusTestSupport {
super.doPostSetup();
}
-@Override
-protected void doSetUp() throws Exception {
-createTmpFile(testName, Callback.doSetup);
-createTmpFile(afterClassTestName, Callback.doSetup);
-super.doSetUp();
-}
-
@Override
protected void doPostSetup() throws Exception {
createTmpFile(testName, Callback.postSetup);
(camel-quarkus) 04/11: Fixed knative + generated files
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ca77c8410d8deb0e6c4daa26c1c16beea2eab0a0
Author: JiriOndrusek
AuthorDate: Fri May 17 12:08:52 2024 +0200
Fixed knative + generated files
---
.../component/knative/consumer/it/KnativeChannelConsumerTest.java | 2 +-
.../component/knative/producer/it/KnativeProducerResource.java | 2 +-
.../apache/camel/quarkus/component/knative/producer/it/Routes.java | 2 +-
pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java
b/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java
index 7ff3cc8ce0..696db79d9c 100644
---
a/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java
+++
b/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvents;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
diff --git
a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java
b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java
index 4df151ee54..1112cf1c42 100644
---
a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java
+++
b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java
@@ -33,7 +33,7 @@ import jakarta.ws.rs.core.Response;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.cloudevents.CloudEvents;
+import org.apache.camel.cloudevents.CloudEvents;
import org.apache.camel.component.knative.KnativeComponent;
import org.apache.camel.component.mock.MockEndpoint;
diff --git
a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java
b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java
index 529b26f1c0..f9240e3c11 100644
---
a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java
+++
b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java
@@ -17,7 +17,7 @@
package org.apache.camel.quarkus.component.knative.producer.it;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.cloudevents.CloudEvent;
+import org.apache.camel.cloudevents.CloudEvent;
public class Routes extends RouteBuilder {
diff --git a/pom.xml b/pom.xml
index 93b31aa150..0268e5ed8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,9 +98,9 @@
1.313
1.23.0
${google-oauth-client-version}
-0.219.0
-
1.129.1
-1.129.1
+0.220.0
+
1.129.3
+1.129.3
23.1.2
jdk21
4.0.21
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index f967c5be86..b62d8ca3d5 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6367,7 +6367,7 @@
com.google.cloud
google-cloud-pubsub
-1.129.1
+1.129.3
com.google.android
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 25d87ef70f..0376475e03 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6367,7 +6367,7 @@
com.google.cloud
google-cloud-pubsub
-1.129.1
+1.129.3
com.google.android
diff --git
(camel-quarkus) 05/11: Generated files
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5c5fedd043b24b7fca8eb1df5a7b8c991f9654c4
Author: JiriOndrusek
AuthorDate: Mon May 20 09:24:06 2024 +0200
Generated files
---
docs/modules/ROOT/examples/components/activemq.yml | 4 ++--
docs/modules/ROOT/examples/components/nitrite.yml | 2 +-
docs/modules/ROOT/pages/reference/extensions/activemq.adoc | 6 +++---
docs/modules/ROOT/pages/reference/extensions/nitrite.adoc | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++---
poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++--
.../src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++--
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/docs/modules/ROOT/examples/components/activemq.yml
b/docs/modules/ROOT/examples/components/activemq.yml
index e1fbbf302b..252dbc3067 100644
--- a/docs/modules/ROOT/examples/components/activemq.yml
+++ b/docs/modules/ROOT/examples/components/activemq.yml
@@ -8,6 +8,6 @@ cqDeprecated: false
cqJvmSince: 1.0.0
cqNativeSince: 1.0.0
cqCamelPartName: activemq
-cqCamelPartTitle: ActiveMQ
-cqCamelPartDescription: Send messages to (or consume from) Apache ActiveMQ.
This component extends the Camel JMS component.
+cqCamelPartTitle: ActiveMQ 5.x
+cqCamelPartDescription: Send messages to (or consume from) Apache ActiveMQ
5.x. This component extends the Camel JMS component.
cqExtensionPageTitle: ActiveMQ
diff --git a/docs/modules/ROOT/examples/components/nitrite.yml
b/docs/modules/ROOT/examples/components/nitrite.yml
index 012e488442..9e0d9d023b 100644
--- a/docs/modules/ROOT/examples/components/nitrite.yml
+++ b/docs/modules/ROOT/examples/components/nitrite.yml
@@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-nitrite
cqArtifactIdBase: nitrite
cqNativeSupported: true
cqStatus: Stable
-cqDeprecated: false
+cqDeprecated: true
cqJvmSince: 1.0.0
cqNativeSince: 1.8.0
cqCamelPartName: nitrite
diff --git a/docs/modules/ROOT/pages/reference/extensions/activemq.adoc
b/docs/modules/ROOT/pages/reference/extensions/activemq.adoc
index 430c0383fd..c044c78689 100644
--- a/docs/modules/ROOT/pages/reference/extensions/activemq.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/activemq.adoc
@@ -8,7 +8,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Send messages to (or consume from) Apache ActiveMQ. This
component extends the Camel JMS component.
+:cq-description: Send messages to (or consume from) Apache ActiveMQ 5.x. This
component extends the Camel JMS component.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -18,12 +18,12 @@ ifeval::[{doc-show-badges} == true]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
endif::[]
-Send messages to (or consume from) Apache ActiveMQ. This component extends the
Camel JMS component.
+Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends
the Camel JMS component.
[id="extensions-activemq-whats-inside"]
== What's inside
-* xref:{cq-camel-components}::activemq-component.adoc[ActiveMQ component], URI
syntax: `activemq:destinationType:destinationName`
+* xref:{cq-camel-components}::activemq-component.adoc[ActiveMQ 5.x component],
URI syntax: `activemq:destinationType:destinationName`
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
b/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
index d94defb0da..bd7eda15d6 100644
--- a/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
@@ -7,15 +7,15 @@
:cq-artifact-id: camel-quarkus-nitrite
:cq-native-supported: true
:cq-status: Stable
-:cq-status-deprecation: Stable
+:cq-status-deprecation: Stable Deprecated
:cq-description: Access Nitrite databases.
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.0.0
:cq-native-since: 1.8.0
ifeval::[{doc-show-badges} == true]
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.8.0##
+[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.8.0##
[.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
endif::[]
Access Nitrite databases.
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index b62d8ca3d5..cb77f48158 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7077,7 +7077,7 @@
org.springframework
spring-aop
-6.1.6
+6.1.7
(camel-karaf) branch dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.6.0 updated (64899a1f -> eab24726)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.6.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git omit 64899a1f Bump org.codehaus.mojo:build-helper-maven-plugin from 3.5.0 to 3.6.0 add 5dbfcfac Upgrade to Camel 4.6 (#296) add eab24726 Bump org.codehaus.mojo:build-helper-maven-plugin from 3.5.0 to 3.6.0 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 (64899a1f) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.6.0 (eab24726) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: components/camel-activemq/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-arangodb/pom.xml | 2 +- components/camel-as2/pom.xml | 2 +- components/camel-asn1/pom.xml | 2 +- components/camel-asterisk/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-attachments/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- components/camel-aws/camel-aws-cloudtrail/pom.xml | 2 +- components/camel-aws/camel-aws-config/pom.xml | 2 +- .../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +- components/camel-aws/camel-aws-xray/pom.xml| 2 +- components/camel-aws/camel-aws2-athena/pom.xml | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- components/camel-aws/camel-aws2-ddb/pom.xml| 2 +- components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- components/camel-aws/camel-aws2-eks/pom.xml| 2 +- .../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +- components/camel-aws/camel-aws2-iam/pom.xml| 2 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +- components/camel-aws/camel-aws2-kms/pom.xml| 2 +- components/camel-aws/camel-aws2-lambda/pom.xml | 2 +- components/camel-aws/camel-aws2-mq/pom.xml | 2 +- components/camel-aws/camel-aws2-msk/pom.xml| 2 +- components/camel-aws/camel-aws2-redshift/pom.xml | 2 +- components/camel-aws/camel-aws2-s3/pom.xml | 2 +- components/camel-aws/camel-aws2-ses/pom.xml| 2 +- components/camel-aws/camel-aws2-sns/pom.xml| 2 +- components/camel-aws/camel-aws2-sqs/pom.xml| 2 +- .../camel-aws/camel-aws2-step-functions/pom.xml| 2 +- components/camel-aws/camel-aws2-sts/pom.xml| 2 +- components/camel-aws/camel-aws2-timestream/pom.xml | 2 +- components/camel-aws/camel-aws2-translate/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 2 +- components/camel-azure/camel-azure-files/pom.xml | 2 +- .../camel-azure/camel-azure-key-vault/pom.xml | 2 +- .../camel-azure-schema-registry/pom.xml| 2 +- .../camel-azure/camel-azure-servicebus/pom.xml | 2 +- .../camel-azure/camel-azure-storage-blob/pom.xml | 2 +- .../camel-azure-storage-datalake/pom.xml | 2 +- .../camel-azure/camel-azure-storage-queue/pom.xml | 2 +- components/camel-azure/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml| 2 +- components/camel-bean-validator/pom.xml| 2 +- components/camel-bean/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 2 +- .../blueprint/handler/CamelNamespaceHandler.java | 19 +- components/camel-bonita/pom.xml| 2 +- components/camel-box/pom.xml | 2 +- components/camel-braintree/pom.xml | 2 +- components/camel-browse/pom.xml| 2 +- components/camel-caffeine/pom.xml | 2 +- components/camel-cassandraql/pom.xml | 2 +- components/camel-cbor/pom.xml
Re: [PR] Bump org.codehaus.mojo:build-helper-maven-plugin from 3.5.0 to 3.6.0 [camel-karaf]
essobedo commented on PR #295: URL: https://github.com/apache/camel-karaf/pull/295#issuecomment-2133660703 @dependabot rebase -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karaf) branch upgrade-camel-4.6 deleted (was 341733e6)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch upgrade-camel-4.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 341733e6 Upgrade to Camel 4.6 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Upgrade to Camel 4.6 [camel-karaf]
essobedo merged PR #296: URL: https://github.com/apache/camel-karaf/pull/296 -- 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] Add Bundle-Version to all wrapped bundles [camel-karaf]
essobedo commented on PR #297: URL: https://github.com/apache/camel-karaf/pull/297#issuecomment-2133658892 Awesome! Would you mind waiting for the Upgrade to Camel 4.6 before merging it? -- 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] Create a langchain4j-core module [camel]
github-actions[bot] commented on PR #14251: URL: https://github.com/apache/camel/pull/14251#issuecomment-2133640401 :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] Create a langchain4j-core module [camel]
lburgazzoli opened a new pull request, #14251: URL: https://github.com/apache/camel/pull/14251 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Add Bundle-Version to all wrapped bundles [camel-karaf]
stataru8 commented on issue #287:
URL: https://github.com/apache/camel-karaf/issues/287#issuecomment-2133601715
I see 2 options
1. Don't specify the version.
2. Rely on
https://github.com/apache/felix-dev/blob/org.apache.felix.main-7.0.5/utils/src/main/java/org/apache/felix/utils/version/VersionCleaner.java
to obtain the version in a valid format. For instance
`org.apache.felix.utils.version.VersionCleaner.clean("v3-rev20240123-2.0.0")`
returns `0.0.0.v3-rev20240123-2_0_0`. Downside:
We stop relying on version placeholders to specify the Bundle-Version.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] feat(trait): jvm refactoring [camel-k]
github-actions[bot] commented on PR #5488: URL: https://github.com/apache/camel-k/pull/5488#issuecomment-2133592647 :heavy_check_mark: Unit test coverage report - coverage increased from 38.4% to 38.6% (**+0.2%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Upgrade to Camel 4.6 [camel-karaf]
essobedo opened a new pull request, #296: URL: https://github.com/apache/camel-karaf/pull/296 (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-karaf) branch upgrade-camel-4.6 updated (95377dc4 -> 341733e6)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch upgrade-camel-4.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard 95377dc4 Upgrate to Camel 4.6 new 341733e6 Upgrade to Camel 4.6 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 (95377dc4) \ N -- N -- N refs/heads/upgrade-camel-4.6 (341733e6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(camel-karaf) branch upgrade-camel-4.6 created (now 95377dc4)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch upgrade-camel-4.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at 95377dc4 Upgrate to Camel 4.6 This branch includes the following new commits: new 95377dc4 Upgrate to Camel 4.6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[PR] chore(ci): Knative 1.14.0 [camel-k]
squakez opened a new pull request, #5551: URL: https://github.com/apache/camel-k/pull/5551 **Release Note** ```release-note chore(ci): Knative 1.14.0 ``` -- 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/01: chore(ci): Knative 1.14.0
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch squakez-patch-1
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 466a801c9887dfd5064759912e99470632a04c2c
Author: Pasquale Congiusti
AuthorDate: Mon May 27 16:22:54 2024 +0200
chore(ci): Knative 1.14.0
---
.github/actions/kamel-install-knative/install-knative.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/actions/kamel-install-knative/install-knative.sh
b/.github/actions/kamel-install-knative/install-knative.sh
index 1ec4d8003..b5ed6c4f8 100755
--- a/.github/actions/kamel-install-knative/install-knative.sh
+++ b/.github/actions/kamel-install-knative/install-knative.sh
@@ -30,9 +30,9 @@ ${SUDO} wget
https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_
set +e
-export SERVING_VERSION=knative-v1.11.0
-export EVENTING_VERSION=knative-v1.11.0
-export KOURIER_VERSION=knative-v1.11.0
+export SERVING_VERSION=knative-v1.14.0
+export EVENTING_VERSION=knative-v1.14.0
+export KOURIER_VERSION=knative-v1.14.0
TIMEOUT="150s"
(camel-k) branch squakez-patch-1 created (now 466a801c9)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch squakez-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 466a801c9 chore(ci): Knative 1.14.0 This branch includes the following new commits: new 466a801c9 chore(ci): Knative 1.14.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-quarkus) branch camel-main updated: Fix of compilation error in test-framework
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new c9f96bf967 Fix of compilation error in test-framework
c9f96bf967 is described below
commit c9f96bf967b704363f1f66ccffdfc4dd24360f94
Author: JiriOndrusek
AuthorDate: Mon May 27 16:05:44 2024 +0200
Fix of compilation error in test-framework
---
.../camel/quarkus/test/CamelQuarkusTestSupport.java | 2 +-
.../quarkus/test/common/AbstractCallbacksTest.java | 17 -
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
index 70910d51d8..62c1a21af7 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
@@ -267,7 +267,7 @@ public class CamelQuarkusTestSupport extends
CamelTestSupport
* Method is not intended to be overridden.
*/
@Override
-protected final void doQuarkusCheck() {
+protected final void unsupportedCheck() {
//can run on Quarkus
//log warning in case that at least one RouteBuilder in the registry,
it might mean, that unintentionally
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
index 4d9d7b5501..77c6b64c7f 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
+++
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java
@@ -36,15 +36,15 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.apache.camel.quarkus.test.junit5.patterns.DebugJUnit5Test;
import org.apache.camel.util.StopWatch;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport {
-private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class);
+private static final Logger LOG =
Logger.getLogger(AbstractCallbacksTest.class);
public enum Callback {
postTearDown,
@@ -69,6 +69,12 @@ public abstract class AbstractCallbacksTest extends
CamelQuarkusTestSupport {
this.afterClassTestName = afterClassTestName;
}
+@BeforeEach
+protected void createTmpFiles() throws Exception {
+createTmpFile(testName, Callback.doSetup);
+createTmpFile(afterClassTestName, Callback.doSetup);
+}
+
@Override
protected CamelContext createCamelContext() throws Exception {
createTmpFile(testName, Callback.contextCreation);
@@ -83,13 +89,6 @@ public abstract class AbstractCallbacksTest extends
CamelQuarkusTestSupport {
super.doPostSetup();
}
-@Override
-protected void doSetUp() throws Exception {
-createTmpFile(testName, Callback.doSetup);
-createTmpFile(afterClassTestName, Callback.doSetup);
-super.doSetUp();
-}
-
@Override
protected void doPostSetup() throws Exception {
createTmpFile(testName, Callback.postSetup);
Re: [PR] [backport 2.3.x] Fix offline script to use maven settings and option to skip ssl verification (#5538) [camel-k]
claudio4j merged PR #5549: URL: https://github.com/apache/camel-k/pull/5549 -- 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.3.x updated: Fix offline script to use maven settings and option to skip ssl verification (#5538) (#5549)
This is an automated email from the ASF dual-hosted git repository.
claudio4j pushed a commit to branch release-2.3.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.3.x by this push:
new fcf933d10 Fix offline script to use maven settings and option to skip
ssl verification (#5538) (#5549)
fcf933d10 is described below
commit fcf933d10e82ec149809cda7e58e5f1bdbc85b88
Author: Claudio Miranda
AuthorDate: Mon May 27 11:00:02 2024 -0300
Fix offline script to use maven settings and option to skip ssl
verification (#5538) (#5549)
(cherry picked from commit dff8e9eb1a088c5c28a8b3dead936380614c0a91)
---
script/offline_dependencies.sh | 81 ++
1 file changed, 59 insertions(+), 22 deletions(-)
diff --git a/script/offline_dependencies.sh b/script/offline_dependencies.sh
index 832240b0e..ec0388caf 100755
--- a/script/offline_dependencies.sh
+++ b/script/offline_dependencies.sh
@@ -17,11 +17,17 @@
set -e
+if [[ "$OSTYPE" != "linux"* ]]; then
+echo "ERROR: This script is intended to run in linux. You may try to edit
and tweak it to run in other OS."
+exit 1
+fi
+
mvnCmd=$(which mvn)
+central_repo=https://repo1.maven.org/maven2
remote_repo=https://repo1.maven.org/maven2
start_time=$(date -u +"%s")
-while getopts ":v:m:r:d:" opt; do
+while getopts ":v:m:r:d:s" opt; do
case "${opt}" in
m)
mvnCmd="${OPTARG}"
@@ -33,7 +39,10 @@ while getopts ":v:m:r:d:" opt; do
runtime_version="${OPTARG}"
;;
d)
- offline_dir="${OPTARG}"
+ offline_new_dir="${OPTARG}"
+ ;;
+s)
+ skip_https="-k"
;;
*)
;;
@@ -43,26 +52,27 @@ shift $((OPTIND-1))
if [ -z ${runtime_version} ]; then
echo "usage: $0 -v [optional parameters]"
-echo " -m path to mvn command"
-echo " -r URL address of the maven repository manager"
-echo " -d local directory to add the offline dependencies"
+echo " -m- Path to mvn command"
+echo " -r - URL address of the maven repository
manager"
+echo " -d - Local directory to add the offline
dependencies"
+echo " -s- Skip Certificate validation"
exit 1
fi
-offline=./_offline-${runtime_version}
-if [ ! -z ${offline_dir} ]; then
-offline=${offline_dir}
+offline_dir=./_offline-${runtime_version}
+if [ ! -z ${offline_new_dir} ]; then
+offline_dir=${offline_new_dir}
fi
-offline_repo=${offline}/repo
+offline_repo=${offline_dir}/repo
# the pom.xml is the one containing all the dependencies from the
camel-catalog file
# it is used when running the go-offline and quarkus:go-offline goals to
resolve all dependencies
-pom=${offline}/pom.xml
+pom=${offline_dir}/pom.xml
# the pom-min.xml is used to actually build the project
# it was noted that some transitive dependencies are not correctly resolve
when using the go-offlilne plugin goals
# then this was required to resolve some transitive dependencies.
-pom_min=${offline}/pom-min.xml
+pom_min=${offline_dir}/pom-min.xml
# SETUP MAVEN
# get the maven version used by camel-k-operator
@@ -86,23 +96,41 @@ mkdir -p ${offline_repo}
rm -f ${pom} 2> /dev/null
$mvnCmd --version | grep "Apache Maven"
+
+# setup the maven settings in case there is a custom maven repository url
+if [[ "${central_repo}" != "${remote_repo}" ]]; then
+curl -sfSL
https://raw.githubusercontent.com/apache/camel-k/release-2.3.x/script/maven-settings-offline-template.xml
-o ${offline_dir}/maven-settings-offline-template.xml
+sed "s,_local-maven-proxy_,${remote_repo},g;//,/<\/mirrors>/d"
${offline_dir}/maven-settings-offline-template.xml >
${offline_dir}/custom-maven-settings.xml
+
+fi
+
## END SETUP MAVEN
# SETUP CAMEL CATALOG
+echo "INFO: downloading catalog for Camel K Runtime ${runtime_version}"
url=${remote_repo}/org/apache/camel/k/camel-k-catalog/${runtime_version}/camel-k-catalog-${runtime_version}-catalog.yaml
-response_code=$(curl -o /dev/null --silent -Iw '%{http_code}' ${url})
+if [ -z "${skip_https}" ]; then
+ # validate if there are certificate issues connecting with curl
+ cert_problem=$(curl --no-progress-meter -o /dev/null -LI -w '%{http_code}'
${url} 2>&1|grep -i 'SSL certificate problem'|head -1)
+ if [ ! -z "${cert_problem}" ]; then
+ echo "ERROR: There is a problem to connect to the maven repository:
${cert_problem}"
+ echo "You can set the parameter -s to skip certificate validation."
+ exit 1
+ fi
+fi
+
+response_code=$(curl --no-progress-meter -o /dev/null --silent -LI
${skip_https} -w '%{http_code}' ${url} 2>&1)
if [ 200 != ${response_code} ]; then
echo "ERROR: Camel K Runtime version ${runtime_version} catalog doesn't
exist at ${url}"
exit 1
fi
-catalog="${offline}/camel-catalog-${runtime_version}.yaml"
-echo "INFO: downloading catalog for Camel K Runtime
[PR] fix(kamelet): Data type action kamelet transformer error [camel-k]
gansheer opened a new pull request, #5550: URL: https://github.com/apache/camel-k/pull/5550 WIP **Release Note** ```release-note NONE ``` -- 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] [backport 2.3.x] Fix offline script to use maven settings and option to skip ssl verification (#5538) [camel-k]
claudio4j opened a new pull request, #5549: URL: https://github.com/apache/camel-k/pull/5549 (cherry picked from commit dff8e9eb1a088c5c28a8b3dead936380614c0a91) **Release Note** ```release-note NONE ``` -- 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(trait): jvm refactoring [camel-k]
github-actions[bot] commented on PR #5488: URL: https://github.com/apache/camel-k/pull/5488#issuecomment-2133291529 :heavy_check_mark: Unit test coverage report - coverage increased from 38.4% to 38.6% (**+0.2%**) -- 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(trait): jvm refactoring [camel-k]
github-actions[bot] commented on PR #5488: URL: https://github.com/apache/camel-k/pull/5488#issuecomment-2133274705 :heavy_check_mark: Unit test coverage report - coverage increased from 38.4% to 38.6% (**+0.2%**) -- 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 (648e549c27a -> c18d99785ef)
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 648e549c27a Upgrade Nats container to version 2.10.16 (#14249) add c18d99785ef CAMEL-20875 allow modify unsupportedCheck temporarily No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/test/junit5/CamelTestSupport.java| 10 +- 1 file changed, 9 insertions(+), 1 deletion(-)
(camel) branch main updated: CAMEL-20875 allow modify unsupportedCheck temporarily
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 c18d99785ef CAMEL-20875 allow modify unsupportedCheck temporarily
c18d99785ef is described below
commit c18d99785ef3429013dba6acb9c3e46ca95bee14
Author: JiriOndrusek
AuthorDate: Mon May 27 11:39:26 2024 +0200
CAMEL-20875 allow modify unsupportedCheck temporarily
---
.../java/org/apache/camel/test/junit5/CamelTestSupport.java| 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 6e50639aca8..85fe930ff18 100644
---
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -332,7 +332,7 @@ public abstract class CamelTestSupport
public void setUp() throws Exception {
testStartHeader(getClass(), currentTestName);
-ExtensionHelper.hasUnsupported(getClass());
+unsupportedCheck();
if (isCreateCamelContextPerClass) {
createCamelContextPerClass();
@@ -413,6 +413,14 @@ public abstract class CamelTestSupport
}
}
+/**
+ * Temporary method for the child classes to modify the unsupported check.
+ */
+@Deprecated(since = "4.7.0")
+protected void unsupportedCheck() {
+ExtensionHelper.hasUnsupported(getClass());
+}
+
@Deprecated(since = "4.7.0")
protected final void doSetUp() throws Exception {
LOG.debug("setUp test");
Re: [PR] CAMEL-20875 allow modify unsupportedCheck temporarily [camel]
orpiske merged PR #14250: URL: https://github.com/apache/camel/pull/14250 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix(traits): don't skip for synthetic kits [camel-k]
squakez opened a new pull request, #5548: URL: https://github.com/apache/camel-k/pull/5548 Fixes certain regressions identified in a staging artifact, see #5547 **Release Note** ```release-note fix(traits): don't skip for synthetic kits ``` -- 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 (b7d80526a3f -> 648e549c27a)
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 b7d80526a3f Upgrade Vault container image to version 1.16.2 (#14247) add 648e549c27a Upgrade Nats container to version 2.10.16 (#14249) No new revisions were added by this update. Summary of changes: .../org/apache/camel/test/infra/nats/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[PR] [Release 2.3.x] fix(traits): don't skip for synthetic kits [camel-k]
squakez opened a new pull request, #5547: URL: https://github.com/apache/camel-k/pull/5547 This PR fix some regressions as identified in https://camel.zulipchat.com/#narrow/stream/257299-camel-k/topic/Catalog.20not.20found.20for.20sourceless.20integration.20after.20upgrade **Release Note** ```release-note fix(traits): don't skip for synthetic kits ``` -- 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] Nats 2.10.16 [camel]
oscerd merged PR #14249: URL: https://github.com/apache/camel/pull/14249 -- 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 (b7d80526a3f -> 648e549c27a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from b7d80526a3f Upgrade Vault container image to version 1.16.2 (#14247) add 648e549c27a Upgrade Nats container to version 2.10.16 (#14249) No new revisions were added by this update. Summary of changes: .../org/apache/camel/test/infra/nats/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] CAMEL-20875 allow modify unsupportedCheck temporarily [camel]
JiriOndrusek commented on PR #14250: URL: https://github.com/apache/camel/pull/14250#issuecomment-2133087519 @orpiske FYI -- 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-20875 allow modify unsupportedCheck temporarily [camel]
JiriOndrusek opened a new pull request, #14250: URL: https://github.com/apache/camel/pull/14250 Recent changes (part of https://issues.apache.org/jira/browse/CAMEL-20785) in CamelTestSupport made impossible for Camel-quarkus to overridyethe _unsupportedCheck_. This PR brings temporarily solution. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20875 allow modify unsupportedCheck temporarily [camel]
github-actions[bot] commented on PR #14250: URL: https://github.com/apache/camel/pull/14250#issuecomment-2133087489 :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
Re: [PR] Nats 2.10.16 [camel]
github-actions[bot] commented on PR #14249: URL: https://github.com/apache/camel/pull/14249#issuecomment-2133038725 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Nats 2.10.16 [camel]
oscerd commented on PR #14249: URL: https://github.com/apache/camel/pull/14249#issuecomment-2133037950 /component-test nats -- 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 nats-2.10.16 updated (3f78884e4d3 -> 3b5636bcd9e)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch nats-2.10.16 in repository https://gitbox.apache.org/repos/asf/camel.git discard 3f78884e4d3 Upgrade Nats container to version 2.10.16 omit 33bea09db6b Upgrade Vault container image to version 1.16.2 add c57faf1e6b8 INFRA-25795: use avx nodes on CI add 7af8f1c13a5 CAMEL-20782: Re-enable MongoDB tests on ASF CI add b7d80526a3f Upgrade Vault container image to version 1.16.2 (#14247) add 3b5636bcd9e Upgrade Nats container to version 2.10.16 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 (3f78884e4d3) \ N -- N -- N refs/heads/nats-2.10.16 (3b5636bcd9e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: Jenkinsfile | 8 .../component/mongodb/gridfs/integration/GridFsConsumerIT.java| 2 -- .../mongodb/gridfs/integration/GridFsProducerOperationsIT.java| 2 -- .../mongodb/integration/MongoDbAggregateOperationIT.java | 2 -- .../mongodb/integration/MongoDbBigDecimalConverterIT.java | 2 -- .../mongodb/integration/MongoDbBulkWriteOperationIT.java | 2 -- .../mongodb/integration/MongoDbChangeStreamsConsumerIT.java | 2 -- .../component/mongodb/integration/MongoDbConnectionBeansIT.java | 2 -- .../camel/component/mongodb/integration/MongoDbConversionsIT.java | 2 -- .../integration/MongoDbCredentialsFromUriConnectionIT.java| 2 -- .../camel/component/mongodb/integration/MongoDbDynamicityIT.java | 2 -- .../component/mongodb/integration/MongoDbExceptionHandlingIT.java | 2 -- .../mongodb/integration/MongoDbFindOneAndDeleteOperationIT.java | 2 -- .../mongodb/integration/MongoDbFindOneAndReplaceOperationIT.java | 2 -- .../mongodb/integration/MongoDbFindOneAndUpdateOperationIT.java | 2 -- .../component/mongodb/integration/MongoDbFindOperationIT.java | 2 -- .../component/mongodb/integration/MongoDbHeaderHandlingIT.java| 2 -- .../camel/component/mongodb/integration/MongoDbIndexIT.java | 2 -- .../camel/component/mongodb/integration/MongoDbInsertBatchIT.java | 2 -- .../camel/component/mongodb/integration/MongoDbOperationsIT.java | 2 -- .../camel/component/mongodb/integration/MongoDbOutputTypeIT.java | 2 -- .../mongodb/integration/MongoDbReadPreferenceOptionIT.java| 2 -- .../mongodb/integration/MongoDbSpringDslOperationsIT.java | 2 -- .../component/mongodb/integration/MongoDbStopEndpointIT.java | 2 -- .../mongodb/integration/MongoDbTailableCursorConsumerIT.java | 2 -- .../mongodb/meta/integration/MongoDbMetaExtensionIT.java | 2 -- .../idempotent/integration/MongoDbIdempotentRepositoryIT.java | 2 -- .../mongodb/verifier/integration/MongoDbVerifierExtensionIT.java | 2 -- 28 files changed, 4 insertions(+), 58 deletions(-)
[PR] Nats 2.10.16 [camel]
oscerd opened a new pull request, #14249: URL: https://github.com/apache/camel/pull/14249 # Description # 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 - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 01/01: Upgrade Nats container to version 2.10.16
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch nats-2.10.16 in repository https://gitbox.apache.org/repos/asf/camel.git commit 3f78884e4d32de9e910399eaf03e85e934d56f13 Author: Andrea Cosentino AuthorDate: Mon May 27 11:06:10 2024 +0200 Upgrade Nats container to version 2.10.16 Signed-off-by: Andrea Cosentino --- .../org/apache/camel/test/infra/nats/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties b/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties index fdabe5617e9..a79c3b62a1f 100644 --- a/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties +++ b/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -nats.container=nats:2.10.14 +nats.container=nats:2.10.16
(camel) branch nats-2.10.16 created (now 3f78884e4d3)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch nats-2.10.16 in repository https://gitbox.apache.org/repos/asf/camel.git at 3f78884e4d3 Upgrade Nats container to version 2.10.16 This branch includes the following new commits: new 3f78884e4d3 Upgrade Nats container to version 2.10.16 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.
