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/05/11 21:52:56 UTC
[camel-quarkus] branch main updated (71aa57b850 -> a0cb73226c)
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 71aa57b850 Document CXF SOAP usage, configuration and limitations
new 84675851bc Revert "Patch mvnw with maven-resolver-1.9.8 artifacts so that it honors aether.connector.http.connectionMaxTtl to avoid Connect timeouts on GH actions"
new a0cb73226c Upgrade to Maven 2.9.2
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 | 35 -----------------------
.github/workflows/ci-build.yaml | 43 ----------------------------
.github/workflows/pr-validate.yml | 7 -----
.github/workflows/quarkus-master-cron.yaml | 35 -----------------------
.mvn/wrapper/maven-wrapper.properties | 2 +-
patch-mvnw.sh | 46 ------------------------------
6 files changed, 1 insertion(+), 167 deletions(-)
delete mode 100755 patch-mvnw.sh
[camel-quarkus] 01/02: Revert "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 84675851bcfa62a7165813f03619e95f4a0861c1
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu May 11 17:49:32 2023 +0200
Revert "Patch mvnw with maven-resolver-1.9.8 artifacts so that it honors aether.connector.http.connectionMaxTtl to avoid Connect timeouts on GH actions"
This reverts commit 252ff7489310be39d61bc54023ea38f71d1ec864.
---
.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 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index 40b8261c74..f39d7d3b10 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -63,13 +63,6 @@ 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
@@ -142,13 +135,6 @@ 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
@@ -227,13 +213,6 @@ 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
@@ -313,13 +292,6 @@ 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
@@ -367,13 +339,6 @@ 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 67a21499b3..cdae7f887a 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -85,14 +85,6 @@ 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: |
@@ -159,13 +151,6 @@ 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
@@ -232,13 +217,6 @@ 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
@@ -316,13 +294,6 @@ 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
@@ -400,13 +371,6 @@ 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
@@ -455,13 +419,6 @@ 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 fb73949808..5a38be0ffa 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -59,13 +59,6 @@ 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 74a5789c0d..ed16c129cf 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -69,13 +69,6 @@ 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
@@ -148,13 +141,6 @@ 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
@@ -233,13 +219,6 @@ 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
@@ -319,13 +298,6 @@ 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
@@ -373,13 +345,6 @@ 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
deleted file mode 100755
index 7a914cb1ac..0000000000
--- a/patch-mvnw.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/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/02: Upgrade to Maven 2.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-quarkus.git
commit a0cb73226c767faceabcb85670e0556f54904eac
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu May 11 17:50:39 2023 +0200
Upgrade to Maven 2.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 d8b2495a1e..3c6fda8c6e 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.9.1/apache-maven-3.9.1-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