This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new e9755a63b RATIS-2204. Avoid downloads from repository.apache.org
(#1187)
e9755a63b is described below
commit e9755a63b1392bc2d665c1ca2b5e566e65d8b175
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Dec 11 18:20:27 2024 +0100
RATIS-2204. Avoid downloads from repository.apache.org (#1187)
---
dev-support/checks/build.sh | 2 +-
dev-support/checks/checkstyle.sh | 2 +-
dev-support/checks/coverage.sh | 2 +-
dev-support/checks/findbugs.sh | 2 +-
dev-support/checks/rat.sh | 2 +-
dev-support/checks/repro.sh | 2 +-
dev-support/checks/sonar.sh | 2 +-
dev-support/checks/unit.sh | 2 +-
pom.xml | 12 ++++--------
9 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dev-support/checks/build.sh b/dev-support/checks/build.sh
index 6add1ae60..ee8d3f3d7 100755
--- a/dev-support/checks/build.sh
+++ b/dev-support/checks/build.sh
@@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh"
: ${WITH_COVERAGE:="false"}
-MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests
--no-transfer-progress'
+MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests'
if [[ "${WITH_COVERAGE}" != "true" ]]; then
MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"
diff --git a/dev-support/checks/checkstyle.sh b/dev-support/checks/checkstyle.sh
index a2ee42738..cb06fdaac 100755
--- a/dev-support/checks/checkstyle.sh
+++ b/dev-support/checks/checkstyle.sh
@@ -23,7 +23,7 @@ REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../target/checkstyle"}
mkdir -p "$REPORT_DIR"
REPORT_FILE="$REPORT_DIR/summary.txt"
-MAVEN_OPTIONS='-B -fae --no-transfer-progress
-Dcheckstyle.failOnViolation=false'
+MAVEN_OPTIONS='-B -fae -Dcheckstyle.failOnViolation=false'
declare -i rc
${MVN} ${MAVEN_OPTIONS} checkstyle:check | tee "${REPORT_DIR}/output.log"
diff --git a/dev-support/checks/coverage.sh b/dev-support/checks/coverage.sh
index a2fab9b32..ff0aef1a4 100755
--- a/dev-support/checks/coverage.sh
+++ b/dev-support/checks/coverage.sh
@@ -29,7 +29,7 @@ mkdir -p "$REPORT_DIR"
JACOCO_VERSION=$(${MVN} help:evaluate -Dexpression=jacoco.version -q
-DforceStdout)
#Install jacoco cli
-${MVN} --non-recursive --no-transfer-progress \
+${MVN} --non-recursive \
org.apache.maven.plugins:maven-dependency-plugin:3.6.1:copy \
-Dartifact=org.jacoco:org.jacoco.cli:${JACOCO_VERSION}:jar:nodeps
diff --git a/dev-support/checks/findbugs.sh b/dev-support/checks/findbugs.sh
index 17c669b8d..3a063b3fa 100755
--- a/dev-support/checks/findbugs.sh
+++ b/dev-support/checks/findbugs.sh
@@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh"
: ${WITH_COVERAGE:="false"}
-MAVEN_OPTIONS='-B -fae --no-transfer-progress'
+MAVEN_OPTIONS='-B -fae'
if ! type unionBugs >/dev/null 2>&1 || ! type convertXmlToText >/dev/null
2>&1; then
#shellcheck disable=SC2086
diff --git a/dev-support/checks/rat.sh b/dev-support/checks/rat.sh
index 34d8a2585..9b55878ef 100755
--- a/dev-support/checks/rat.sh
+++ b/dev-support/checks/rat.sh
@@ -23,7 +23,7 @@ mkdir -p "$REPORT_DIR"
REPORT_FILE="$REPORT_DIR/summary.txt"
-${MVN} -B -fn --no-transfer-progress
org.apache.rat:apache-rat-plugin:0.13:check
+${MVN} -B -fn org.apache.rat:apache-rat-plugin:0.13:check
cd "$DIR/../.." || exit 1
diff --git a/dev-support/checks/repro.sh b/dev-support/checks/repro.sh
index c87443ef2..88941bc28 100755
--- a/dev-support/checks/repro.sh
+++ b/dev-support/checks/repro.sh
@@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh"
: ${WITH_COVERAGE:="false"}
-MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests
--no-transfer-progress'
+MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests'
if [[ "${WITH_COVERAGE}" != "true" ]]; then
MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"
diff --git a/dev-support/checks/sonar.sh b/dev-support/checks/sonar.sh
index 55a46cfec..9646ab9d8 100755
--- a/dev-support/checks/sonar.sh
+++ b/dev-support/checks/sonar.sh
@@ -23,7 +23,7 @@ if [ ! "$SONAR_TOKEN" ]; then
exit 1
fi
-${MVN} -B verify -DskipShade -DskipTests --no-transfer-progress \
+${MVN} -B verify -DskipShade -DskipTests \
org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar \
-Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache
-Dsonar.projectKey=apache-ratis
diff --git a/dev-support/checks/unit.sh b/dev-support/checks/unit.sh
index 389c5c527..c652136da 100755
--- a/dev-support/checks/unit.sh
+++ b/dev-support/checks/unit.sh
@@ -34,7 +34,7 @@ REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../target/unit"}
mkdir -p "$REPORT_DIR"
export MAVEN_OPTS="-Xmx4096m"
-MAVEN_OPTIONS='-V -B --no-transfer-progress'
+MAVEN_OPTIONS='-V -B'
if [[ "${FAIL_FAST}" == "true" ]]; then
MAVEN_OPTIONS="${MAVEN_OPTIONS} --fail-fast
-Dsurefire.skipAfterFailureCount=1"
diff --git a/pom.xml b/pom.xml
index ec1a0f72a..43d15e321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,9 @@
<id>${distMgmtSnapshotsId}</id>
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
<repository>
<id>repository.jboss.org</id>
@@ -91,13 +94,6 @@
<module>ratis-assembly</module>
</modules>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/snapshots/</url>
- </pluginRepository>
- </pluginRepositories>
-
<scm>
<connection>scm:git:git://git.apache.org/ratis.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/ratis.git</developerConnection>
@@ -1102,7 +1098,7 @@
<execution>
<phase>package</phase>
<goals>
- <goal>makeAggregateBom</goal>
+ <goal>makeBom</goal>
</goals>
</execution>
</executions>
