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/04/30 22:04:52 UTC
[camel-quarkus] branch main updated (12b15469c5 -> a89132ab6f)
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 12b15469c5 Fixup 9db92b2 Upgrade to Maven Wrapper 3.2.0 and Maven 3.9.1
new 7c8af33103 Remove Wagon related configuration as Maven 3.9.0+ does not use Wagon for http by default
new f66584aabe Limit aether.connector.http.connectionMaxTtl to 120 seconds to avoid Connection timeouts on Github actions #4842
new a89132ab6f Patch mvnw with maven-resolver-1.9.8 artifacts so that it honors aether.connector.http.connectionMaxTtl to avoid Connect timeouts on GH actions
The 3 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 | 37 +++++++++++++++++++++++-
.github/workflows/ci-build.yaml | 45 ++++++++++++++++++++++++++++-
.github/workflows/generate-sbom-main.yml | 6 +++-
.github/workflows/pr-validate.yml | 9 +++++-
.github/workflows/quarkus-master-cron.yaml | 37 +++++++++++++++++++++++-
patch-mvnw.sh | 46 ++++++++++++++++++++++++++++++
6 files changed, 175 insertions(+), 5 deletions(-)
create mode 100755 patch-mvnw.sh
[camel-quarkus] 03/03: Patch mvnw with maven-resolver-1.9.8 artifacts so that it honors aether.connector.http.connectionMaxTtl to avoid Connect timeouts on GH actions
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 a89132ab6feb28c0750f9f8b2ce280f57f2059d8
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sun Apr 30 21:39:07 2023 +0200
Patch mvnw with maven-resolver-1.9.8 artifacts so that it honors aether.connector.http.connectionMaxTtl to avoid Connect timeouts on GH actions
---
.github/workflows/camel-master-cron.yaml | 35 +++++++++++++++++++++++
.github/workflows/ci-build.yaml | 43 ++++++++++++++++++++++++++++
.github/workflows/pr-validate.yml | 7 +++++
.github/workflows/quarkus-master-cron.yaml | 35 +++++++++++++++++++++++
patch-mvnw.sh | 46 ++++++++++++++++++++++++++++++
5 files changed, 166 insertions(+)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index f39d7d3b10..40b8261c74 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -63,6 +63,13 @@ jobs:
git fetch origin main
git rebase origin/main
git rev-parse origin/main > ~/build-data/main-sha.txt
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: mvn clean install -DskipTests
run: |
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
@@ -135,6 +142,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: Integration Tests
run: |
for MODULE in $(yq -M -N e ".${{ matrix.category }}" tooling/scripts/test-categories.yaml | cut -f2 -d' '); do
@@ -213,6 +227,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd extensions-core && mvn test
run: |
cd extensions-core
@@ -292,6 +313,13 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
@@ -339,6 +367,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd integration-tests && mvn clean verify
shell: bash
run: |
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index cdae7f887a..67a21499b3 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -85,6 +85,14 @@ jobs:
with:
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
+ - name: Patch mvnw
+ if: steps.init.outputs.run-checks == 'true'
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: Pre build checks
id: pre-build-checks
run: |
@@ -151,6 +159,13 @@ jobs:
with:
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: mvn clean install -DskipTests
run: |
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
@@ -217,6 +232,13 @@ jobs:
df -h /
tar -xzf ../maven-repo.tgz -C ~
df -h /
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: Integration Tests
run: |
for MODULE in $(yq -M -N e ".${{ matrix.category }}" tooling/scripts/test-categories.yaml | cut -f2 -d' '); do
@@ -294,6 +316,13 @@ jobs:
df -h /
tar -xzf ../maven-repo.tgz -C ~
df -h /
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd extensions-core && mvn test
run: |
cd extensions-core
@@ -371,6 +400,13 @@ jobs:
echo "HOSTS_LINE=$HOSTS_LINE"
echo "${HOSTS_LINE}" | sudo tee -a /etc/hosts
cat /etc/hosts
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
@@ -419,6 +455,13 @@ jobs:
shell: bash
run: |
tar -xzf ../maven-repo.tgz -C ~
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd integration-tests && mvn clean verify
shell: bash
run: |
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index 5a38be0ffa..fb73949808 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -59,6 +59,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: mvn validate
run: |
./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -fae \
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index ed16c129cf..74a5789c0d 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -69,6 +69,13 @@ jobs:
&& cd quarkus \
&& echo "Current Quarkus commit:" $(git rev-parse HEAD) \
&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: mvn clean install -DskipTests
run: |
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
@@ -141,6 +148,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: Integration Tests
run: |
for MODULE in $(yq -M -N e ".${{ matrix.category }}" tooling/scripts/test-categories.yaml | cut -f2 -d' '); do
@@ -219,6 +233,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd extensions-core && mvn test
run: |
cd extensions-core
@@ -298,6 +319,13 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
@@ -345,6 +373,13 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
+ - name: Patch mvnw
+ run: |
+ # This can be removed after upgrading to Maven 3.9.2
+ # make sure mvnw is installed
+ ./mvnw -v
+ # upgrade maven-resolver artifacts
+ ./patch-mvnw.sh
- name: cd integration-tests && mvn clean verify
shell: bash
run: |
diff --git a/patch-mvnw.sh b/patch-mvnw.sh
new file mode 100755
index 0000000000..7a914cb1ac
--- /dev/null
+++ b/patch-mvnw.sh
@@ -0,0 +1,46 @@
+#!/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.
+#
+
+
+# A script to replace maven-resolver 1.9.7 artifacts with 1.9.8 ones
+# This is to be able to set aether.connector.http.connectionMaxTtl
+# which is supported only since 1.9.8
+# This is motivated by https://github.com/apache/camel-quarkus/issues/4842
+# This workaround can be removed after the upgrade to Maven 3.9.2
+
+#set -x
+set -e
+
+cd ~/.m2/wrapper/dists/apache-maven-3.9.1-bin/*/apache-maven-3.9.1/lib
+for oldJar in maven-resolver-*-1.9.7.jar; do
+ if [ "$oldJar" != 'maven-resolver-*-1.9.7.jar' ]; then
+ base="${oldJar/%-1.9.7.jar}"
+ echo $base
+ newJar="$base-1.9.8.jar"
+ if [[ ! -f "$newJar" ]]
+ then
+ echo "Downloading $newJar"
+ curl -s -O "https://repo1.maven.org/maven2/org/apache/maven/resolver/$base/1.9.8/$newJar"
+ fi
+ if [[ -f "$oldJar" ]]
+ then
+ echo "Deleting $oldJar"
+ rm "$oldJar"
+ fi
+ fi
+done
[camel-quarkus] 02/03: Limit aether.connector.http.connectionMaxTtl to 120 seconds to avoid Connection timeouts on Github actions #4842
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 f66584aabe8f4ff86bc1bb06af0b58a8de859604
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sun Apr 30 21:22:13 2023 +0200
Limit aether.connector.http.connectionMaxTtl to 120 seconds to avoid
Connection timeouts on Github actions #4842
---
.github/workflows/camel-master-cron.yaml | 2 +-
.github/workflows/ci-build.yaml | 2 +-
.github/workflows/generate-sbom-main.yml | 6 +++++-
.github/workflows/pr-validate.yml | 2 +-
.github/workflows/quarkus-master-cron.yaml | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index 7c95f4c8e8..f39d7d3b10 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
- CQ_MAVEN_ARGS: -V -ntp -e
+ CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120
BRANCH_OPTIONS: -Papache-snapshots
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2927
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 097a5c2686..cdae7f887a 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
- CQ_MAVEN_ARGS: -V -ntp -e
+ CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120
TESTCONTAINERS_RYUK_DISABLED: true
CHECKOUT_REF: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' && github.head_ref || '' }}
diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml
index 0fc8595582..649fef15b3 100644
--- a/.github/workflows/generate-sbom-main.yml
+++ b/.github/workflows/generate-sbom-main.yml
@@ -21,6 +21,10 @@ on:
schedule:
- cron: '30 10 * * 0'
workflow_dispatch:
+env:
+ LANG: en_US.UTF-8
+ MAVEN_OPTS: -Xmx3000m
+ CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120
permissions: {}
jobs:
@@ -47,7 +51,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn build and sbom generation
- run: ./mvnw -V --no-transfer-progress -e -Psbom -Dquickly -DskipTests verify
+ run: ./mvnw -V --no-transfer-progress -e -Psbom -Dquickly -DskipTests verify ${CQ_MAVEN_ARGS}
- 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 ee37632c04..5a38be0ffa 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
- CQ_MAVEN_ARGS: -V -ntp -e
+ CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120
jobs:
check-format:
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index fa41989469..ed16c129cf 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
- CQ_MAVEN_ARGS: -V -ntp -e
+ CQ_MAVEN_ARGS: -V -ntp -e -Daether.connector.http.connectionMaxTtl=120
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2926
[camel-quarkus] 01/03: Remove Wagon related configuration as Maven 3.9.0+ does not use Wagon for http 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-quarkus.git
commit 7c8af33103b0fd7d2ad1a3375d62f8c9afb83c8f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sun Apr 30 21:11:11 2023 +0200
Remove Wagon related configuration as Maven 3.9.0+ does not use Wagon
for http by default
---
.github/workflows/camel-master-cron.yaml | 2 +-
.github/workflows/ci-build.yaml | 2 +-
.github/workflows/generate-sbom-main.yml | 2 +-
.github/workflows/pr-validate.yml | 2 +-
.github/workflows/quarkus-master-cron.yaml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index 8fbb622321..7c95f4c8e8 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
- CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=30 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10 -e
+ CQ_MAVEN_ARGS: -V -ntp -e
BRANCH_OPTIONS: -Papache-snapshots
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2927
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 56b9f98788..097a5c2686 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
- CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=30 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10 -e
+ CQ_MAVEN_ARGS: -V -ntp -e
TESTCONTAINERS_RYUK_DISABLED: true
CHECKOUT_REF: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' && github.head_ref || '' }}
diff --git a/.github/workflows/generate-sbom-main.yml b/.github/workflows/generate-sbom-main.yml
index ebdf26aa62..0fc8595582 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: ./mvnw -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 --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 56a4067f0e..ee37632c04 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
- CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=30 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10 -e
+ CQ_MAVEN_ARGS: -V -ntp -e
jobs:
check-format:
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index 19a5c7f5fd..fa41989469 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
- CQ_MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=30 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10 -e
+ CQ_MAVEN_ARGS: -V -ntp -e
TESTCONTAINERS_RYUK_DISABLED: true
ISSUE_ID: 2926