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/06/16 10:04:39 UTC
[camel] branch main updated (ed785ada600 -> 8bb5c67e942)
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.git
from ed785ada600 Removed KinesisComponentVerifierExtension since not in use
new 704656d121c Upgrade Maven used by Maven Wrapper to version 3.9.2
new 024ab8f1d68 Use mvnd 1.0-m6-m39 by default
new 96d53aa11a3 Use consistent mvnd options
new 8bb5c67e942 Use mvnw 3.9.2 instead of mvnd 1.0-m6-m39 in the main build to avoid https://github.com/apache/maven-resolver/pull/274; this can be reverted when mvnd 1.0-m6-m39.next is out
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/component-test/component-test.sh | 8 +++-----
.github/actions/incremental-build/action.yaml | 2 --
.../actions/incremental-build/incremental-build.sh | 22 ++++++++++------------
.github/actions/install-mvnd/action.yml | 7 +++++--
.github/actions/quick-test/quick-test.sh | 6 ++----
.github/workflows/alternative-os-build-main.yml | 2 +-
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-build-camel-3.yml | 4 ++--
.github/workflows/pr-build-main.yml | 4 ++--
.github/workflows/push-build-camel-3.yml | 2 +-
.github/workflows/push-build-main.yml | 2 +-
.mvn/wrapper/maven-wrapper.properties | 2 +-
12 files changed, 29 insertions(+), 34 deletions(-)
[camel] 02/04: Use mvnd 1.0-m6-m39 by default
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.git
commit 024ab8f1d68ea3a8bfa6e245ba60da18af23a56a
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jun 15 10:57:57 2023 +0200
Use mvnd 1.0-m6-m39 by default
---
.github/actions/incremental-build/action.yaml | 2 --
.github/actions/install-mvnd/action.yml | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/actions/incremental-build/action.yaml b/.github/actions/incremental-build/action.yaml
index 45782100360..99e941d2da7 100644
--- a/.github/actions/incremental-build/action.yaml
+++ b/.github/actions/incremental-build/action.yaml
@@ -37,8 +37,6 @@ runs:
- id: install-mvnd
uses: ./.github/actions/install-mvnd
with:
- version: 1.0-m6
- distribution: m39-linux-amd64
dry-run: ${{ inputs.skip-mvnd-install }}
- name: maven build
shell: bash
diff --git a/.github/actions/install-mvnd/action.yml b/.github/actions/install-mvnd/action.yml
index a18cfe0cd0f..7e25d104e37 100644
--- a/.github/actions/install-mvnd/action.yml
+++ b/.github/actions/install-mvnd/action.yml
@@ -21,11 +21,11 @@ inputs:
version:
description: 'The version of the maven daemon to install'
required: true
- default: '0.8.2'
+ default: '1.0-m6'
distribution:
description: 'The maven distribution to use'
required: true
- default: 'linux-amd64'
+ default: 'm39-linux-amd64'
dry-run:
description: 'Flag to enable to the dry-run mode'
required: true
[camel] 01/04: Upgrade Maven used by Maven Wrapper to version 3.9.2
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.git
commit 704656d121ccddd429378f2052f83863aa8f9f9e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jun 15 10:47:51 2023 +0200
Upgrade Maven used by Maven Wrapper to version 3.9.2
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 70f4f50fc39..3c6fda8c6e4 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
[camel] 03/04: Use consistent mvnd options
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.git
commit 96d53aa11a326e467e549b4e54dda1c9933a308c
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jun 15 11:48:59 2023 +0200
Use consistent mvnd options
---
.github/actions/component-test/component-test.sh | 8 +++-----
.../actions/incremental-build/incremental-build.sh | 22 ++++++++++------------
.github/actions/install-mvnd/action.yml | 3 +++
.github/actions/quick-test/quick-test.sh | 6 ++----
.github/workflows/alternative-os-build-main.yml | 2 +-
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-build-camel-3.yml | 4 ++--
.github/workflows/pr-build-main.yml | 4 ++--
.github/workflows/push-build-camel-3.yml | 2 +-
.github/workflows/push-build-main.yml | 2 +-
10 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/.github/actions/component-test/component-test.sh b/.github/actions/component-test/component-test.sh
index 50df28b8de1..e591505702b 100755
--- a/.github/actions/component-test/component-test.sh
+++ b/.github/actions/component-test/component-test.sh
@@ -15,9 +15,7 @@
# limitations under the License.
#
-# Modify maven options here if needed
-MVN_DEFAULT_OPTS="-Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=2 -Dci.env.name=github.com -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e"
-MVN_OPTS=${MVN_OPTS:-$MVN_DEFAULT_OPTS}
+echo "Using MVND_OPTS=$MVND_OPTS"
function main() {
local mavenBinary=${1}
@@ -45,10 +43,10 @@ function main() {
if [[ ${fastBuild} = "true" ]] ; then
echo "Launching a fast build against the projects ${pl} and their dependencies"
- $mavenBinary -l $log $MVN_OPTS -Pfastinstall install -pl "$pl" -am
+ $mavenBinary -l $log $MVND_OPTS -Pfastinstall install -pl "$pl" -am
else
echo "Launching tests of the projects ${pl}"
- $mavenBinary -l $log $MVN_OPTS install -pl "$pl"
+ $mavenBinary -l $log $MVND_OPTS install -pl "$pl"
fi
}
diff --git a/.github/actions/incremental-build/incremental-build.sh b/.github/actions/incremental-build/incremental-build.sh
index 88a2def6d4c..c76d04b6969 100755
--- a/.github/actions/incremental-build/incremental-build.sh
+++ b/.github/actions/incremental-build/incremental-build.sh
@@ -15,9 +15,7 @@
# limitations under the License.
#
-# Modify maven options here if needed
-MVN_DEFAULT_OPTS="-Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Daether.connector.http.connectionMaxTtl=120 -Daether.connector.requestTimeout=300000 -e -Dmaven.artifact.threads=25 -Daether.dependencyCollector.impl=bf"
-MVN_OPTS=${MVN_OPTS:-$MVN_DEFAULT_OPTS}
+echo "Using MVND_OPTS=$MVND_OPTS"
maxNumberOfBuildableProjects=100
maxNumberOfTestableProjects=50
@@ -80,10 +78,10 @@ function main() {
if [[ ${mode} = "checkstyle" ]] ; then
if [[ ${buildAll} = "true" ]] ; then
echo "Launching checkstyle command against all projects"
- $mavenBinary -l $log $MVN_OPTS -Dcheckstyle.failOnViolation=true checkstyle:checkstyle
+ $mavenBinary -l $log $MVND_OPTS -Dcheckstyle.failOnViolation=true checkstyle:checkstyle
else
echo "Launching checkstyle command against the projects ${pl}"
- $mavenBinary -l $log $MVN_OPTS -Dcheckstyle.failOnViolation=true checkstyle:checkstyle -pl "$pl"
+ $mavenBinary -l $log $MVND_OPTS -Dcheckstyle.failOnViolation=true checkstyle:checkstyle -pl "$pl"
fi
elif [[ ${mode} = "build" ]] ; then
local mustBuildAll
@@ -94,7 +92,7 @@ function main() {
fi
if [[ ${buildAll} = "true" ]] ; then
echo "Launching fast build command against all projects"
- $mavenBinary -l $log $MVN_OPTS -Pfastinstall install
+ $mavenBinary -l $log $MVND_OPTS -Pfastinstall install
else
local buildDependents
buildDependents=$(hasLabel ${prId} "build-dependents")
@@ -103,14 +101,14 @@ function main() {
echo "The build-dependents label has been detected thus the projects that depend on the affected projects will be built"
totalTestableProjects=0
else
- totalTestableProjects=$(mvn -q -amd exec:exec -Dexec.executable="pwd" -pl "$pl" | wc -l)
+ totalTestableProjects=$(./mvnw -q -amd exec:exec -Dexec.executable="pwd" -pl "$pl" | wc -l)
fi
if [[ ${totalTestableProjects} -gt ${maxNumberOfTestableProjects} ]] ; then
echo "Launching fast build command against the projects ${pl}, their dependencies and the projects that depend on them"
- $mavenBinary -l $log $MVN_OPTS -Pfastinstall install -pl "$pl" -amd -am
+ $mavenBinary -l $log $MVND_OPTS -Pfastinstall install -pl "$pl" -amd -am
else
echo "Launching fast build command against the projects ${pl} and their dependencies"
- $mavenBinary -l $log $MVN_OPTS -Pfastinstall install -pl "$pl" -am
+ $mavenBinary -l $log $MVND_OPTS -Pfastinstall install -pl "$pl" -am
fi
fi
else
@@ -129,14 +127,14 @@ function main() {
echo "The test-dependents label has been detected thus the projects that depend on affected projects will be tested"
totalTestableProjects=0
else
- totalTestableProjects=$(mvn -q -amd exec:exec -Dexec.executable="pwd" -pl "$pl" | wc -l)
+ totalTestableProjects=$(./mvnw -q -amd exec:exec -Dexec.executable="pwd" -pl "$pl" | wc -l)
fi
if [[ ${totalTestableProjects} -gt ${maxNumberOfTestableProjects} ]] ; then
echo "There are too many projects to test so only the affected projects are tested"
- $mavenBinary -l $log $MVN_OPTS install -pl "$pl"
+ $mavenBinary -l $log $MVND_OPTS install -pl "$pl"
else
echo "Testing the affected projects and the projects that depend on them"
- $mavenBinary -l $log $MVN_OPTS install -pl "$pl" -amd
+ $mavenBinary -l $log $MVND_OPTS install -pl "$pl" -amd
fi
fi
fi
diff --git a/.github/actions/install-mvnd/action.yml b/.github/actions/install-mvnd/action.yml
index 7e25d104e37..eb4fb89f22c 100644
--- a/.github/actions/install-mvnd/action.yml
+++ b/.github/actions/install-mvnd/action.yml
@@ -53,3 +53,6 @@ runs:
- id: mvnd-location
run: echo "mvnd-dir=/tmp/maven-mvnd-${{ inputs.version }}-${{ inputs.distribution }}/bin" >> $GITHUB_OUTPUT
shell: bash
+ - id: mvnd-opts
+ run: echo "MVND_OPTS=-V -e -ntp -Dmvnd.threads=2 -Daether.connector.http.connectionMaxTtl=120 -Daether.connector.requestTimeout=300000 -Daether.dependencyCollector.impl=bf -Dmaven.artifact.threads=25 -Dci.env.name=github.com -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=2" >> $GITHUB_ENV
+ shell: bash
diff --git a/.github/actions/quick-test/quick-test.sh b/.github/actions/quick-test/quick-test.sh
index 5a1ac781dba..76c01da8d01 100755
--- a/.github/actions/quick-test/quick-test.sh
+++ b/.github/actions/quick-test/quick-test.sh
@@ -21,9 +21,7 @@
# The result and other important data is saved on log files (i.e.: test log, the PR number and the result message).
# The log file is archived by the action (see: action.yaml file)
-# Modify maven options here if needed
-MVN_DEFAULT_OPTS="-Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=2 -Dci.env.name=github.com"
-MVN_OPTS=${MVN_OPTS:-$MVN_DEFAULT_OPTS}
+echo "Using MVND_OPTS=$MVND_OPTS"
# Script variables
failures=0
@@ -104,7 +102,7 @@ function runTest() {
echo ""
echo "Logging test to ${logDir}/${component/\//-}.log"
- mvn -l "${logDir}/${component/\//-}.log" -Psourcecheck ${MVN_OPTS} verify
+ ./mvnw -l "${logDir}/${component/\//-}.log" -Psourcecheck ${MVND_OPTS} verify
if [[ $? -ne 0 ]]; then
((failures++))
notifyError "${component} test" "${total}" "${current}" "${failures}"
diff --git a/.github/workflows/alternative-os-build-main.yml b/.github/workflows/alternative-os-build-main.yml
index 52271bb1f62..ab26d7f7367 100644
--- a/.github/workflows/alternative-os-build-main.yml
+++ b/.github/workflows/alternative-os-build-main.yml
@@ -46,7 +46,7 @@ jobs:
java-version: 17
cache: 'maven'
- name: mvn sourcecheck ${{ matrix.os }}
- run: mvn -B -V -D'http.keepAlive=false' -l build.log -D'maven.wagon.http.pool=false' -D'maven.wagon.httpconnectionManager.ttlSeconds=120' --no-transfer-progress -P'format,fastinstall' -DskipTests verify
+ run: ./mvnw -B -V -D'http.keepAlive=false' -l build.log -D'maven.wagon.http.pool=false' -D'maven.wagon.httpconnectionManager.ttlSeconds=120' --no-transfer-progress -P'format,fastinstall' -DskipTests verify
- name: Archive logs ${{ matrix.os }}
uses: actions/upload-artifact@v3
if: always()
diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml
index 2b5855a5295..49b9201d3eb 100644
--- a/.github/workflows/generate-sbom-main.yml
+++ b/.github/workflows/generate-sbom-main.yml
@@ -48,7 +48,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn build and sbom generation
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Psbom,fastinstall -DskipTests verify
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Psbom,fastinstall -DskipTests verify
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
diff --git a/.github/workflows/pr-build-camel-3.yml b/.github/workflows/pr-build-camel-3.yml
index 0884fc14c62..9bafb939aa0 100644
--- a/.github/workflows/pr-build-camel-3.yml
+++ b/.github/workflows/pr-build-camel-3.yml
@@ -47,7 +47,7 @@ jobs:
java-version: 11
cache: 'maven'
- name: mvn checkstyle
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -Dcheckstyle.failOnViolation=true -e checkstyle:checkstyle
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log $MVND_OPTS -e checkstyle:checkstyle
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
@@ -88,7 +88,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Pfastinstall -DskipTests install
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Pfastinstall -DskipTests install
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index f8dbf8d8802..1e740d5116f 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -45,7 +45,7 @@ jobs:
java-version: 17
cache: 'maven'
- name: mvn checkstyle
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -Dcheckstyle.failOnViolation=true -e checkstyle:checkstyle
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log $MVND_OPTS -e checkstyle:checkstyle
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
@@ -86,7 +86,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Pfastinstall -DskipTests install
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Pfastinstall -DskipTests install
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
diff --git a/.github/workflows/push-build-camel-3.yml b/.github/workflows/push-build-camel-3.yml
index ac8b103cd50..6e2e16fe2f2 100644
--- a/.github/workflows/push-build-camel-3.yml
+++ b/.github/workflows/push-build-camel-3.yml
@@ -54,7 +54,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn formatter and build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Pformat,fastinstall -DskipTests verify
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Pformat,fastinstall -DskipTests verify
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
diff --git a/.github/workflows/push-build-main.yml b/.github/workflows/push-build-main.yml
index 9527a95aa53..770a758921b 100644
--- a/.github/workflows/push-build-main.yml
+++ b/.github/workflows/push-build-main.yml
@@ -54,7 +54,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn formatter and build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -e -Pformat,fastinstall -DskipTests verify
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Pformat,fastinstall -DskipTests verify
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
[camel] 04/04: Use mvnw 3.9.2 instead of mvnd 1.0-m6-m39 in the main build to avoid https://github.com/apache/maven-resolver/pull/274; this can be reverted when mvnd 1.0-m6-m39.next is out
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.git
commit 8bb5c67e9421a13d87474c67048ca278d621e074
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jun 15 23:29:36 2023 +0200
Use mvnw 3.9.2 instead of mvnd 1.0-m6-m39 in the main build to avoid https://github.com/apache/maven-resolver/pull/274; this can be reverted when mvnd 1.0-m6-m39.next is out
---
.github/workflows/pr-build-main.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 1e740d5116f..0db23f12425 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -45,7 +45,7 @@ jobs:
java-version: 17
cache: 'maven'
- name: mvn checkstyle
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l checkstyle.log $MVND_OPTS -e checkstyle:checkstyle
+ run: ./mvnw -l checkstyle.log $MVND_OPTS -e checkstyle:checkstyle
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
@@ -86,7 +86,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log $MVND_OPTS -Pfastinstall -DskipTests install
+ run: ./mvnw -l build.log $MVND_OPTS -Pfastinstall -DskipTests install
- name: archive logs
uses: actions/upload-artifact@v3
if: always()