This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ec874a659cdb6ffb466383f3037a83c02659214b
Author: Peter Palaga <ppal...@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 | 18 ++++++++--------
.github/workflows/ci-build.yaml | 34 +++++++++++++++---------------
.github/workflows/pr-validate.yml | 4 ++--
.github/workflows/quarkus-master-cron.yaml | 18 ++++++++--------
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index d057d8e059..08a9114344 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
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2927
@@ -72,7 +72,7 @@ jobs:
git rev-parse origin/main > ~/build-data/main-sha.txt
- name: Build Camel Quarkus
run: |
- ./mvnw ${MAVEN_ARGS} clean install -Papache-snapshots --fail-at-end
+ ./mvnw ${CQ_MAVEN_ARGS} clean install -Papache-snapshots
--fail-at-end
- name: Tar Maven Repo
shell: bash
run: tar -czf maven-repo.tgz -C ~ build-data .m2/repository
@@ -95,7 +95,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}}
@@ -138,7 +138,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}")
@@ -152,14 +152,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 \
@@ -168,7 +168,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)
handle-build-status:
needs: native-tests
@@ -201,8 +201,8 @@ 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)
- - name: Sync branch Main to Camel Main
+ ./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: |
git push --force-with-lease origin camel-main
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 5d505df8c2..92d3058873 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -52,7 +52,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:
@@ -86,15 +86,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: |
@@ -161,7 +161,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}")
@@ -175,14 +175,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 \
@@ -228,31 +228,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
@@ -301,7 +301,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
@@ -394,7 +394,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
@@ -431,7 +431,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"
@@ -445,5 +445,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/pr-validate.yml
b/.github/workflows/pr-validate.yml
index 256f67ac77..2034a657fb 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: '11'
- 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 5195a8d8e4..e998b25a5a 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
@@ -75,10 +75,10 @@ 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: Build Camel Quarkus
run: |
- ./mvnw ${MAVEN_ARGS} clean install -Dquarkus.version=999-SNAPSHOT
--fail-at-end
+ ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquarkus.version=999-SNAPSHOT
--fail-at-end
- name: Tar Maven Repo
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}}
@@ -147,7 +147,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}")
@@ -161,14 +161,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 \
@@ -177,7 +177,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)
handle-build-status:
needs: native-tests
@@ -210,7 +210,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: |
