You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/03/03 12:15:46 UTC
[camel-quarkus] branch main updated (f47ed6e2cc -> e1d491d5b5)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from f47ed6e2cc Bump to CycloneDX Maven Plugin 2.7.5
new 1156664162 Upgrade to cq-maven-plugin 3.5.4 #4606
new e1d491d5b5 MAVEN_ARGS honored by Maven 3.9.0 so rename it and rather use ./mvnw
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/camel-master-cron.yaml | 46 ++++++++++++++--------------
.github/workflows/ci-build.yaml | 34 ++++++++++-----------
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-validate.yml | 4 +--
.github/workflows/quarkus-master-cron.yaml | 48 +++++++++++++++---------------
pom.xml | 4 +--
6 files changed, 69 insertions(+), 69 deletions(-)
[camel-quarkus] 01/02: Upgrade to cq-maven-plugin 3.5.4 #4606
Posted by pp...@apache.org.
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
commit 1156664162e32f89061da0c495bcf17311d59b85
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed Mar 1 14:30:34 2023 +0100
Upgrade to cq-maven-plugin 3.5.4 #4606
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index af0149420e..97b4c1966b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
<maven-utils.version>0.1.0</maven-utils.version>
<!-- Maven plugin versions (keep sorted alphabetically) -->
- <cq-plugin.version>3.5.3</cq-plugin.version>
+ <cq-plugin.version>3.5.4</cq-plugin.version>
<cyclonedx-maven-plugin-version>2.7.5</cyclonedx-maven-plugin-version>
<build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
@@ -1281,7 +1281,7 @@
<inherited>false</inherited>
<configuration>
<outputName>camel-quarkus-sbom</outputName>
- <outputDirectory>${project.basedir}/camel-quarkus-sbom/</outputDirectory>
+ <outputDirectory>${project.basedir}/camel-quarkus-sbom/</outputDirectory>
</configuration>
<executions>
<execution>
[camel-quarkus] 02/02: MAVEN_ARGS honored by Maven 3.9.0 so rename it and rather use ./mvnw
Posted by pp...@apache.org.
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
commit e1d491d5b5a06a0717c91591c619ac7e29644635
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Mar 2 17:35:55 2023 +0100
MAVEN_ARGS honored by Maven 3.9.0 so rename it and rather use ./mvnw
---
.github/workflows/camel-master-cron.yaml | 46 ++++++++++++++--------------
.github/workflows/ci-build.yaml | 34 ++++++++++-----------
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-validate.yml | 4 +--
.github/workflows/quarkus-master-cron.yaml | 48 +++++++++++++++---------------
5 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index 21bdf2f993..431dee9972 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -25,7 +25,7 @@ on:
env:
LANG: en_US.UTF-8
MAVEN_OPTS: -Xmx3000m
- MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
+ CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
BRANCH_OPTIONS: -Papache-snapshots
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2927
@@ -65,10 +65,10 @@ jobs:
git rev-parse origin/main > ~/build-data/main-sha.txt
- name: mvn clean install -DskipTests
run: |
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
- name: Sync Maven properties
run: |
- ./mvnw cq:sync-versions ${MAVEN_ARGS} -N
+ ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
- name: Fail if there are uncommitted changes
shell: bash
run: |
@@ -98,7 +98,7 @@ jobs:
git rebase --abort
fi
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
native-tests:
name: Native Tests - ${{matrix.category}}
@@ -144,7 +144,7 @@ jobs:
MODULE="integration-tests/$(echo ${MODULE} | sed 's/^[ \t]*//;s/[ \t]*$//')"
- if [[ "x$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]]; then
+ if [[ "x$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]]; then
JVM_MODULES+=("${MODULE}")
else
NATIVE_MODULES+=("${MODULE}")
@@ -158,14 +158,14 @@ jobs:
IFS=,
if [[ ${JVM_MODULES[@]} ]]; then
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pnative,docker,ci \
--fail-at-end \
@@ -178,7 +178,7 @@ jobs:
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
functional-extension-tests:
runs-on: ubuntu-latest
@@ -216,37 +216,37 @@ jobs:
- name: cd extensions-core && mvn test
run: |
cd extensions-core
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd extensions && mvn test
run: |
cd extensions
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd test-framework && mvn test
run: |
cd test-framework
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd tooling/perf-regression && mvn verify
run: |
cd tooling/perf-regression
- ../../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test
run: |
cd catalog
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
test
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
extensions-jvm-tests:
runs-on: ubuntu-latest
@@ -295,14 +295,14 @@ jobs:
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean test
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
integration-tests-alternative-platform:
runs-on: ${{ matrix.os }}
@@ -343,7 +343,7 @@ jobs:
shell: bash
run: |
cd integration-tests
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dskip-testcontainers-tests -Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean verify
@@ -351,7 +351,7 @@ jobs:
if: failure() || cancelled()
shell: bash
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
examples-tests:
needs: initial-mvn-install
@@ -385,7 +385,7 @@ jobs:
git fetch origin main
git rebase $(cat ~/build-data/main-sha.txt)
- name: set CQ_VERSION
- run: echo "CQ_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+ run: echo "CQ_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout -N)" >> $GITHUB_ENV
- name: clone and verify examples
run: |
EXAMPLES_BRANCH="camel-quarkus-main"
@@ -397,12 +397,12 @@ jobs:
git clone --depth 1 --branch ${EXAMPLES_BRANCH} https://github.com/apache/camel-quarkus-examples.git \
&& cd camel-quarkus-examples \
&& echo "Current Examples commit:" $(git rev-parse HEAD) \
- && mvn ${MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
- && ./mvnw-for-each.sh ${MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
+ && ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
+ && ./mvnw-for-each.sh ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
handle-build-status:
needs: native-tests
@@ -438,7 +438,7 @@ jobs:
- name: Report build status
id: report
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=camel-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
- name: Sync branch main to camel-main
if: steps.report.outputs.overall_build_status == 'success'
run: |
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index ed21c6f5d9..2544512d74 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -53,7 +53,7 @@ concurrency:
env:
LANG: en_US.UTF-8
MAVEN_OPTS: -Xmx3000m
- MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
+ CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
TESTCONTAINERS_RYUK_DISABLED: true
jobs:
@@ -87,15 +87,15 @@ jobs:
git clone --depth 1 --branch main https://github.com/quarkusio/quarkus.git \
&& cd quarkus \
&& echo "Current Quarkus commit:" $(git rev-parse HEAD) \
- && ./mvnw ${MAVEN_ARGS} clean install -Dquickly
+ && ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly
- name: Checkout
uses: actions/checkout@v2
- name: mvn clean install -DskipTests
run: |
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
- name: Sync Maven properties
run: |
- ./mvnw cq:sync-versions ${MAVEN_ARGS} -N
+ ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
- name: Fail if there are uncommitted changes
shell: bash
run: |
@@ -162,7 +162,7 @@ jobs:
MODULE="integration-tests/$(echo ${MODULE} | sed 's/^[ \t]*//;s/[ \t]*$//')"
- if [[ "x$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]]; then
+ if [[ "x$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]]; then
JVM_MODULES+=("${MODULE}")
else
NATIVE_MODULES+=("${MODULE}")
@@ -176,14 +176,14 @@ jobs:
IFS=,
if [[ ${JVM_MODULES[@]} ]]; then
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pnative,docker,ci \
--fail-at-end \
@@ -229,31 +229,31 @@ jobs:
- name: cd extensions-core && mvn test
run: |
cd extensions-core
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd extensions && mvn test
run: |
cd extensions
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd test-framework && mvn test
run: |
cd test-framework
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd tooling/perf-regression && mvn verify
run: |
cd tooling/perf-regression
- ../../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test
run: |
cd catalog
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
test
@@ -302,7 +302,7 @@ jobs:
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean test
@@ -347,7 +347,7 @@ jobs:
shell: bash
run: |
cd integration-tests
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dskip-testcontainers-tests -Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean verify
@@ -384,7 +384,7 @@ jobs:
tar -xzf ../maven-repo.tgz -C ~
df -h /
- name: set CQ_VERSION
- run: echo "CQ_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+ run: echo "CQ_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout -N)" >> $GITHUB_ENV
- name: clone and verify examples
run: |
EXAMPLES_BRANCH="camel-quarkus-main"
@@ -396,5 +396,5 @@ jobs:
git clone --depth 1 --branch ${EXAMPLES_BRANCH} https://github.com/apache/camel-quarkus-examples.git \
&& cd camel-quarkus-examples \
&& echo "Current Examples commit:" $(git rev-parse HEAD) \
- && mvn ${MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
- && ./mvnw-for-each.sh ${MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
+ && mvn ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
+ && ./mvnw-for-each.sh ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml
index 1d047a3cd3..ebdf26aa62 100644
--- a/.github/workflows/generate-sbom-main.yml
+++ b/.github/workflows/generate-sbom-main.yml
@@ -47,7 +47,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn build and sbom generation
- run: mvn -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Psbom -Dquickly -DskipTests verify
+ run: ./mvnw -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Psbom -Dquickly -DskipTests verify
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index 9a30c300d2..6a77552e8c 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -38,7 +38,7 @@ concurrency:
env:
LANG: en_US
MAVEN_OPTS: -Xmx3000m
- MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
+ CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
jobs:
check-format:
@@ -61,7 +61,7 @@ jobs:
java-version: '17'
- name: mvn validate
run: |
- ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} -fae \
+ ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -fae \
-DskipTests \
-Pcheck-format \
clean validate
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index 66564bd190..4b2150a649 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -25,7 +25,7 @@ on:
env:
LANG: en_US.UTF-8
MAVEN_OPTS: -Xmx3000m
- MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
+ CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2926
@@ -68,13 +68,13 @@ jobs:
git clone --depth 1 --branch main https://github.com/quarkusio/quarkus.git \
&& cd quarkus \
&& echo "Current Quarkus commit:" $(git rev-parse HEAD) \
- && ./mvnw ${MAVEN_ARGS} clean install -Dquickly
+ && ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly
- name: mvn clean install -DskipTests
run: |
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
- name: Sync Maven properties
run: |
- ./mvnw cq:sync-versions ${MAVEN_ARGS} -N
+ ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
- name: Fail if there are uncommitted changes
shell: bash
run: |
@@ -104,7 +104,7 @@ jobs:
git rebase --abort
fi
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
native-tests:
name: Native Tests - ${{matrix.category}}
@@ -150,7 +150,7 @@ jobs:
MODULE="integration-tests/$(echo ${MODULE} | sed 's/^[ \t]*//;s/[ \t]*$//')"
- if [[ "x$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]]; then
+ if [[ "x$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]]; then
JVM_MODULES+=("${MODULE}")
else
NATIVE_MODULES+=("${MODULE}")
@@ -164,14 +164,14 @@ jobs:
IFS=,
if [[ ${JVM_MODULES[@]} ]]; then
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
+ eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pnative,docker,ci \
--fail-at-end \
@@ -184,7 +184,7 @@ jobs:
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
functional-extension-tests:
runs-on: ubuntu-latest
@@ -222,37 +222,37 @@ jobs:
- name: cd extensions-core && mvn test
run: |
cd extensions-core
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd extensions && mvn test
run: |
cd extensions
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd test-framework && mvn test
run: |
cd test-framework
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- name: cd tooling/perf-regression && mvn verify
run: |
cd tooling/perf-regression
- ../../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test
run: |
cd catalog
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
test
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
extensions-jvm-tests:
runs-on: ubuntu-latest
@@ -301,14 +301,14 @@ jobs:
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean test
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
integration-tests-alternative-platform:
runs-on: ${{ matrix.os }}
@@ -349,7 +349,7 @@ jobs:
shell: bash
run: |
cd integration-tests
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dskip-testcontainers-tests -Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean verify
@@ -357,7 +357,7 @@ jobs:
if: failure() || cancelled()
shell: bash
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
examples-tests:
needs: initial-mvn-install
@@ -391,7 +391,7 @@ jobs:
git fetch origin main
git rebase $(cat ~/build-data/main-sha.txt)
- name: set CQ_VERSION
- run: echo "CQ_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+ run: echo "CQ_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout -N)" >> $GITHUB_ENV
- name: clone and verify examples
run: |
EXAMPLES_BRANCH="camel-quarkus-main"
@@ -403,12 +403,12 @@ jobs:
git clone --depth 1 --branch ${EXAMPLES_BRANCH} https://github.com/apache/camel-quarkus-examples.git \
&& cd camel-quarkus-examples \
&& echo "Current Examples commit:" $(git rev-parse HEAD) \
- && mvn ${MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
- && ./mvnw-for-each.sh ${MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
+ && ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
+ && ./mvnw-for-each.sh ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
- name: Report Build Failure
if: failure() || cancelled()
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=${{ job.status }} -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
handle-build-status:
needs: native-tests
@@ -444,7 +444,7 @@ jobs:
- name: Report build status
id: report
run: |
- ./mvnw ${MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
+ ./mvnw ${CQ_MAVEN_ARGS} verify -N -Pbuild-notification -Dstatus=verify -DissueId=${{ env.ISSUE_ID }} -Dtoken=${{ secrets.GITHUB_TOKEN }} -DbuildId=$(cat ~/build-data/build-id.txt) -Drepo=${GITHUB_REPOSITORY} -Dbranch=quarkus-main -Dbranch-commit=$(cat ~/build-data/main-sha.txt)
- name: Sync branch main to quarkus-main
if: steps.report.outputs.overall_build_status == 'success'
run: |