This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 061fb4b [Build] Remove replace_maven-wagon-http-version.sh script
which is obsolete with Maven 3.8.1+ (#11718)
061fb4b is described below
commit 061fb4b313bd592f4218ebaec5a030734be5142e
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Thu Aug 19 22:07:09 2021 +0300
[Build] Remove replace_maven-wagon-http-version.sh script which is obsolete
with Maven 3.8.1+ (#11718)
- reverts #9883 changes
- the solution is no more needed since GitHub Actions uses maven version
3.8.1+
and contains the maven-wagon-http version which includes fixes for
https://issues.apache.org/jira/browse/HTTPCORE-634 /
https://issues.apache.org/jira/browse/WAGON-607
---
.github/workflows/ci-build-macos.yaml | 4 ----
.github/workflows/ci-cpp.yaml | 4 ----
.../ci-integration-backwards-compatibility.yaml | 4 ----
.github/workflows/ci-integration-cli.yaml | 4 ----
.github/workflows/ci-integration-function.yaml | 4 ----
.github/workflows/ci-integration-messaging.yaml | 4 ----
.github/workflows/ci-integration-process.yaml | 4 ----
.github/workflows/ci-integration-pulsar-io.yaml | 4 ----
.github/workflows/ci-integration-schema.yaml | 4 ----
.github/workflows/ci-integration-sql.yaml | 4 ----
.github/workflows/ci-integration-standalone.yaml | 4 ----
.github/workflows/ci-integration-thread.yaml | 4 ----
.../ci-integration-tiered-filesystem.yaml | 4 ----
.../workflows/ci-integration-tiered-jcloud.yaml | 4 ----
.github/workflows/ci-integration-transaction.yaml | 4 ----
.github/workflows/ci-license.yaml | 4 ----
.github/workflows/ci-maven-cache-update.yaml | 4 ----
.github/workflows/ci-owasp-dependency-check.yaml | 3 ---
.github/workflows/ci-pulsar-website-build.yaml | 3 ---
.github/workflows/ci-shade-test.yaml | 4 ----
.github/workflows/ci-unit-broker-broker-gp1.yaml | 4 ----
.github/workflows/ci-unit-broker-broker-gp2.yaml | 4 ----
.github/workflows/ci-unit-broker-client-api.yaml | 4 ----
.github/workflows/ci-unit-broker-client-impl.yaml | 4 ----
.github/workflows/ci-unit-broker-jdk8.yaml | 4 ----
.github/workflows/ci-unit-broker-other.yaml | 4 ----
.github/workflows/ci-unit-proxy.yaml | 4 ----
.github/workflows/ci-unit.yaml | 4 ----
build/replace_maven-wagon-http-version.sh | 28 ----------------------
29 files changed, 138 deletions(-)
diff --git a/.github/workflows/ci-build-macos.yaml
b/.github/workflows/ci-build-macos.yaml
index eaedea8..0236ab3 100644
--- a/.github/workflows/ci-build-macos.yaml
+++ b/.github/workflows/ci-build-macos.yaml
@@ -72,10 +72,6 @@ jobs:
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build package
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B clean install -DskipTests
diff --git a/.github/workflows/ci-cpp.yaml b/.github/workflows/ci-cpp.yaml
index 94d1210..70f5f6f 100644
--- a/.github/workflows/ci-cpp.yaml
+++ b/.github/workflows/ci-cpp.yaml
@@ -78,10 +78,6 @@ jobs:
docker rmi $(docker images -q) -f
df -h
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build package
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-integration-backwards-compatibility.yaml
b/.github/workflows/ci-integration-backwards-compatibility.yaml
index ea9dc0d..3b13b63 100644
--- a/.github/workflows/ci-integration-backwards-compatibility.yaml
+++ b/.github/workflows/ci-integration-backwards-compatibility.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-cli.yaml
b/.github/workflows/ci-integration-cli.yaml
index 47af7d1..cf51dcc 100644
--- a/.github/workflows/ci-integration-cli.yaml
+++ b/.github/workflows/ci-integration-cli.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-function.yaml
b/.github/workflows/ci-integration-function.yaml
index c4f9e07..52b6d8f 100644
--- a/.github/workflows/ci-integration-function.yaml
+++ b/.github/workflows/ci-integration-function.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-messaging.yaml
b/.github/workflows/ci-integration-messaging.yaml
index 00e615b..0a81e4a 100644
--- a/.github/workflows/ci-integration-messaging.yaml
+++ b/.github/workflows/ci-integration-messaging.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-process.yaml
b/.github/workflows/ci-integration-process.yaml
index 404ce7a..a5523c1 100644
--- a/.github/workflows/ci-integration-process.yaml
+++ b/.github/workflows/ci-integration-process.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-pulsar-io.yaml
b/.github/workflows/ci-integration-pulsar-io.yaml
index 2052e42..538e94e2 100644
--- a/.github/workflows/ci-integration-pulsar-io.yaml
+++ b/.github/workflows/ci-integration-pulsar-io.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-schema.yaml
b/.github/workflows/ci-integration-schema.yaml
index 571d22a..edeec55 100644
--- a/.github/workflows/ci-integration-schema.yaml
+++ b/.github/workflows/ci-integration-schema.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-sql.yaml
b/.github/workflows/ci-integration-sql.yaml
index 74951e3..53c9968 100644
--- a/.github/workflows/ci-integration-sql.yaml
+++ b/.github/workflows/ci-integration-sql.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-standalone.yaml
b/.github/workflows/ci-integration-standalone.yaml
index 19b8bfd..dc35776 100644
--- a/.github/workflows/ci-integration-standalone.yaml
+++ b/.github/workflows/ci-integration-standalone.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-thread.yaml
b/.github/workflows/ci-integration-thread.yaml
index cd22c84..0420bae 100644
--- a/.github/workflows/ci-integration-thread.yaml
+++ b/.github/workflows/ci-integration-thread.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-tiered-filesystem.yaml
b/.github/workflows/ci-integration-tiered-filesystem.yaml
index 3ae4fca..89ed30d 100644
--- a/.github/workflows/ci-integration-tiered-filesystem.yaml
+++ b/.github/workflows/ci-integration-tiered-filesystem.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-tiered-jcloud.yaml
b/.github/workflows/ci-integration-tiered-jcloud.yaml
index 2f3dc3e..3cf661a 100644
--- a/.github/workflows/ci-integration-tiered-jcloud.yaml
+++ b/.github/workflows/ci-integration-tiered-jcloud.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-integration-transaction.yaml
b/.github/workflows/ci-integration-transaction.yaml
index b53814e..547066d 100644
--- a/.github/workflows/ci-integration-transaction.yaml
+++ b/.github/workflows/ci-integration-transaction.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-license.yaml
b/.github/workflows/ci-license.yaml
index a25eb26..f706a1c 100644
--- a/.github/workflows/ci-license.yaml
+++ b/.github/workflows/ci-license.yaml
@@ -73,10 +73,6 @@ jobs:
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
# license check fails with 3.6.2 so we have to downgrade
- name: Set up Maven
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
diff --git a/.github/workflows/ci-maven-cache-update.yaml
b/.github/workflows/ci-maven-cache-update.yaml
index 2de49a5..b04d286 100644
--- a/.github/workflows/ci-maven-cache-update.yaml
+++ b/.github/workflows/ci-maven-cache-update.yaml
@@ -105,10 +105,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ (github.event_name == 'schedule' || steps.changes.outputs.poms
== 'true') && steps.cache.outputs.cache-hit != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: Download dependencies
if: ${{ (github.event_name == 'schedule' || steps.changes.outputs.poms
== 'true') && steps.cache.outputs.cache-hit != 'true' }}
run: |
diff --git a/.github/workflows/ci-owasp-dependency-check.yaml
b/.github/workflows/ci-owasp-dependency-check.yaml
index 6d497f2..3e95127 100644
--- a/.github/workflows/ci-owasp-dependency-check.yaml
+++ b/.github/workflows/ci-owasp-dependency-check.yaml
@@ -56,9 +56,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: run install by skip tests
run: mvn -q -B -ntp clean install -DskipTests
diff --git a/.github/workflows/ci-pulsar-website-build.yaml
b/.github/workflows/ci-pulsar-website-build.yaml
index a6b196e..58d67ad 100644
--- a/.github/workflows/ci-pulsar-website-build.yaml
+++ b/.github/workflows/ci-pulsar-website-build.yaml
@@ -56,9 +56,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
run: |
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
diff --git a/.github/workflows/ci-shade-test.yaml
b/.github/workflows/ci-shade-test.yaml
index 7548ca1..8789bf7 100644
--- a/.github/workflows/ci-shade-test.yaml
+++ b/.github/workflows/ci-shade-test.yaml
@@ -72,10 +72,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: clean disk
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: |
diff --git a/.github/workflows/ci-unit-broker-broker-gp1.yaml
b/.github/workflows/ci-unit-broker-broker-gp1.yaml
index e200d61..6defee0 100644
--- a/.github/workflows/ci-unit-broker-broker-gp1.yaml
+++ b/.github/workflows/ci-unit-broker-broker-gp1.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q clean install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit-broker-broker-gp2.yaml
b/.github/workflows/ci-unit-broker-broker-gp2.yaml
index 1175c0f..821157c 100644
--- a/.github/workflows/ci-unit-broker-broker-gp2.yaml
+++ b/.github/workflows/ci-unit-broker-broker-gp2.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q clean install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit-broker-client-api.yaml
b/.github/workflows/ci-unit-broker-client-api.yaml
index 3aaba36..5bcefdd 100644
--- a/.github/workflows/ci-unit-broker-client-api.yaml
+++ b/.github/workflows/ci-unit-broker-client-api.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit-broker-client-impl.yaml
b/.github/workflows/ci-unit-broker-client-impl.yaml
index f18776a..21003a1 100644
--- a/.github/workflows/ci-unit-broker-client-impl.yaml
+++ b/.github/workflows/ci-unit-broker-client-impl.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit-broker-jdk8.yaml
b/.github/workflows/ci-unit-broker-jdk8.yaml
index 623c3ac..ce56ca2 100644
--- a/.github/workflows/ci-unit-broker-jdk8.yaml
+++ b/.github/workflows/ci-unit-broker-jdk8.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 8
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q clean install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit-broker-other.yaml
b/.github/workflows/ci-unit-broker-other.yaml
index 9098139..50a87b5 100644
--- a/.github/workflows/ci-unit-broker-other.yaml
+++ b/.github/workflows/ci-unit-broker-other.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q clean install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit-proxy.yaml
b/.github/workflows/ci-unit-proxy.yaml
index 6911b3c..bc2cfb9 100644
--- a/.github/workflows/ci-unit-proxy.yaml
+++ b/.github/workflows/ci-unit-proxy.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: build modules pulsar-proxy
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: mvn -B -ntp -q install -Pcore-modules,-main -DskipTests
diff --git a/.github/workflows/ci-unit.yaml b/.github/workflows/ci-unit.yaml
index 5715cf2..37bdfaf 100644
--- a/.github/workflows/ci-unit.yaml
+++ b/.github/workflows/ci-unit.yaml
@@ -71,10 +71,6 @@ jobs:
distribution: 'adopt'
java-version: 11
- - name: Replace maven's wagon-http version
- if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: sudo ./build/replace_maven-wagon-http-version.sh
-
- name: run unit test 'OTHER'
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
run: ./build/run_unit_group.sh OTHER
diff --git a/build/replace_maven-wagon-http-version.sh
b/build/replace_maven-wagon-http-version.sh
deleted file mode 100755
index 09b4ae3..0000000
--- a/build/replace_maven-wagon-http-version.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash -xe
-#
-# 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.
-#
-
-# patches installed maven version to get fix for
https://issues.apache.org/jira/browse/HTTPCORE-634
-
-MAVEN_HOME=$(mvn -v |grep 'Maven home:' | awk '{ print $3 }')
-if [ -d "$MAVEN_HOME" ]; then
- cd "$MAVEN_HOME/lib"
- rm wagon-http-*-shaded.jar
- curl -O
https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http/3.4.3/wagon-http-3.4.3-shaded.jar
-fi
\ No newline at end of file
