(camel-kamelets) branch regen_bot updated (bbdd20b7 -> 99962a62)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
from bbdd20b7 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0
to 3.3.1 (#1985)
add 99962a62 chore: Fix YAKS tests for Camel 4.5.0 (#1986)
No new revisions were added by this update.
Summary of changes:
pom.xml| 4 ++--
tests/camel-kamelets-itest/pom.xml | 17 +++--
.../src/test/resources/{ => avro}/User.avsc| 0
.../resources/{ => avro}/avro-binary-source-pipe.yaml | 0
.../resources/{ => avro}/avro-deserialize-pipe.yaml| 0
.../test/resources/{ => avro}/avro-serialize-pipe.yaml | 0
.../resources/{ => avro}/avro-x-struct-sink-pipe.yaml | 0
.../src/test/resources/avro/yaks-config.yaml | 10 +-
.../resources/{ => aws/ddb}/amazonDDBClient.groovy | 1 +
.../resources/{ => aws/ddb}/aws-ddb-sink-pipe.yaml | 0
.../src/test/resources/{ => aws/ddb}/putItem.groovy| 2 ++
.../test/resources/{ => aws/ddb}/verifyItems.groovy| 2 ++
.../src/test/resources/aws/ddb/yaks-config.yaml| 8
.../test/resources/{ => aws/s3}/amazonS3Client.groovy | 1 +
.../{ => aws/s3}/aws-s3-credentials.properties | 0
...aws-s3-to-http.feature => aws-s3-http-pipe.feature} | 12 ++--
.../resources/aws/s3/aws-s3-knative-broker.feature | 6 +++---
.../resources/aws/s3/aws-s3-knative-channel.feature| 6 +++---
.../aws/s3/aws-s3-knative-cloudevents.feature | 6 +++---
.../aws/s3/aws-s3-source-property-conf.feature | 6 +++---
.../resources/aws/s3/aws-s3-source-secret-conf.feature | 6 +++---
.../resources/aws/s3/aws-s3-source-uri-conf.feature| 6 +++---
.../test/resources/{ => aws/s3}/aws-s3-to-http.yaml| 0
.../{ => aws/s3}/aws-s3-to-knative-broker.yaml | 0
.../{ => aws/s3}/aws-s3-to-knative-channel.yaml| 0
.../{ => aws/s3}/aws-s3-to-log-secret-based.groovy | 1 +
.../{ => aws/s3}/aws-s3-to-log-uri-based.groovy| 1 +
.../src/test/resources/aws/s3/aws-s3-uri-pipe.feature | 6 +++---
.../test/resources/{ => aws/s3}/aws-s3-uri-pipe.yaml | 0
.../resources/{ => aws/s3}/knative-channel-to-log.yaml | 0
.../test/resources/{ => aws/s3}/knative-to-log.yaml| 0
.../src/test/resources/aws/s3/yaks-config.yaml | 18 +-
.../src/test/resources/citrus-application.properties | 4 ++--
.../resources/{ => earthquake}/earthquake-to-http.yaml | 0
.../test/resources/{ => kafka}/kafka-sink-pipe.yaml| 0
.../test/resources/{ => kafka}/kafka-source-pipe.yaml | 0
.../src/test/resources/kafka/yaks-config.yaml | 4 ++--
.../src/test/resources/{ => mail}/mail-server.groovy | 2 ++
.../src/test/resources/mail/mail-sink.feature | 4 ++--
.../src/test/resources/{ => mail}/timer-to-mail.yaml | 0
.../src/test/resources/mail/yaks-config.yaml | 4 ++--
.../src/test/resources/{ => openapi}/openapi.json | 0
.../src/test/resources/{ => openapi}/pet.json | 0
.../{ => openapi}/rest-openapi-sink-pipe.yaml | 0
.../src/test/resources/openapi/yaks-config.yaml| 6 +++---
.../direct-to-salesforce-delete-pipe.yaml | 0
.../direct-to-salesforce-update-pipe.yaml | 0
.../{ => salesforce}/salesforce-credentials.properties | 0
.../{ => salesforce}/timer-to-salesforce-pipe.yaml | 0
.../src/test/resources/salesforce/yaks-config.yaml | 8
.../test/resources/{ => timer}/timer-to-http-pipe.yaml | 0
.../test/resources/{ => timer}/timer-to-http.groovy| 3 ++-
.../resources/{ => timer}/timer-to-http.properties | 0
.../src/test/resources/timer/yaks-config.yaml | 6 +++---
.../{ => transformation}/data-type-action-pipe.yaml| 0
.../extract-field-action-pipe.yaml | 0
.../{ => transformation}/insert-field-action-pipe.yaml | 0
.../src/test/resources/transformation/yaks-config.yaml | 6 +++---
58 files changed, 87 insertions(+), 79 deletions(-)
rename tests/camel-kamelets-itest/src/test/resources/{ => avro}/User.avsc
(100%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
avro}/avro-binary-source-pipe.yaml (100%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
avro}/avro-deserialize-pipe.yaml (100%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
avro}/avro-serialize-pipe.yaml (100%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
avro}/avro-x-struct-sink-pipe.yaml (100%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
aws/ddb}/amazonDDBClient.groovy (99%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
aws/ddb}/aws-ddb-sink-pipe.yaml (100%)
rename tests/camel-kamelets-itest/src/test/resources/{ =>
aws/ddb}/putItem.groovy (98%)
rename tests/camel-kamelet
(camel-kamelets) branch main updated: chore: Fix YAKS tests for Camel 4.5.0 (#1986)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 99962a62 chore: Fix YAKS tests for Camel 4.5.0 (#1986)
99962a62 is described below
commit 99962a62fc43ee3fc8b43189d5bb90b34df60ac6
Author: Christoph Deppisch
AuthorDate: Sat Apr 6 08:23:51 2024 +0200
chore: Fix YAKS tests for Camel 4.5.0 (#1986)
- Update Apache Camel runtime to 4.5.0
- Use Citrus 4.2.0
- Update YAKS 0.19.0
---
pom.xml| 4 ++--
tests/camel-kamelets-itest/pom.xml | 17 +++--
.../src/test/resources/{ => avro}/User.avsc| 0
.../resources/{ => avro}/avro-binary-source-pipe.yaml | 0
.../resources/{ => avro}/avro-deserialize-pipe.yaml| 0
.../test/resources/{ => avro}/avro-serialize-pipe.yaml | 0
.../resources/{ => avro}/avro-x-struct-sink-pipe.yaml | 0
.../src/test/resources/avro/yaks-config.yaml | 10 +-
.../resources/{ => aws/ddb}/amazonDDBClient.groovy | 1 +
.../resources/{ => aws/ddb}/aws-ddb-sink-pipe.yaml | 0
.../src/test/resources/{ => aws/ddb}/putItem.groovy| 2 ++
.../test/resources/{ => aws/ddb}/verifyItems.groovy| 2 ++
.../src/test/resources/aws/ddb/yaks-config.yaml| 8
.../test/resources/{ => aws/s3}/amazonS3Client.groovy | 1 +
.../{ => aws/s3}/aws-s3-credentials.properties | 0
...aws-s3-to-http.feature => aws-s3-http-pipe.feature} | 12 ++--
.../resources/aws/s3/aws-s3-knative-broker.feature | 6 +++---
.../resources/aws/s3/aws-s3-knative-channel.feature| 6 +++---
.../aws/s3/aws-s3-knative-cloudevents.feature | 6 +++---
.../aws/s3/aws-s3-source-property-conf.feature | 6 +++---
.../resources/aws/s3/aws-s3-source-secret-conf.feature | 6 +++---
.../resources/aws/s3/aws-s3-source-uri-conf.feature| 6 +++---
.../test/resources/{ => aws/s3}/aws-s3-to-http.yaml| 0
.../{ => aws/s3}/aws-s3-to-knative-broker.yaml | 0
.../{ => aws/s3}/aws-s3-to-knative-channel.yaml| 0
.../{ => aws/s3}/aws-s3-to-log-secret-based.groovy | 1 +
.../{ => aws/s3}/aws-s3-to-log-uri-based.groovy| 1 +
.../src/test/resources/aws/s3/aws-s3-uri-pipe.feature | 6 +++---
.../test/resources/{ => aws/s3}/aws-s3-uri-pipe.yaml | 0
.../resources/{ => aws/s3}/knative-channel-to-log.yaml | 0
.../test/resources/{ => aws/s3}/knative-to-log.yaml| 0
.../src/test/resources/aws/s3/yaks-config.yaml | 18 +-
.../src/test/resources/citrus-application.properties | 4 ++--
.../resources/{ => earthquake}/earthquake-to-http.yaml | 0
.../test/resources/{ => kafka}/kafka-sink-pipe.yaml| 0
.../test/resources/{ => kafka}/kafka-source-pipe.yaml | 0
.../src/test/resources/kafka/yaks-config.yaml | 4 ++--
.../src/test/resources/{ => mail}/mail-server.groovy | 2 ++
.../src/test/resources/mail/mail-sink.feature | 4 ++--
.../src/test/resources/{ => mail}/timer-to-mail.yaml | 0
.../src/test/resources/mail/yaks-config.yaml | 4 ++--
.../src/test/resources/{ => openapi}/openapi.json | 0
.../src/test/resources/{ => openapi}/pet.json | 0
.../{ => openapi}/rest-openapi-sink-pipe.yaml | 0
.../src/test/resources/openapi/yaks-config.yaml| 6 +++---
.../direct-to-salesforce-delete-pipe.yaml | 0
.../direct-to-salesforce-update-pipe.yaml | 0
.../{ => salesforce}/salesforce-credentials.properties | 0
.../{ => salesforce}/timer-to-salesforce-pipe.yaml | 0
.../src/test/resources/salesforce/yaks-config.yaml | 8
.../test/resources/{ => timer}/timer-to-http-pipe.yaml | 0
.../test/resources/{ => timer}/timer-to-http.groovy| 3 ++-
.../resources/{ => timer}/timer-to-http.properties | 0
.../src/test/resources/timer/yaks-config.yaml | 6 +++---
.../{ => transformation}/data-type-action-pipe.yaml| 0
.../extract-field-action-pipe.yaml | 0
.../{ => transformation}/insert-field-action-pipe.yaml | 0
.../src/test/resources/transformation/yaks-config.yaml | 6 +++---
58 files changed, 87 insertions(+), 79 deletions(-)
diff --git a/pom.xml b/pom.xml
index ae804c75..28c3da51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,9 +65,9 @@
4.5.0
2.2.0
-4.1.0
+4.2.0
7.16.1
-0.17.1
+0.19.0
diff --git a/tests/camel-kamelets-itest/pom.xml
b/tests/camel-kamelets-itest/pom.xml
index 8936902e..b80a77dd 100644
--- a/tests/camel-kamelets-itest/pom.xml
+++ b/tests/camel-kamelets-itest/pom.xml
@@ -46,6 +46,13 @@
pom
import
+
+org.citrusframework.yaks
+yaks-bom
Re: [PR] chore: Fix YAKS tests for Camel 4.5.0 [camel-kamelets]
oscerd merged PR #1986: URL: https://github.com/apache/camel-kamelets/pull/1986 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-2040921020 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8577986475-1444-74898f8b-788e-4df9-9628-c8591a69af46 * Camel Quarkus Commit: dbda9a01d274793e8c724df0f4bb615c9b604eee * Quarkus Main Commit: e9843295ea9827235f46a3ccdd2818de33248092 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8577986475 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new bc088f68d chore: changelog automatic update bc088f68d is described below commit bc088f68d4f0bfe83f9f71513f78b1dca1c1e955 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Apr 6 01:12:05 2024 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d6f1da7..0ab05d573 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,10 @@ **Closed issues:** - Annotations for dapr.io Sidecar Not Applied in Camel K Integration Deployment [\#5313](https://github.com/apache/camel-k/issues/5313) +- Update multi-arch release page description [\#5311](https://github.com/apache/camel-k/issues/5311) - Java CRDs plugin error [\#5310](https://github.com/apache/camel-k/issues/5310) - Upgrade error traces [\#5271](https://github.com/apache/camel-k/issues/5271) +- Support `kamel run ... -t camel.runtime-version=1.x` notation [\#4739](https://github.com/apache/camel-k/issues/4739) - Multi architecture support - Integrations [\#4149](https://github.com/apache/camel-k/issues/4149) ## [v2.3.0](https://github.com/apache/camel-k/tree/v2.3.0) (2024-04-02)
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-2040825999 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8577143635-1340-b2d525d9-ea28-4ffd-840c-5a6bf3abb19b * Camel Quarkus Commit: 79cb9fdd94d7d120290a0f082cef599af0f6eea7 * Camel Main Commit: e9843295ea9827235f46a3ccdd2818de33248092 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8577143635 -- 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: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.3.x by this push: new 4b71970d0 chore: nightly automatic updates 4b71970d0 is described below commit 4b71970d092e21bd6b1ebe4a167226f1e8f6d2e3 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Apr 6 00:31:48 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d6f1da7..0ab05d573 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,10 @@ **Closed issues:** - Annotations for dapr.io Sidecar Not Applied in Camel K Integration Deployment [\#5313](https://github.com/apache/camel-k/issues/5313) +- Update multi-arch release page description [\#5311](https://github.com/apache/camel-k/issues/5311) - Java CRDs plugin error [\#5310](https://github.com/apache/camel-k/issues/5310) - Upgrade error traces [\#5271](https://github.com/apache/camel-k/issues/5271) +- Support `kamel run ... -t camel.runtime-version=1.x` notation [\#4739](https://github.com/apache/camel-k/issues/4739) - Multi architecture support - Integrations [\#4149](https://github.com/apache/camel-k/issues/4149) ## [v2.3.0](https://github.com/apache/camel-k/tree/v2.3.0) (2024-04-02)
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 772d56d9e chore: nightly automatic updates 772d56d9e is described below commit 772d56d9e4fa04f1e9ad065e210d6a650e47de48 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Apr 5 23:46:25 2024 + chore: nightly automatic updates --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cc0f189a..2a4defd0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,19 @@ **Closed issues:** - Annotations for dapr.io Sidecar Not Applied in Camel K Integration Deployment [\#5313](https://github.com/apache/camel-k/issues/5313) +- Update multi-arch release page description [\#5311](https://github.com/apache/camel-k/issues/5311) - Java CRDs plugin error [\#5310](https://github.com/apache/camel-k/issues/5310) - Upgrade error traces [\#5271](https://github.com/apache/camel-k/issues/5271) +- Support `kamel run ... -t camel.runtime-version=1.x` notation [\#4739](https://github.com/apache/camel-k/issues/4739) - Multi architecture support - Integrations [\#4149](https://github.com/apache/camel-k/issues/4149) **Merged pull requests:** +- feat\(trait\): allow usage of semver for camel.runtime-version [\#5327](https://github.com/apache/camel-k/pull/5327) ([squakez](https://github.com/squakez)) +- doc: adjust nightly release description [\#5325](https://github.com/apache/camel-k/pull/5325) ([squakez](https://github.com/squakez)) +- chore\(deps\): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 [\#5323](https://github.com/apache/camel-k/pull/5323) ([dependabot[bot]](https://github.com/apps/dependabot)) +- chore: Upgrade golang.org/x/net [\#5322](https://github.com/apache/camel-k/pull/5322) ([gansheer](https://github.com/gansheer)) +- chore\(deps\): bump github.com/prometheus/common from 0.51.1 to 0.52.2 [\#5320](https://github.com/apache/camel-k/pull/5320) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump github.com/prometheus/client\_model from 0.6.0 to 0.6.1 [\#5319](https://github.com/apache/camel-k/pull/5319) ([dependabot[bot]](https://github.com/apps/dependabot)) - fix\(cli\): openshift cli install rbac path [\#5316](https://github.com/apache/camel-k/pull/5316) ([gansheer](https://github.com/gansheer)) - fix\(ci\): plugin failure [\#5312](https://github.com/apache/camel-k/pull/5312) ([squakez](https://github.com/squakez))
[PR] chore: Fix YAKS tests for Camel 4.5.0 [camel-kamelets]
christophd opened a new pull request, #1986: URL: https://github.com/apache/camel-kamelets/pull/1986 - Update Apache Camel runtime to 4.5.0 - Use Citrus 4.2.0 - Update YAKS 0.19.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
Re: [PR] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
ppalaga commented on PR #5968: URL: https://github.com/apache/camel-quarkus/pull/5968#issuecomment-2040521385 > > executing the script as a part of Maven build > > How would that work on Windows? It works flawlessly on GH Actions Windows hosts, when shell is set to bash and openssl is installed (no idea how to install it, it's there OOtB on GHA Windows runners). The same works locally for sure. Is that a satisfactory answer? -- 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] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
jamesnetherton commented on PR #5968: URL: https://github.com/apache/camel-quarkus/pull/5968#issuecomment-2040496665 > executing the script as a part of Maven build How would that work on Windows? -- 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] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
ppalaga commented on PR #5968: URL: https://github.com/apache/camel-quarkus/pull/5968#issuecomment-2040472314 I'd personally vote for not having those certs checked in in git but rather executing the script as a part of Maven build as we do in QCXF https://github.com/quarkiverse/quarkus-cxf/blob/e7cb0f50eceb03af8adea31c5403dd8b5554e2b7/integration-tests/mtls/pom.xml#L78-L96 In that way, we can stay sure that the script works and it will also keep working 10001 days from now. -- 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] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
ppalaga commented on code in PR #5968:
URL: https://github.com/apache/camel-quarkus/pull/5968#discussion_r1554166062
##
integration-test-groups/http/common/generate-certs.sh:
##
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# 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.
+#
+
+set -e
+set -x
+
+invocationDir="$(pwd)"
+workDir="target/openssl-work"
+destinationDir="src/main/resources/jsse"
+keySize=2048
+days=1
+extFile="$(pwd)/v3.ext"
+encryptionAlgo="aes-256-cbc"
+
+if [[ -n "${JAVA_HOME}" ]] ; then
+ keytool="$JAVA_HOME/bin/keytool"
+elif ! [[ -x "$(command -v keytool)" ]] ; then
+ echo 'Error: Either add keytool to PATH or set JAVA_HOME' >&2
+ exit 1
+else
+ keytool="keytool"
+fi
+
+if ! [[ -x "$(command -v openssl)" ]] ; then
+ echo 'Error: openssl is not installed.' >&2
+ exit 1
+fi
+
+mkdir -p "$workDir"
+mkdir -p "$destinationDir"
+
+# Certificate authority
+openssl genrsa -out "$workDir/ca.key" $keySize
+openssl req -x509 -new -subj '/O=apache.org/OU=eng (NOT FOR PRODUCTION)/CN=ca'
-key "$workDir/ca.key" -nodes -out "$workDir/ca.pem" -days $days -extensions
v3_req
+openssl req -new -subj '/O=apache.org/OU=eng (NOT FOR PRODUCTION)/CN=ca' -x509
-key "$workDir/ca.key" -days $days -out "$workDir/ca.crt"
+
+for actor in localhost; do
+ # Generate keys
Review Comment:
It is copied from a place where there were more actors. The loop could be
removed, but OTOH, maybe we'll want to test mTLS one day?
--
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 3.8.x updated: Improve the testability against Quarkus Platform BOMs
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.8.x by this push:
new 760c64c783 Improve the testability against Quarkus Platform BOMs
760c64c783 is described below
commit 760c64c7836e353f0828cbb41ad435484d7f3d2b
Author: Peter Palaga
AuthorDate: Thu Apr 4 14:32:01 2024 +0200
Improve the testability against Quarkus Platform BOMs
---
integration-tests-support/pom.xml | 25 +++--
integration-tests/messaging/common/pom.xml | 145 -
integration-tests/messaging/jms/pom.xml| 94 +++
integration-tests/messaging/sjms/pom.xml | 93 ++
4 files changed, 201 insertions(+), 156 deletions(-)
diff --git a/integration-tests-support/pom.xml
b/integration-tests-support/pom.xml
index e2b853da77..b92b45ee22 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -35,6 +35,17 @@
so that we can keep a flat hierarchy in the integration-tests
directory.
+
+
+io.quarkus
+
quarkus-bom
+${quarkus.version}
+
org.apache.camel.quarkus
+
camel-quarkus-bom
+
3.8.2-SNAPSHOT
+3.8.2-SNAPSHOT
+
+
activemq
aws2
@@ -61,23 +72,23 @@
-io.quarkus
-quarkus-bom
-${quarkus.version}
+${quarkus.platform.group-id}
+${quarkus.platform.artifact-id}
+${quarkus.platform.version}
pom
import
-org.apache.camel.quarkus
-camel-quarkus-bom
-${project.version}
+${camel-quarkus.platform.group-id}
+${camel-quarkus.platform.artifact-id}
+${camel-quarkus.platform.version}
pom
import
org.apache.camel.quarkus
camel-quarkus-bom-test
-${project.version}
+${camel-quarkus.version}
pom
import
diff --git a/integration-tests/messaging/common/pom.xml
b/integration-tests/messaging/common/pom.xml
index c682f013a5..05d8021ff7 100644
--- a/integration-tests/messaging/common/pom.xml
+++ b/integration-tests/messaging/common/pom.xml
@@ -74,73 +74,6 @@
rest-assured
test
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-bean-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-direct-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-jta-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-mock-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-xml-jaxp-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
@@ -159,5 +92,83 @@
+
+
+virtualDependencies
+
+
+!noVirtualDependencies
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bean-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct-deployment
+${project.version}
+pom
+test
+
+
+*
+*
Re: [PR] [3.8.x] Improve the testability against Quarkus Platform BOMs [camel-quarkus]
ppalaga merged PR #5960: URL: https://github.com/apache/camel-quarkus/pull/5960 -- 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: Improve the testability against Quarkus Platform BOMs
This is an automated email from the ASF dual-hosted git repository.
ppalaga 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 e9843295ea Improve the testability against Quarkus Platform BOMs
e9843295ea is described below
commit e9843295ea9827235f46a3ccdd2818de33248092
Author: Peter Palaga
AuthorDate: Thu Apr 4 14:32:01 2024 +0200
Improve the testability against Quarkus Platform BOMs
---
integration-tests-support/pom.xml | 25 +++--
integration-tests/messaging/common/pom.xml | 145 -
integration-tests/messaging/jms/pom.xml| 94 +++
integration-tests/messaging/sjms/pom.xml | 93 ++
4 files changed, 201 insertions(+), 156 deletions(-)
diff --git a/integration-tests-support/pom.xml
b/integration-tests-support/pom.xml
index eec1f1deed..edb59accd7 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -35,6 +35,17 @@
so that we can keep a flat hierarchy in the integration-tests
directory.
+
+
+io.quarkus
+
quarkus-bom
+${quarkus.version}
+
org.apache.camel.quarkus
+
camel-quarkus-bom
+
3.10.0-SNAPSHOT
+3.10.0-SNAPSHOT
+
+
activemq
aws2
@@ -61,23 +72,23 @@
-io.quarkus
-quarkus-bom
-${quarkus.version}
+${quarkus.platform.group-id}
+${quarkus.platform.artifact-id}
+${quarkus.platform.version}
pom
import
-org.apache.camel.quarkus
-camel-quarkus-bom
-${project.version}
+${camel-quarkus.platform.group-id}
+${camel-quarkus.platform.artifact-id}
+${camel-quarkus.platform.version}
pom
import
org.apache.camel.quarkus
camel-quarkus-bom-test
-${project.version}
+${camel-quarkus.version}
pom
import
diff --git a/integration-tests/messaging/common/pom.xml
b/integration-tests/messaging/common/pom.xml
index e60d26fa45..3fb7f3ce1a 100644
--- a/integration-tests/messaging/common/pom.xml
+++ b/integration-tests/messaging/common/pom.xml
@@ -74,73 +74,6 @@
rest-assured
test
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-bean-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-direct-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-jta-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-mock-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
-camel-quarkus-xml-jaxp-deployment
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
@@ -159,5 +92,83 @@
+
+
+virtualDependencies
+
+
+!noVirtualDependencies
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bean-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct-deployment
+${project.version}
+pom
+test
+
+
+*
+*
Re: [PR] Improve the testability against Quarkus Platform BOMs [camel-quarkus]
ppalaga merged PR #5961: URL: https://github.com/apache/camel-quarkus/pull/5961 -- 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] Improve the testability against Quarkus Platform BOMs [camel-quarkus]
ppalaga commented on PR #5961: URL: https://github.com/apache/camel-quarkus/pull/5961#issuecomment-2040388624 The failure on Windows due to occupied port seems to be intermittent. Thus merging. -- 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] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
aldettinger commented on code in PR #5968:
URL: https://github.com/apache/camel-quarkus/pull/5968#discussion_r1554022773
##
integration-test-groups/http/common/generate-certs.sh:
##
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# 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.
+#
+
+set -e
+set -x
+
+invocationDir="$(pwd)"
+workDir="target/openssl-work"
+destinationDir="src/main/resources/jsse"
+keySize=2048
+days=1
+extFile="$(pwd)/v3.ext"
+encryptionAlgo="aes-256-cbc"
+
+if [[ -n "${JAVA_HOME}" ]] ; then
+ keytool="$JAVA_HOME/bin/keytool"
+elif ! [[ -x "$(command -v keytool)" ]] ; then
+ echo 'Error: Either add keytool to PATH or set JAVA_HOME' >&2
+ exit 1
+else
+ keytool="keytool"
+fi
+
+if ! [[ -x "$(command -v openssl)" ]] ; then
+ echo 'Error: openssl is not installed.' >&2
+ exit 1
+fi
+
+mkdir -p "$workDir"
+mkdir -p "$destinationDir"
+
+# Certificate authority
+openssl genrsa -out "$workDir/ca.key" $keySize
+openssl req -x509 -new -subj '/O=apache.org/OU=eng (NOT FOR PRODUCTION)/CN=ca'
-key "$workDir/ca.key" -nodes -out "$workDir/ca.pem" -days $days -extensions
v3_req
+openssl req -new -subj '/O=apache.org/OU=eng (NOT FOR PRODUCTION)/CN=ca' -x509
-key "$workDir/ca.key" -days $days -out "$workDir/ca.crt"
+
+for actor in localhost; do
+ # Generate keys
Review Comment:
So actor = localhost ? What's the purpose of the loop then ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel) 05/11: Fixed license format on the matrix Jenkinsfiles
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git commit e9b3c9345d8a4330b78b6f087281834931b5 Author: Otavio Rodolfo Piske AuthorDate: Fri Apr 5 11:28:50 2024 +0200 Fixed license format on the matrix Jenkinsfiles --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 1e1fe8f3aab..fa8908cfa71 100644 --- a/pom.xml +++ b/pom.xml @@ -339,6 +339,8 @@ SCRIPT_STYLE SCRIPT_STYLE SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE
(camel) 04/11: Updated the pipeline to consolidate all the CI automation in a single file.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 32aaad2d7136879a2d02ed907ebc436d4d3b0a49
Author: Vaishnavi R
AuthorDate: Mon Apr 1 14:10:00 2024 +0530
Updated the pipeline to consolidate all the CI automation in a single file.
---
...file.matrix.node => Jenkinsfile.matrix.platform | 52 --
1 file changed, 38 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile.matrix.node b/Jenkinsfile.matrix.platform
similarity index 60%
rename from Jenkinsfile.matrix.node
rename to Jenkinsfile.matrix.platform
index f7fea84d4fb..ce495830e20 100644
--- a/Jenkinsfile.matrix.node
+++ b/Jenkinsfile.matrix.platform
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//def AGENT_LABEL = 'ppc64le'
+//def PLATFORM = 'ppc64le'
//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?:
"-Dkafka.instance.type=local-strimzi-container -Dci.env.name=apache.org"
+def MAVEN_TEST_PARAMS_UBUNTU = env.MAVEN_TEST_PARAMS ?:
"-Dci.env.name=apache.org"
/*
Below parameters are required for camel/core/camel-core module's test cases to
pass
- xpathExprGrpLimit: limits the number of groups an Xpath expression can
contain
@@ -41,7 +42,8 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
-choice(name: 'AGENT_NODE_FILTER', choices: ['all', 'ppc64le',
's390x'], description: 'Run on specific node'),
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
+choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform'),
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
@@ -49,11 +51,11 @@ pipeline {
stage('BuildAndTest') {
matrix {
agent {
-label ${AGENT_LABEL}
+label ${PLATFORM}
}
when { anyOf {
-expression { params.AGENT_NODE_FILTER == 'all' }
-expression { params.AGENT_NODE_FILTER == env.AGENT_LABEL }
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
expression { params.JDK_FILTER == 'all' }
expression { params.JDK_FILTER == env.JDK_NAME }
} }
@@ -63,8 +65,8 @@ pipeline {
values 'jdk_17_latest', 'jdk_21_latest'
}
axis {
-name 'AGENT_LABEL'
-values 'ppc64le', 's390x'
+name 'PLATFORM'
+values 'ppc64le', 's390x', 'ubuntu'
}
}
excludes {
@@ -74,7 +76,7 @@ pipeline {
values 'jdk_21_latest'
}
axis {
-name 'AGENT_LABEL'
+name 'PLATFORM'
values 'ppc64le'
}
}
@@ -84,7 +86,7 @@ pipeline {
values 'jdk_21_latest'
}
axis {
-name 'AGENT_LABEL'
+name 'PLATFORM'
values 's390x'
}
}
@@ -107,19 +109,41 @@ pipeline {
branch 'main'
}*/
steps {
-echo "Do Build for ${AGENT_LABEL}-${JDK_NAME}"
+echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+if(${PLATFORM} == "ubuntu"){
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+} else {
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+}
+}
+}
+
+if(${PLATFORM} == "ubuntu") {
+sta
(camel) 09/11: Improve stage name for multi-arch builds
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 57f731c8cc191fba8125ea24623dd266658d462c
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 14:13:33 2024 +0200
Improve stage name for multi-arch builds
---
Jenkinsfile.matrix.platform | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 04ebb4efd7d..020abcaf3ca 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -104,7 +104,7 @@ pipeline {
}
}
-stage('Build & Install') {
+stage("Build ${PLATFORM}-${JDK_NAME}") {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
(camel) 07/11: Fixed few syntax errors.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 956552fdf9d41aa692e1befefabd738a28ae7c15
Author: Vaishnavi R
AuthorDate: Fri Apr 5 16:29:57 2024 +0530
Fixed few syntax errors.
---
Jenkinsfile.matrix.platform | 62 -
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7dabd12ea7b..7e12dd485ab 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -42,7 +42,7 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace')
-booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads on JDK 21 and newer')
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform')
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
@@ -51,16 +51,14 @@ pipeline {
stage('BuildAndTest') {
matrix {
agent {
-label ${PLATFORM}
-}
-when {
-anyOf {
-expression { params.PLATFORM_FILTER == 'all' }
-expression { params.PLATFORM_FILTER == env.PLATFORM }
-expression { params.JDK_FILTER == 'all' }
-expression { params.JDK_FILTER == env.JDK_NAME }
-}
+label "${PLATFORM}"
}
+when { anyOf {
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+} }
axes {
axis {
name 'JDK_NAME'
@@ -94,7 +92,7 @@ pipeline {
}
}
tools {
-jdk ${JDK_NAME}
+jdk "${JDK_NAME}"
}
stages {
stage('Clean workspace') {
@@ -113,38 +111,44 @@ pipeline {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-if(${PLATFORM} == "ubuntu"){
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
-} else {
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+script {
+if(${PLATFORM} == "ubuntu"){
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+} else {
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+}
}
}
}
-if(${PLATFORM} == "ubuntu") {
-stage('Code Quality Review') {
-steps {
-withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
-sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+script {
+if("${PLATFORM}" == "ubuntu") {
+stage('Code Quality Review') {
+steps {
+withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
+sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+}
(camel) 10/11: Fixed few syntax errors.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 71e6d0901cb59be177c0c1dda1294a4401ba2f2b
Author: Vaishnavi R
AuthorDate: Fri Apr 5 19:22:33 2024 +0530
Fixed few syntax errors.
---
Jenkinsfile.matrix.platform | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 020abcaf3ca..2897ef44a5a 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -135,10 +135,10 @@ pipeline {
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
-if (${PLATFORM} == "ubuntu"){
-if(${JDK_NAME} == "jdk_21_latest") {
+if ("${PLATFORM}" == "ubuntu") {
+if ("${JDK_NAME}" == "jdk_21_latest") {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify
-Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD}"
-} else{
+} else {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true
-Dcheckstyle.skip=true verify"
}
} else {
(camel) 08/11: Fixed build on the CI
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 234515ba147bc62fc97b8de17bd18ab9a8df06f5
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 13:39:54 2024 +0200
Fixed build on the CI
Also temporarily disabled a few steps to prevent problems for the actual
jobs
---
Jenkinsfile.matrix.platform | 30 +-
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7e12dd485ab..04ebb4efd7d 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -105,29 +105,25 @@ pipeline {
}
stage('Build & Install') {
-/*when {
-branch 'main'
-}*/
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-script {
-if(${PLATFORM} == "ubuntu"){
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
-} else {
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
-}
-}
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
}
}
-
-script {
-if("${PLATFORM}" == "ubuntu") {
-stage('Code Quality Review') {
-steps {
+
+stage('Code Quality Review') {
+steps {
+script {
+if ("${PLATFORM}" == "ubuntu") {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
-sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+/*
+* sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+*/
+echo "Code quality review ENABLED for
${PLATFORM}"
}
+} else {
+echo "Code quality review disabled for
${PLATFORM}"
}
}
}
@@ -139,7 +135,7 @@ pipeline {
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
-if(${PLATFORM} == "ubuntu"){
+if (${PLATFORM} == "ubuntu"){
if(${JDK_NAME} == "jdk_21_latest") {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify
-Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD}"
} else{
(camel) 03/11: Martix Jenkins pipeline for CI/CD.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4e55a407f3f752a51a13fa5abad54203ac53cf0
Author: Vaishnavi R
AuthorDate: Thu Mar 28 14:42:37 2024 +0530
Martix Jenkins pipeline for CI/CD.
---
Jenkinsfile.matrix.jdk | 115 +
Jenkinsfile.matrix.node | 147
2 files changed, 262 insertions(+)
diff --git a/Jenkinsfile.matrix.jdk b/Jenkinsfile.matrix.jdk
new file mode 100644
index 000..c68d0073a6a
--- /dev/null
+++ b/Jenkinsfile.matrix.jdk
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+
+def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
+def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.org"
+
+pipeline {
+
+agent {
+label AGENT_LABEL
+}
+
+environment {
+MAVEN_SKIP_RC = true
+}
+
+options {
+buildDiscarder(
+logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+)
+disableConcurrentBuilds()
+}
+
+parameters {
+booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
+choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
+}
+stages {
+stage('BuildAndTest') {
+matrix {
+when { anyOf {
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+} }
+axes {
+axis {
+name 'JDK_NAME'
+values 'jdk_17_latest', 'jdk_21_latest'
+}
+}
+tools {
+jdk ${JDK_NAME}
+}
+stages {
+stage('Clean workspace') {
+when {
+expression { params.CLEAN }
+}
+steps {
+sh 'git clean -fdx'
+}
+}
+
+stage('Build & Install') {
+steps {
+echo "Do Build for ${JDK_NAME}"
+sh 'java -version'
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+}
+}
+
+stage('Code Quality Review') {
+steps {
+withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
+sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+}
+}
+}
+
+stage('Test') {
+steps {
+echo "Do Test for ${JDK_NAME}"
+sh 'java -version'
+timeout(unit: 'HOURS', time: 7) {
+sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS
-Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true
verify"
+}
+}
+post {
+always {
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
+junit allowEmptyResults: true, testResults:
'**/target/failsafe-reports/*.xml'
+
(camel) 01/11: CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git commit 14017832bef37df4a9e4f17334bbe2542ddf44a6 Author: Otavio Rodolfo Piske AuthorDate: Wed Mar 20 11:16:25 2024 +0100 CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job --- Jenkinsfile.jdk17 => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Jenkinsfile.jdk17 b/Jenkinsfile similarity index 100% rename from Jenkinsfile.jdk17 rename to Jenkinsfile
(camel) 02/11: Fixed license format on the Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git commit 2e6c3fd4d8a274b0210aaebc69de8389d45de7c2 Author: Otavio Rodolfo Piske AuthorDate: Wed Mar 20 11:26:47 2024 +0100 Fixed license format on the Jenkinsfile --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 6c1ded35405..1e1fe8f3aab 100644 --- a/pom.xml +++ b/pom.xml @@ -338,6 +338,7 @@ SCRIPT_STYLE SCRIPT_STYLE SCRIPT_STYLE +SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE
(camel) 11/11: Used single quotes instead of double and removed java -version step.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6814fbf40730cdcf9d0ae8df47c8d2990feac230
Author: Vaishnavi R
AuthorDate: Fri Apr 5 20:04:41 2024 +0530
Used single quotes instead of double and removed java -version step.
---
Jenkinsfile.matrix.platform | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 2897ef44a5a..781ab33141d 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -104,7 +104,7 @@ pipeline {
}
}
-stage("Build ${PLATFORM}-${JDK_NAME}") {
+stage('Build ${PLATFORM}-${JDK_NAME}') {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
@@ -132,7 +132,6 @@ pipeline {
stage('Test') {
steps {
echo "Do Test for ${PLATFORM}-${JDK_NAME}"
-sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
if ("${PLATFORM}" == "ubuntu") {
(camel) 06/11: Fixed a few syntax errors on the Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5eb1e73bfe091f74aef85c3b8c64af3f8ca22daa
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 11:40:21 2024 +0200
Fixed a few syntax errors on the Jenkinsfile
---
Jenkinsfile.matrix.platform | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index ce495830e20..7dabd12ea7b 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -41,9 +41,9 @@ pipeline {
}
parameters {
-booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
-booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
-choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform'),
+booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace')
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads on JDK 21 and newer')
+choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform')
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
@@ -53,12 +53,14 @@ pipeline {
agent {
label ${PLATFORM}
}
-when { anyOf {
-expression { params.PLATFORM_FILTER == 'all' }
-expression { params.PLATFORM_FILTER == env.PLATFORM }
-expression { params.JDK_FILTER == 'all' }
-expression { params.JDK_FILTER == env.JDK_NAME }
-} }
+when {
+anyOf {
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+}
+}
axes {
axis {
name 'JDK_NAME'
(camel) branch devel-camel-20383 updated (0ff40e3491a -> 6814fbf4073)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git discard 0ff40e3491a Improve stage name for multi-arch builds discard d05d79d4dfc Fixed build on the CI discard f71d04cd435 Fixed few syntax errors. discard edca299578c Fixed a few syntax errors on the Jenkinsfile discard 1ffcd9208a2 Fixed license format on the matrix Jenkinsfiles discard 61ef63c4e9d Updated the pipeline to consolidate all the CI automation in a single file. discard 107d58ecd3d Martix Jenkins pipeline for CI/CD. discard fbea21c165e Fixed license format on the Jenkinsfile discard f7cd8863801 CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job add c4499beb638 CAMEL-19543 - camel-sjms2: replace Thread.sleep in tests. add d5e89dacfec CAMEL-20640: Remove unused and old openapi v2 stuff add 9e563446713 Fixed missing license information on the top of the files new 14017832bef CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job new 2e6c3fd4d8a Fixed license format on the Jenkinsfile new f4e55a407f3 Martix Jenkins pipeline for CI/CD. new 32aaad2d713 Updated the pipeline to consolidate all the CI automation in a single file. new e9b3c9345d8 Fixed license format on the matrix Jenkinsfiles new 5eb1e73bfe0 Fixed a few syntax errors on the Jenkinsfile new 956552fdf9d Fixed few syntax errors. new 234515ba147 Fixed build on the CI new 57f731c8cc1 Improve stage name for multi-arch builds new 71e6d0901cb Fixed few syntax errors. new 6814fbf4073 Used single quotes instead of double and removed java -version step. 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 (0ff40e3491a) \ N -- N -- N refs/heads/devel-camel-20383 (6814fbf4073) 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: Jenkinsfile.matrix.platform| 9 - .../camel/openapi/DefaultRestDefinitionsResolver.java | 6 -- .../apache/camel/openapi/RestDefinitionsResolver.java | 2 -- .../org/apache/camel/openapi/RestOpenApiReader.java| 3 --- .../camel/openapi/jmx/JmxRestDefinitionsResolver.java | 18 -- .../sjms2/consumer/InOnlyTopicDurableConsumerTest.java | 13 +++-- .../infra/openldap/services/OpenLdapContainer.java | 17 + .../test/infra/redis/services/RedisContainer.java | 17 + 8 files changed, 49 insertions(+), 36 deletions(-)
Re: [PR] Create an example project for vertx-websocket #5111 [camel-quarkus-examples]
spatnity commented on code in PR #206: URL: https://github.com/apache/camel-quarkus-examples/pull/206#discussion_r1553734407 ## vertx-websocket-chat/pom.xml: ## @@ -0,0 +1,312 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + +camel-quarkus-examples-vertx-websocket-chat +org.apache.camel.quarkus.examples +3.9.0 Review Comment: Yeah followed the same, I think I refered to one of the examples of main branch's pom instead of camel-quarkus-main:( I'll correct 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 an example project for vertx-websocket #5111 [camel-quarkus-examples]
spatnity commented on code in PR #206: URL: https://github.com/apache/camel-quarkus-examples/pull/206#discussion_r1553734407 ## vertx-websocket-chat/pom.xml: ## @@ -0,0 +1,312 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + +camel-quarkus-examples-vertx-websocket-chat +org.apache.camel.quarkus.examples +3.9.0 Review Comment: Yeah followed the same, I think I refered to tone of the examples of main branch's pom instead of camel-quarkus-main:( I'll correct 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 an example project for vertx-websocket #5111 [camel-quarkus-examples]
spatnity commented on code in PR #206: URL: https://github.com/apache/camel-quarkus-examples/pull/206#discussion_r1553734407 ## vertx-websocket-chat/pom.xml: ## @@ -0,0 +1,312 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + +camel-quarkus-examples-vertx-websocket-chat +org.apache.camel.quarkus.examples +3.9.0 Review Comment: Yeah followed the same, I think I refered to the main branch instead of camel-quarkus-main:( I'll correct 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 an example project for vertx-websocket #5111 [camel-quarkus-examples]
jamesnetherton commented on code in PR #206:
URL:
https://github.com/apache/camel-quarkus-examples/pull/206#discussion_r1553713073
##
vertx-websocket-chat/pom.xml:
##
@@ -0,0 +1,312 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+camel-quarkus-examples-vertx-websocket-chat
+org.apache.camel.quarkus.examples
+3.9.0
Review Comment:
I would copy this pom.xml and add adjust it for what you need:
https://github.com/apache/camel-quarkus-examples/blob/camel-quarkus-main/timer-log/pom.xml
That way the project version and the BOM groupId / artifactId will be set up
correctly.
##
vertx-websocket-chat/pom.xml:
##
@@ -0,0 +1,312 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+camel-quarkus-examples-vertx-websocket-chat
+org.apache.camel.quarkus.examples
+3.9.0
+
+Camel Quarkus :: Examples :: Vertx-Websocket chat
+Camel Quarkus Example ::Implementing Websocket
+
+
+3.9.1
+
${quarkus.platform.version}
+
+
+3.9.0
+
+
io.quarkus.platform
+
quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
+
+UTF-8
+
UTF-8
+17
+17
+
${maven.compiler.target}
+
${maven.compiler.source}
+
+2.23.0
+1.9.0
+4.2
+3.11.0
+3.3.0
+3.3.1
+3.1.2
+
+
${project.build.directory}/quarkus-app/quarkus-run.jar
+
+
+
+
+
+
+${quarkus.platform.group-id}
+${quarkus.platform.artifact-id}
+${quarkus.platform.version}
+pom
+import
+
+
+${camel-quarkus.platform.group-id}
+${camel-quarkus.platform.artifact-id}
+${camel-quarkus.platform.version}
+pom
+import
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom-test
+${camel-quarkus.version}
+pom
+import
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bean
+
+
+org.apache.camel.quarkus
+camel-quarkus-jackson
+
+
+org.apache.camel.quarkus
+camel-quarkus-vertx-websocket
+
+
+org.apache.camel.quarkus
+camel-quarkus-direct
+
+
+org.apache.camel.quarkus
+camel-quarkus-rest
+
+
+io.quarkus
+quarkus-arc
+
+
+
+
+io.quarkus
+quarkus-junit5
+test
+
+
+
+
+
+
+
+
+net.revelc.code.formatter
+formatter-maven-plugin
+${formatter-maven-plugin.version}
+
+
${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml
Review Comment:
You'll need to add the `eclipse-formatter-config.xml` to this project. You
can copy it from one of the other examples.
##
vertx-websocket-chat/README.md:
##
@@ -0,0 +1,57 @@
+= Vertx-Websocket Chat: A Camel Quarkus example
+:cq-example-description: Demonstration of how to configure a WebSocket server
and interact with connected peers.
+
+{cq-description}
+
+TIP: Check the
https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus
User guide] for prerequisites
+and other general information.
+
+== Start in the Development mode
+
+You can run your application in dev mode that enables live coding using:
+
+[source,shell]
+
+$ mvn compile quarkus:dev
+
+
+The above command compiles the project, starts the application and lets the
Quarkus tooling watch for changes in your
+workspace. Any modifications in your project will automatically take effect in
the running application.You can find the application running
http://localhost:8080
+
+
+TIP: Please refer to the Development mode section of
+https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel
Quarkus User guide] for more details.
+
+As we run the example in Quarkus Dev Mode, you can connect to the websocket by
providing a username.Once you connect, you can see a chat room where you can
send/receive messages to a specific peer or all the peers connected.
+
+=== Package and run the application
+
+Once you are done with developing you may want to package and run the
(camel) branch main updated: Fixed missing license information on the top of the files
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 9e563446713 Fixed missing license information on the top of the files 9e563446713 is described below commit 9e563446713838887fa969aed0b4c59caeb71fea Author: Otavio Rodolfo Piske AuthorDate: Fri Apr 5 15:47:05 2024 +0200 Fixed missing license information on the top of the files --- .../test/infra/openldap/services/OpenLdapContainer.java | 17 + .../camel/test/infra/redis/services/RedisContainer.java | 17 + 2 files changed, 34 insertions(+) diff --git a/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenLdapContainer.java b/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenLdapContainer.java index ccb6a0a33ea..11a2dcd9e44 100644 --- a/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenLdapContainer.java +++ b/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenLdapContainer.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.camel.test.infra.openldap.services; import org.apache.camel.test.infra.common.LocalPropertyResolver; diff --git a/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisContainer.java b/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisContainer.java index 3faa09ac373..44b5d60520d 100644 --- a/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisContainer.java +++ b/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisContainer.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.camel.test.infra.redis.services; import org.apache.camel.test.infra.common.LocalPropertyResolver;
Re: [PR] (chores) minor test infra cleanup [camel]
orpiske commented on PR #13703: URL: https://github.com/apache/camel/pull/13703#issuecomment-2039820818 > license header is missing in top of files Sorry I missed your comment. No idea why IntelliJ missed this. -- 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] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
JiriOndrusek opened a new pull request, #5969: URL: https://github.com/apache/camel-quarkus/pull/5969 cherry-picked 6de376f77cf61a5c627aeb00064fc50e880e23f6 Upstream PR: https://github.com/apache/camel-quarkus/pull/5968 -- 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] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
JiriOndrusek commented on PR #5968: URL: https://github.com/apache/camel-quarkus/pull/5968#issuecomment-2039800154 I add *.pkcs12 and *.ext into ignored files for license check. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Http: use FIPS complaiant keystore and truststore [camel-quarkus]
JiriOndrusek opened a new pull request, #5968: URL: https://github.com/apache/camel-quarkus/pull/5968 fixes https://github.com/apache/camel-quarkus/issues/5966 -- 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] feat(core): Upgrade API kubernetes 1.28 [camel-k]
gansheer opened a new pull request, #5329: URL: https://github.com/apache/camel-k/pull/5329 Ref https://github.com/apache/camel-k/issues/5307 Upgrade to API kubernetes 1.28 **Release Note** ```release-note feat(core): Upgrade API kubernetes 1.28 ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix camel-vertx-websocket endpoint instantiation when connection to r… [camel]
github-actions[bot] commented on PR #13707: URL: https://github.com/apache/camel/pull/13707#issuecomment-2039724825 :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] Fix camel-vertx-websocket endpoint instantiation when connection to r… [camel]
alexisgra opened a new pull request, #13707: URL: https://github.com/apache/camel/pull/13707 …emote websocket server # Description While trying to migrate from `camel-ahc-ws` to `camel-vertx-websocket`, I encountered a problem with the `consumeAsClient` option. The remote server I was trying to interact with refused to upgrade to websocket because of invalid query parameters. Previously, endpoint properties were set after configuring the `websocketURI`. As a result, when using the endpoint with `consumeAsClient` option, endpoint properties were passed as query param (`consumeAsClient` for example). Some APIs reject upgrade to websocket when unknown parameters are passed in the call. The purpose of this commit is to set endpoint properties before configuring `websocketURI`. So properties are binded and removed from the parameters map before configuring the `websocketURI`. This is inspired by the way `VertxHttpEndpoint` is instantiated. I modified the endpoint instanciation and I added a test to verify that endpoint properties are correctly removed from the `websocketURI` query params. # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Create an example project for vertx-websocket #5111 [camel-quarkus-examples]
spatnity opened a new pull request, #206: URL: https://github.com/apache/camel-quarkus-examples/pull/206 Note that the `main` branch points at the latest stable Camel Quarkus release. Pull requests should be generally send against the `camel-quarkus-main` branch pointing at the current Camel Quarkus SNAPSHOT. -- 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-18017: copy headers from parsed MDN [camel]
jono-morris opened a new pull request, #13706: URL: https://github.com/apache/camel/pull/13706 # Description Copy headers from parsed MDN entity to maintain the exact ordering and formatting. This addresses the problem where entity headers are parsed and then possibly rewritten in a different order/format to that received resulting in the signature failing verification due to the differences. # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-18017: copy headers from parsed MDN [camel]
github-actions[bot] commented on PR #13706: URL: https://github.com/apache/camel/pull/13706#issuecomment-2039652407 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-18017: copy headers from parsed MDN [camel]
jono-morris commented on PR #13706: URL: https://github.com/apache/camel/pull/13706#issuecomment-2039651668 /component-test as2 -- 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-18017: copy headers from parsed MDN [camel]
github-actions[bot] commented on PR #13706: URL: https://github.com/apache/camel/pull/13706#issuecomment-2039650715 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch devel-camel-20383 updated: Improve stage name for multi-arch builds
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new 0ff40e3491a Improve stage name for multi-arch builds
0ff40e3491a is described below
commit 0ff40e3491a091475029abe1de075949f4925476
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 14:13:33 2024 +0200
Improve stage name for multi-arch builds
---
Jenkinsfile.matrix.platform | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 04ebb4efd7d..020abcaf3ca 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -104,7 +104,7 @@ pipeline {
}
}
-stage('Build & Install') {
+stage("Build ${PLATFORM}-${JDK_NAME}") {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
(camel) branch devel-camel-20383 updated (b3bb5ac0893 -> d05d79d4dfc)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git discard b3bb5ac0893 More small fixes discard 30ecd8aa73d More small fixes discard cd2e1e38bb2 More small fixes discard e89df9167a1 More small fixes discard 307b85fe579 More small fixes new d05d79d4dfc Fixed build on the CI 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 (b3bb5ac0893) \ N -- N -- N refs/heads/devel-camel-20383 (d05d79d4dfc) 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) 01/01: Fixed build on the CI
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d05d79d4dfcc33639ae4d3f76238555602007a8b
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 13:39:54 2024 +0200
Fixed build on the CI
Also temporarily disabled a few steps to prevent problems for the actual
jobs
---
Jenkinsfile.matrix.platform | 30 +-
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7e12dd485ab..04ebb4efd7d 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -105,29 +105,25 @@ pipeline {
}
stage('Build & Install') {
-/*when {
-branch 'main'
-}*/
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-script {
-if(${PLATFORM} == "ubuntu"){
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
-} else {
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
-}
-}
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
}
}
-
-script {
-if("${PLATFORM}" == "ubuntu") {
-stage('Code Quality Review') {
-steps {
+
+stage('Code Quality Review') {
+steps {
+script {
+if ("${PLATFORM}" == "ubuntu") {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
-sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+/*
+* sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+*/
+echo "Code quality review ENABLED for
${PLATFORM}"
}
+} else {
+echo "Code quality review disabled for
${PLATFORM}"
}
}
}
@@ -139,7 +135,7 @@ pipeline {
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
-if(${PLATFORM} == "ubuntu"){
+if (${PLATFORM} == "ubuntu"){
if(${JDK_NAME} == "jdk_21_latest") {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify
-Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD}"
} else{
(camel) branch devel-camel-20383 updated: More small fixes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new b3bb5ac0893 More small fixes
b3bb5ac0893 is described below
commit b3bb5ac0893047be20004c7f3d1f997cc05f7fc2
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 14:02:16 2024 +0200
More small fixes
---
Jenkinsfile.matrix.platform | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index c7074046dfc..04ebb4efd7d 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -108,9 +108,7 @@ pipeline {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-steps {
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
-}
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
}
}
(camel) branch devel-camel-20383 updated: More small fixes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new 30ecd8aa73d More small fixes
30ecd8aa73d is described below
commit 30ecd8aa73d3a4008f7b3217a891b17b52c77be2
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 13:56:48 2024 +0200
More small fixes
---
Jenkinsfile.matrix.platform | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index e15563043e4..c7074046dfc 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -105,18 +105,11 @@ pipeline {
}
stage('Build & Install') {
-/*when {
-branch 'main'
-}*/
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-script {
-if(${PLATFORM} == "ubuntu"){
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
-} else {
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
-}
+steps {
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
}
}
}
@@ -124,10 +117,15 @@ pipeline {
stage('Code Quality Review') {
steps {
script {
-if("${PLATFORM}" == "ubuntu") {
+if ("${PLATFORM}" == "ubuntu") {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
-sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+/*
+* sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+*/
+echo "Code quality review ENABLED for
${PLATFORM}"
}
+} else {
+echo "Code quality review disabled for
${PLATFORM}"
}
}
}
@@ -139,7 +137,7 @@ pipeline {
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
-if(${PLATFORM} == "ubuntu"){
+if (${PLATFORM} == "ubuntu"){
if(${JDK_NAME} == "jdk_21_latest") {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify
-Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD}"
} else{
Re: [I] List Camel's endpoint in the integrations status [camel-k]
lburgazzoli commented on issue #5241: URL: https://github.com/apache/camel-k/issues/5241#issuecomment-2039606130 I'd personally wait to see how/if things would be implemented in camel core -- 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] List Camel's endpoint in the integrations status [camel-k]
squakez commented on issue #5241: URL: https://github.com/apache/camel-k/issues/5241#issuecomment-2039594797 > I don't think this should be something to be included in the health endpoint but rather a dedicated endpoint Clear. What I mean is, while this is available on Camel core, should we start the development on the operator side? I guess that, when the new development is ready, then, we can easily change the endpoint to the new one. In the while, however, we'd be preparing all the required stuff on the operator side. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Camel-K doesn't create the Ingress resource although it is enabled in the Traits using Pipe or KameletBinding [camel-k]
squakez commented on issue #5044: URL: https://github.com/apache/camel-k/issues/5044#issuecomment-2039591048 Waiting for some feedback before closing this. -- 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] Bad revision when running jvm and native builds with knative [camel-k]
squakez commented on issue #5069: URL: https://github.com/apache/camel-k/issues/5069#issuecomment-2039590350 Waiting for some feedback before closing this. -- 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] Native build failed directly [camel-k]
squakez commented on issue #5080: URL: https://github.com/apache/camel-k/issues/5080#issuecomment-2039590035 Waiting for some feedback before closing this. -- 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 devel-camel-20383 updated: More small fixes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new cd2e1e38bb2 More small fixes
cd2e1e38bb2 is described below
commit cd2e1e38bb24cbb093c9d10832547258d8f14967
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 13:41:46 2024 +0200
More small fixes
---
Jenkinsfile.matrix.platform | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index e9d517f8583..e15563043e4 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -122,9 +122,9 @@ pipeline {
}
stage('Code Quality Review') {
-script {
-if("${PLATFORM}" == "ubuntu") {
-steps {
+steps {
+script {
+if("${PLATFORM}" == "ubuntu") {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
}
Re: [I] Ability to use timezones when using quartz component and CronJob strategy [camel-k]
squakez commented on issue #5121: URL: https://github.com/apache/camel-k/issues/5121#issuecomment-2039587808 #5090 was dropped in favor of moving the logic directly in the runtime, eventually. I think for the time being this can be developed on Camel K side while the runtimes are not fully available. @lsergio are you planning to work on this by any chance? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch devel-camel-20383 updated: More small fixes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new e89df9167a1 More small fixes
e89df9167a1 is described below
commit e89df9167a1f3ac1570f6c18193a168c185d1eb0
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 13:40:43 2024 +0200
More small fixes
---
Jenkinsfile.matrix.platform | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 9cd7b0233e1..e9d517f8583 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -120,9 +120,9 @@ pipeline {
}
}
}
-
-script {
-stage('Code Quality Review') {
+
+stage('Code Quality Review') {
+script {
if("${PLATFORM}" == "ubuntu") {
steps {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
Re: [I] List Camel's endpoint in the integrations status [camel-k]
lburgazzoli commented on issue #5241: URL: https://github.com/apache/camel-k/issues/5241#issuecomment-2039587335 I don't think this should be something to be included in the health endpoint but rather a dedicated endpoint -- 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 devel-camel-20383 updated: More small fixes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new 307b85fe579 More small fixes
307b85fe579 is described below
commit 307b85fe579673a1e7b845e21cd017d2acca01b8
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 13:39:54 2024 +0200
More small fixes
---
Jenkinsfile.matrix.platform | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7e12dd485ab..9cd7b0233e1 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -122,8 +122,8 @@ pipeline {
}
script {
-if("${PLATFORM}" == "ubuntu") {
-stage('Code Quality Review') {
+stage('Code Quality Review') {
+if("${PLATFORM}" == "ubuntu") {
steps {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
Re: [I] The Yaml Parser diverges for Kamelets and Integration Resources [camel-k]
squakez commented on issue #5135: URL: https://github.com/apache/camel-k/issues/5135#issuecomment-2039582768 @lburgazzoli @davsclaus @oscerd bump. Please, confirm if this could be a bug on the core or something else we may need to fix in Camel K. Thanks in advance. -- 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 devel-camel-20383 updated: Fixed few syntax errors.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new f71d04cd435 Fixed few syntax errors.
f71d04cd435 is described below
commit f71d04cd435fb9a1a374c5b21ee5c3e155457042
Author: Vaishnavi R
AuthorDate: Fri Apr 5 16:29:57 2024 +0530
Fixed few syntax errors.
---
Jenkinsfile.matrix.platform | 62 -
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7dabd12ea7b..7e12dd485ab 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -42,7 +42,7 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace')
-booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads on JDK 21 and newer')
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform')
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
@@ -51,16 +51,14 @@ pipeline {
stage('BuildAndTest') {
matrix {
agent {
-label ${PLATFORM}
-}
-when {
-anyOf {
-expression { params.PLATFORM_FILTER == 'all' }
-expression { params.PLATFORM_FILTER == env.PLATFORM }
-expression { params.JDK_FILTER == 'all' }
-expression { params.JDK_FILTER == env.JDK_NAME }
-}
+label "${PLATFORM}"
}
+when { anyOf {
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+} }
axes {
axis {
name 'JDK_NAME'
@@ -94,7 +92,7 @@ pipeline {
}
}
tools {
-jdk ${JDK_NAME}
+jdk "${JDK_NAME}"
}
stages {
stage('Clean workspace') {
@@ -113,38 +111,44 @@ pipeline {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-if(${PLATFORM} == "ubuntu"){
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
-} else {
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+script {
+if(${PLATFORM} == "ubuntu"){
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+} else {
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+}
}
}
}
-if(${PLATFORM} == "ubuntu") {
-stage('Code Quality Review') {
-steps {
-withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
-sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+script {
+if("${PLATFORM}" == "ubuntu") {
+stage('Code Quality Review') {
+steps {
+withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
+sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_cam
Re: [I] Mount configmap/secret resources to a dedicated resources.d durectory [camel-k]
squakez commented on issue #5181: URL: https://github.com/apache/camel-k/issues/5181#issuecomment-2039579152 @gansheer are you actively work on this or planning to work for next minor delivery? -- 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] List Camel's endpoint in the integrations status [camel-k]
squakez commented on issue #5241:
URL: https://github.com/apache/camel-k/issues/5241#issuecomment-2039574026
@lburgazzoli I think this can intersect with the work I'm about to retake of
https://github.com/apache/camel-k/pull/5096. Right now, using as an example
reference the Quarkus runtime, the service is returning the following result:
```
{
"status": "DOWN",
"checks": [ {
"name": "camel-routes",
"status": "DOWN",
"data": {
"route.id": "route1",
"route.status": "Stopped",
"check.kind": "READINESS"
}
}]
}
```
Do you think can be this enough to start some development which may
eventually be enhanced with any future work on Camel core?
--
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(core): Upgrade API kubernetes 1.28 and controller-runtime to 0.16 [camel-k]
squakez commented on PR #5321: URL: https://github.com/apache/camel-k/pull/5321#issuecomment-2039553132 @gansheer may I suggest a different strategy? Whenever we upgrade dependency, we better do it one by one instead of doing one shot, in order to understand which is the dependency that really fails. IMO, the first thing to do is to upgrade kubernetes only. We can bump to 1.28 and later to 1.29. Once we are sure that all is stable, we can bump any other dependency. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated (3757cac20 -> 025bf44be)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 3757cac20 chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 add 0c47c3d54 feat(trait): allow usage of semver for camel.runtime-version add 025bf44be chore(doc): trait doc update No new revisions were added by this update. Summary of changes: docs/modules/ROOT/partials/apis/camel-k-crds.adoc| 2 ++ docs/modules/traits/pages/camel.adoc | 2 ++ helm/camel-k/crds/crd-integration-kit.yaml | 5 - helm/camel-k/crds/crd-integration-platform.yaml | 10 -- helm/camel-k/crds/crd-integration-profile.yaml | 10 -- helm/camel-k/crds/crd-integration.yaml | 5 - helm/camel-k/crds/crd-kamelet-binding.yaml | 5 - helm/camel-k/crds/crd-pipe.yaml | 5 - pkg/apis/camel/v1/trait/camel.go | 2 ++ .../crd/bases/camel.apache.org_integrationkits.yaml | 5 - .../crd/bases/camel.apache.org_integrationplatforms.yaml | 10 -- .../crd/bases/camel.apache.org_integrationprofiles.yaml | 10 -- .../config/crd/bases/camel.apache.org_integrations.yaml | 5 - .../crd/bases/camel.apache.org_kameletbindings.yaml | 5 - .../config/crd/bases/camel.apache.org_pipes.yaml | 5 - pkg/trait/camel.go | 2 +- pkg/trait/camel_test.go | 16 17 files changed, 87 insertions(+), 17 deletions(-)
Re: [I] Support `kamel run ... -t camel.runtime-version=1.x` notation [camel-k]
squakez closed issue #4739: Support `kamel run ... -t camel.runtime-version=1.x` notation URL: https://github.com/apache/camel-k/issues/4739 -- 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): allow usage of semver for camel.runtime-version [camel-k]
squakez merged PR #5327: URL: https://github.com/apache/camel-k/pull/5327 -- 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] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
karesti commented on issue #5965: URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039547259 @jamesnetherton I'm going to implement the liked issue (to be backported) then I would suggest making use of spinning a server with Quarkus and adding extra config with a SmallRyeConfigBuilderCustomizer for Dev Mode -- 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] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
karesti commented on issue #5965:
URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039524264
In the Infinispan extesion, I do have this code as well:
```java
// dev mode client name for default
if
(infinispanClientsBuildTimeConfig.defaultInfinispanClient.devService.devservices.enabled)
{
clientNames.add(DEFAULT_INFINISPAN_CLIENT_NAME);
}
```
I could the infinispan camel feature, and not create one since there is
already one.
this way dev services will spin up a infinispan container after all, but
without creating the bean that is not needed for this use case. We could
configure the
```properties
camel.component.infinispan.hosts = ${INFINISPAN_HOST:localhost}
camel.component.infinispan.username = admin
camel.component.infinispan.password = password
camel.component.infinispan.secure = true
```
In the dev services override using the dev services
For what is having a cache created on startup, you can also provide on the
dev services a cache on the config
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [I] camel-quarkus-spring-redis doesn't autowire RedisTemplate so it cannot be used for e.g. RedisIdempotentRepository [camel-quarkus]
davsclaus commented on issue #5962: URL: https://github.com/apache/camel-quarkus/issues/5962#issuecomment-2039505936 I created a ticket to see if we can make something generic https://issues.apache.org/jira/browse/CAMEL-20654 It will be useful for other components where you need to setup something that is common to configure via a set of key=value pairs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] camel-quarkus-spring-redis doesn't autowire RedisTemplate so it cannot be used for e.g. RedisIdempotentRepository [camel-quarkus]
davsclaus commented on issue #5962: URL: https://github.com/apache/camel-quarkus/issues/5962#issuecomment-2039499831 Yeah would be nice if quarkus could allow configuration form application properties - its very common and handy for setting this kind of stuff - instead of writing code all the time. And it would be needed for low-code effort like karavan/kaoto as well. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] camel-quarkus-spring-redis doesn't autowire RedisTemplate so it cannot be used for e.g. RedisIdempotentRepository [camel-quarkus]
jamesnetherton commented on issue #5962: URL: https://github.com/apache/camel-quarkus/issues/5962#issuecomment-2039487972 > works quite differently in Quarkus than Spring Boot Yes. The 'spring' part of the extension name is a little misleading. It gives you the means to interact with Redis via a Spring backed library. But it doesn't provide you with full Spring framework support like the IOC container, auto configuration etc. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] camel-quarkus-spring-redis doesn't autowire RedisTemplate so it cannot be used for e.g. RedisIdempotentRepository [camel-quarkus]
JesperBerggren commented on issue #5962: URL: https://github.com/apache/camel-quarkus/issues/5962#issuecomment-2039477088 Thanks for a quick reply! Ok, then it works quite differently in Quarkus than Spring Boot. In Spring Boot it enough to set something like this in application.properties ``` spring.data.redis.database=0 spring.data.redis.host=localhost spring.data.redis.port=6379 spring.data.redis.password=mypass spring.data.redis.timeout=6 ``` after which the a RedisTemplate bean can automatically be injected (without producing it manually). It seems smarter and more in line with e.g. the CamelContext which doesn't need to be produced manually in Quarkus. When I have something functional I'll post it for later reference if anybody else should be interested. -- 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] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
karesti commented on issue #5965:
URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039473661
something like
```java
public class InfinispanDevServicesConfigBuilderCustomizer implements
SmallRyeConfigBuilderCustomizer {
@Override
public void configBuilder(final SmallRyeConfigBuilder builder) {
// use a priority of 50 to make sure that this is overridable by any
of the standard methods
builder.withSources(
new PropertiesConfigSource(
Map.of("quarkus.infinispan-client.devservices.enabled", false),
"quarkus-camel-infinispan", 50));
}
}
```
--
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] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
jamesnetherton commented on issue #5965: URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039467338 > @jamesnetherton maybe this can provide in the camel infinispan quarkus extension something like this Yes, I was thinking about something like that. I need to experiment a little. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20640: Remove unused and old openapi v2 stuff
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d5e89dacfec CAMEL-20640: Remove unused and old openapi v2 stuff
d5e89dacfec is described below
commit d5e89dacfec6ea0cc91470fd380193f250f45418
Author: Claus Ibsen
AuthorDate: Fri Apr 5 12:37:37 2024 +0200
CAMEL-20640: Remove unused and old openapi v2 stuff
---
.../camel/openapi/DefaultRestDefinitionsResolver.java | 6 --
.../apache/camel/openapi/RestDefinitionsResolver.java | 2 --
.../org/apache/camel/openapi/RestOpenApiReader.java| 3 ---
.../camel/openapi/jmx/JmxRestDefinitionsResolver.java | 18 --
4 files changed, 29 deletions(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/DefaultRestDefinitionsResolver.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/DefaultRestDefinitionsResolver.java
index 2e8a1d7f208..650460b8668 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/DefaultRestDefinitionsResolver.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/DefaultRestDefinitionsResolver.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.openapi;
-import java.util.Collections;
import java.util.List;
import org.apache.camel.CamelContext;
@@ -40,9 +39,4 @@ public class DefaultRestDefinitionsResolver implements
RestDefinitionsResolver {
return rests;
}
-@Override
-public List findCamelContexts() throws Exception {
-return Collections.emptyList();
-}
-
}
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestDefinitionsResolver.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestDefinitionsResolver.java
index ac89094a1ac..fbcfad9c6d5 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestDefinitionsResolver.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestDefinitionsResolver.java
@@ -30,6 +30,4 @@ public interface RestDefinitionsResolver {
List getRestDefinitions(CamelContext camelContext, String
camelId) throws Exception;
-List findCamelContexts() throws Exception;
-
}
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index a93d328dea4..496988508e3 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -95,7 +95,6 @@ import static java.lang.invoke.MethodHandles.publicLookup;
*/
public class RestOpenApiReader {
-public static final String OAS20_SCHEMA_DEFINITION_PREFIX =
"#/definitions/";
public static final String OAS30_SCHEMA_DEFINITION_PREFIX =
"#/components/schemas/";
private static final Logger LOG =
LoggerFactory.getLogger(RestOpenApiReader.class);
// Types that are not allowed in references.
@@ -640,8 +639,6 @@ public class RestOpenApiReader {
Schema model =
modelTypeAsProperty(getValue(camelContext, verb.getOutType()), openApi);
contentType.setSchema(model);
response.setContent(responseContent);
-// response.description = "Output type";
-//op.responses.addResponse("200",
response);
op.getResponses().addApiResponse("200", response);
}
}
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
index 97a07f5b69f..62bb8070a1e 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
@@ -17,7 +17,6 @@
package org.apache.camel.openapi.jmx;
import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -78,21 +77,4 @@ public class JmxRestDefinitionsResolver implements
RestDefinitionsResolver {
return null;
}
-@Override
-public List findCamelContexts() throws Exception {
-List answer = new ArrayList<>();
-
-MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-Set names = server.queryNames(new
ObjectName("*:type=context,*"), null);
-for (ObjectName on : names) {
-
-String id = on.getKeyProperty("name");
-if (id.startsWith
Re: [I] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
karesti commented on issue #5965: URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039451270 @jamesnetherton maybe you can provide in the camel infinispan quarkus extension something like this https://github.com/quarkiverse/quarkus-langchain4j/blob/main/infinispan/deployment/src/main/java/io/quarkiverse/langchain4j/infinispan/DevServicesConfigBuilderCustomizer.java#L1 -- 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] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
karesti commented on issue #5965: URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039448901 @jamesnetherton in the Infinispan extension, I already enable and so stuff depending on extensions that might be present. I have an idea that might be done in the camel quarkus extension -- 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] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
karesti commented on issue #5965: URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039443811 I afraid that having dev services not enabled by default is the dev services default behaviour, I can't change that for Infinispan. But I can do that if I detect the use of Camel in the Infinispan extension -- 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] [3.8.x] Improve the testability against Quarkus Platform BOMs [camel-quarkus]
ppalaga commented on PR #5960: URL: https://github.com/apache/camel-quarkus/pull/5960#issuecomment-2039437403 1e48f76 rebased and fixed the versions blindly taken from another branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Improve the testability against Quarkus Platform BOMs [camel-quarkus]
ppalaga commented on PR #5961: URL: https://github.com/apache/camel-quarkus/pull/5961#issuecomment-2039431355 Thanks for the hint, @JiriOndrusek, you are completely right! I cherry-picked too carelessly 🫣 -- 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-19543 - camel-sjms2: replace Thread.sleep in tests. [camel]
orpiske merged PR #13685: URL: https://github.com/apache/camel/pull/13685 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-19543 - camel-sjms2: replace Thread.sleep in tests.
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 c4499beb638 CAMEL-19543 - camel-sjms2: replace Thread.sleep in tests.
c4499beb638 is described below
commit c4499beb6385dae4fd014391ad1c440356a1f5c0
Author: Vaishnavi R
AuthorDate: Wed Apr 3 14:41:55 2024 +0530
CAMEL-19543 - camel-sjms2: replace Thread.sleep in tests.
Updated the code.
Updated the code.
Removed unused dependency from pom.xml.
---
.../sjms2/consumer/InOnlyTopicDurableConsumerTest.java | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
index 8470bedd66c..1c14b29b4f4 100644
---
a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
+++
b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.sjms2.consumer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
@@ -25,6 +28,7 @@ import org.apache.camel.component.sjms2.Sjms2Component;
import org.apache.camel.component.sjms2.support.Jms2TestSupport;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
@@ -32,6 +36,7 @@ import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
public class InOnlyTopicDurableConsumerTest extends Jms2TestSupport {
private static final String CONNECTION_ID = "test-connection-1";
+private CountDownLatch latch = new CountDownLatch(2);
@RegisterExtension
public static ArtemisService service =
ArtemisServiceFactory.createTCPAllProtocolsService();
@@ -49,10 +54,12 @@ public class InOnlyTopicDurableConsumerTest extends
Jms2TestSupport {
mock2.expectedBodiesReceived("Hello World");
// wait a bit and send the message
-Thread.sleep(1000);
-
template.sendBody("sjms2:topic:foo", "Hello World");
+if (!latch.await(1000, TimeUnit.MILLISECONDS)) {
+Assertions.fail("Message is not received as expected");
+}
+
MockEndpoint.assertIsSatisfied(context);
}
@@ -76,9 +83,11 @@ public class InOnlyTopicDurableConsumerTest extends
Jms2TestSupport {
@Override
public void configure() {
from("sjms2:topic:foo?durableSubscriptionName=bar1")
+.process(e -> latch.countDown())
.to("mock:result");
from("sjms2:topic:foo?durableSubscriptionName=bar2")
+.process(e -> latch.countDown())
.to("mock:result2");
}
};
(camel) branch devel-camel-20383 updated (f875725dd46 -> edca299578c)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git discard f875725dd46 More small fixes discard d17029207c1 Fixed syntax errors on the Jenkinsfile new edca299578c Fixed a few syntax errors on the Jenkinsfile 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 (f875725dd46) \ N -- N -- N refs/heads/devel-camel-20383 (edca299578c) 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) 01/01: Fixed a few syntax errors on the Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit edca299578cf4cea4600bf901b7d1e579250ecba
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 11:40:21 2024 +0200
Fixed a few syntax errors on the Jenkinsfile
---
Jenkinsfile.matrix.platform | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index ce495830e20..7dabd12ea7b 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -41,9 +41,9 @@ pipeline {
}
parameters {
-booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
-booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
-choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform'),
+booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace')
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads on JDK 21 and newer')
+choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform')
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
@@ -53,12 +53,14 @@ pipeline {
agent {
label ${PLATFORM}
}
-when { anyOf {
-expression { params.PLATFORM_FILTER == 'all' }
-expression { params.PLATFORM_FILTER == env.PLATFORM }
-expression { params.JDK_FILTER == 'all' }
-expression { params.JDK_FILTER == env.JDK_NAME }
-} }
+when {
+anyOf {
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+}
+}
axes {
axis {
name 'JDK_NAME'
(camel) branch devel-camel-20383 updated: More small fixes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new f875725dd46 More small fixes
f875725dd46 is described below
commit f875725dd46dafbd5124d2340498f159374aa6e7
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 11:45:32 2024 +0200
More small fixes
---
Jenkinsfile.matrix.platform | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 28831ac0a94..7dabd12ea7b 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -41,10 +41,10 @@ pipeline {
}
parameters {
-booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
-booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads'),
-choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform'),
-choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk'),
+booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace')
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads on JDK 21 and newer')
+choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform')
+choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
stages {
@@ -53,12 +53,14 @@ pipeline {
agent {
label ${PLATFORM}
}
-when { anyOf {
-expression { params.PLATFORM_FILTER == 'all' }
-expression { params.PLATFORM_FILTER == env.PLATFORM }
-expression { params.JDK_FILTER == 'all' }
-expression { params.JDK_FILTER == env.JDK_NAME }
-} }
+when {
+anyOf {
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+}
+}
axes {
axis {
name 'JDK_NAME'
(camel) branch devel-camel-20383 updated: Fixed syntax errors on the Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/devel-camel-20383 by this push:
new d17029207c1 Fixed syntax errors on the Jenkinsfile
d17029207c1 is described below
commit d17029207c1e85195d6e8852811f9b881f6d3ae8
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 5 11:40:21 2024 +0200
Fixed syntax errors on the Jenkinsfile
---
Jenkinsfile.matrix.platform | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index ce495830e20..28831ac0a94 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -42,9 +42,9 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
-booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads'),
choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform'),
-choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
+choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk'),
}
agent none
stages {
[PR] feat(trait): allow usage of semver for camel.runtime-version [camel-k]
squakez opened a new pull request, #5327: URL: https://github.com/apache/camel-k/pull/5327 With this PR we fix a minor problem that was impeding us to make use of the semantic version jolly. Once this is merged we'll be able to run: ``` kamel run test.yaml -t camel.runtime-version=2.x ``` which will resolve to the best match of the existing CamelCatalogs. For example, given: ``` NAME RUNTIME PROVIDER RUNTIME VERSION RUNTIME CAMEL VERSION PHASE camel-catalog-2.16.0 quarkus2.16.03.20.1 Ready camel-catalog-3.8.1quarkus3.8.1 4.4.1 Ready ``` It will pick up version 2.1.6.0 Closes https://github.com/apache/camel-k/issues/5311 **Release Note** ```release-note feat(trait): allow usage of semver for camel.runtime-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
(camel) branch devel-camel-20383 updated: Fixed license format on the matrix Jenkinsfiles
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/devel-camel-20383 by this push: new 1ffcd9208a2 Fixed license format on the matrix Jenkinsfiles 1ffcd9208a2 is described below commit 1ffcd9208a29ce9a749edfd0ef6b7743f3e476cf Author: Otavio Rodolfo Piske AuthorDate: Fri Apr 5 11:28:50 2024 +0200 Fixed license format on the matrix Jenkinsfiles --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 1e1fe8f3aab..fa8908cfa71 100644 --- a/pom.xml +++ b/pom.xml @@ -339,6 +339,8 @@ SCRIPT_STYLE SCRIPT_STYLE SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE
(camel) 02/04: Fixed license format on the Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git commit fbea21c165e6fd427b3011977afc90fd8254656c Author: Otavio Rodolfo Piske AuthorDate: Wed Mar 20 11:26:47 2024 +0100 Fixed license format on the Jenkinsfile --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 6c1ded35405..1e1fe8f3aab 100644 --- a/pom.xml +++ b/pom.xml @@ -338,6 +338,7 @@ SCRIPT_STYLE SCRIPT_STYLE SCRIPT_STYLE +SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE SLASHSTAR_STYLE
(camel) 03/04: Martix Jenkins pipeline for CI/CD.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 107d58ecd3d01c3e6a6e6f433eda758a35e9a569
Author: Vaishnavi R
AuthorDate: Thu Mar 28 14:42:37 2024 +0530
Martix Jenkins pipeline for CI/CD.
---
Jenkinsfile.matrix.jdk | 115 +
Jenkinsfile.matrix.node | 147
2 files changed, 262 insertions(+)
diff --git a/Jenkinsfile.matrix.jdk b/Jenkinsfile.matrix.jdk
new file mode 100644
index 000..c68d0073a6a
--- /dev/null
+++ b/Jenkinsfile.matrix.jdk
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+
+def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
+def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.org"
+
+pipeline {
+
+agent {
+label AGENT_LABEL
+}
+
+environment {
+MAVEN_SKIP_RC = true
+}
+
+options {
+buildDiscarder(
+logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+)
+disableConcurrentBuilds()
+}
+
+parameters {
+booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
+choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
+}
+stages {
+stage('BuildAndTest') {
+matrix {
+when { anyOf {
+expression { params.JDK_FILTER == 'all' }
+expression { params.JDK_FILTER == env.JDK_NAME }
+} }
+axes {
+axis {
+name 'JDK_NAME'
+values 'jdk_17_latest', 'jdk_21_latest'
+}
+}
+tools {
+jdk ${JDK_NAME}
+}
+stages {
+stage('Clean workspace') {
+when {
+expression { params.CLEAN }
+}
+steps {
+sh 'git clean -fdx'
+}
+}
+
+stage('Build & Install') {
+steps {
+echo "Do Build for ${JDK_NAME}"
+sh 'java -version'
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+}
+}
+
+stage('Code Quality Review') {
+steps {
+withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
+sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+}
+}
+}
+
+stage('Test') {
+steps {
+echo "Do Test for ${JDK_NAME}"
+sh 'java -version'
+timeout(unit: 'HOURS', time: 7) {
+sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS
-Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true
verify"
+}
+}
+post {
+always {
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
+junit allowEmptyResults: true, testResults:
'**/target/failsafe-reports/*.xml'
+
(camel) 01/04: CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch devel-camel-20383 in repository https://gitbox.apache.org/repos/asf/camel.git commit f7cd8863801d2355678f82bd5672c4475718d58e Author: Otavio Rodolfo Piske AuthorDate: Wed Mar 20 11:16:25 2024 +0100 CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job --- Jenkinsfile.jdk17 => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Jenkinsfile.jdk17 b/Jenkinsfile similarity index 100% rename from Jenkinsfile.jdk17 rename to Jenkinsfile
(camel) 04/04: Updated the pipeline to consolidate all the CI automation in a single file.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 61ef63c4e9dea5356df3577a2cb0e089fd77b792
Author: Vaishnavi R
AuthorDate: Mon Apr 1 14:10:00 2024 +0530
Updated the pipeline to consolidate all the CI automation in a single file.
---
...file.matrix.node => Jenkinsfile.matrix.platform | 52 --
1 file changed, 38 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile.matrix.node b/Jenkinsfile.matrix.platform
similarity index 60%
rename from Jenkinsfile.matrix.node
rename to Jenkinsfile.matrix.platform
index f7fea84d4fb..ce495830e20 100644
--- a/Jenkinsfile.matrix.node
+++ b/Jenkinsfile.matrix.platform
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//def AGENT_LABEL = 'ppc64le'
+//def PLATFORM = 'ppc64le'
//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?:
"-Dkafka.instance.type=local-strimzi-container -Dci.env.name=apache.org"
+def MAVEN_TEST_PARAMS_UBUNTU = env.MAVEN_TEST_PARAMS ?:
"-Dci.env.name=apache.org"
/*
Below parameters are required for camel/core/camel-core module's test cases to
pass
- xpathExprGrpLimit: limits the number of groups an Xpath expression can
contain
@@ -41,7 +42,8 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace'),
-choice(name: 'AGENT_NODE_FILTER', choices: ['all', 'ppc64le',
's390x'], description: 'Run on specific node'),
+booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description:
'Perform the build using virtual threads')
+choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x',
'ubuntu'], description: 'Run on specific platform'),
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest',
'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
@@ -49,11 +51,11 @@ pipeline {
stage('BuildAndTest') {
matrix {
agent {
-label ${AGENT_LABEL}
+label ${PLATFORM}
}
when { anyOf {
-expression { params.AGENT_NODE_FILTER == 'all' }
-expression { params.AGENT_NODE_FILTER == env.AGENT_LABEL }
+expression { params.PLATFORM_FILTER == 'all' }
+expression { params.PLATFORM_FILTER == env.PLATFORM }
expression { params.JDK_FILTER == 'all' }
expression { params.JDK_FILTER == env.JDK_NAME }
} }
@@ -63,8 +65,8 @@ pipeline {
values 'jdk_17_latest', 'jdk_21_latest'
}
axis {
-name 'AGENT_LABEL'
-values 'ppc64le', 's390x'
+name 'PLATFORM'
+values 'ppc64le', 's390x', 'ubuntu'
}
}
excludes {
@@ -74,7 +76,7 @@ pipeline {
values 'jdk_21_latest'
}
axis {
-name 'AGENT_LABEL'
+name 'PLATFORM'
values 'ppc64le'
}
}
@@ -84,7 +86,7 @@ pipeline {
values 'jdk_21_latest'
}
axis {
-name 'AGENT_LABEL'
+name 'PLATFORM'
values 's390x'
}
}
@@ -107,19 +109,41 @@ pipeline {
branch 'main'
}*/
steps {
-echo "Do Build for ${AGENT_LABEL}-${JDK_NAME}"
+echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
-sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+if(${PLATFORM} == "ubuntu"){
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Darchetype.test.skip
-Dmaven.test.skip.exec=true clean install"
+} else {
+sh "./mvnw -U $MAVEN_PARAMS
-Dskip.camel.maven.plugin.tests -Dquickly clean install"
+}
+}
+}
+
+if(${PLATFORM} == "ubuntu") {
+sta
Re: [I] Infinispan with dev services enabled can lead to jakarta.enterprise.inject.CreationException [camel-quarkus]
jamesnetherton commented on issue #5965: URL: https://github.com/apache/camel-quarkus/issues/5965#issuecomment-2039308842 > My question is: do you need to use dev services AND this bean not to be created but being provided by camel quarkus ? The problem is that devservices is enabled by default. Which isn't really desirable for minimal code, k8s based deployments like camel-k. So users have to either explicitly disable devservices or disable the Camel `RemoteCacheManager` auto discovery. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 [camel-k]
squakez merged PR #5323: URL: https://github.com/apache/camel-k/pull/5323 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 3757cac20 chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 3757cac20 is described below commit 3757cac20ed3a41ded5375fc72405a619bb3545e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 5 07:36:31 2024 + chore(deps): bump golang.org/x/oauth2 from 0.18.0 to 0.19.0 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.18.0 to 0.19.0. - [Commits](https://github.com/golang/oauth2/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 3 +-- go.sum | 6 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 93e822e67..cb465df6c 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( go.uber.org/automaxprocs v1.5.3 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/oauth2 v0.18.0 + golang.org/x/oauth2 v0.19.0 golang.org/x/sync v0.6.0 golang.org/x/term v0.18.0 golang.org/x/text v0.14.0 @@ -133,7 +133,6 @@ require ( golang.org/x/tools v0.16.1 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.153.0 // indirect - google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect diff --git a/go.sum b/go.sum index 830b966bb..736f4edf0 100644 --- a/go.sum +++ b/go.sum @@ -573,8 +573,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= -golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= +golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg= +golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -737,8 +737,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
