Skip to content

Commit e9755a6

Browse files
authored
RATIS-2204. Avoid downloads from repository.apache.org (#1187)
1 parent a4826e2 commit e9755a6

File tree

9 files changed

+12
-16
lines changed

9 files changed

+12
-16
lines changed

dev-support/checks/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh"
2020

2121
: ${WITH_COVERAGE:="false"}
2222

23-
MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests --no-transfer-progress'
23+
MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests'
2424

2525
if [[ "${WITH_COVERAGE}" != "true" ]]; then
2626
MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"

dev-support/checks/checkstyle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../target/checkstyle"}
2323
mkdir -p "$REPORT_DIR"
2424
REPORT_FILE="$REPORT_DIR/summary.txt"
2525

26-
MAVEN_OPTIONS='-B -fae --no-transfer-progress -Dcheckstyle.failOnViolation=false'
26+
MAVEN_OPTIONS='-B -fae -Dcheckstyle.failOnViolation=false'
2727

2828
declare -i rc
2929
${MVN} ${MAVEN_OPTIONS} checkstyle:check | tee "${REPORT_DIR}/output.log"

dev-support/checks/coverage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mkdir -p "$REPORT_DIR"
2929
JACOCO_VERSION=$(${MVN} help:evaluate -Dexpression=jacoco.version -q -DforceStdout)
3030

3131
#Install jacoco cli
32-
${MVN} --non-recursive --no-transfer-progress \
32+
${MVN} --non-recursive \
3333
org.apache.maven.plugins:maven-dependency-plugin:3.6.1:copy \
3434
-Dartifact=org.jacoco:org.jacoco.cli:${JACOCO_VERSION}:jar:nodeps
3535

dev-support/checks/findbugs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh"
2020

2121
: ${WITH_COVERAGE:="false"}
2222

23-
MAVEN_OPTIONS='-B -fae --no-transfer-progress'
23+
MAVEN_OPTIONS='-B -fae'
2424

2525
if ! type unionBugs >/dev/null 2>&1 || ! type convertXmlToText >/dev/null 2>&1; then
2626
#shellcheck disable=SC2086

dev-support/checks/rat.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ mkdir -p "$REPORT_DIR"
2323

2424
REPORT_FILE="$REPORT_DIR/summary.txt"
2525

26-
${MVN} -B -fn --no-transfer-progress org.apache.rat:apache-rat-plugin:0.13:check
26+
${MVN} -B -fn org.apache.rat:apache-rat-plugin:0.13:check
2727

2828
cd "$DIR/../.." || exit 1
2929

dev-support/checks/repro.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ source "${DIR}/../find_maven.sh"
2020

2121
: ${WITH_COVERAGE:="false"}
2222

23-
MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests --no-transfer-progress'
23+
MAVEN_OPTIONS='-V -B -Dmaven.javadoc.skip=true -DskipTests'
2424

2525
if [[ "${WITH_COVERAGE}" != "true" ]]; then
2626
MAVEN_OPTIONS="${MAVEN_OPTIONS} -Djacoco.skip"

dev-support/checks/sonar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ ! "$SONAR_TOKEN" ]; then
2323
exit 1
2424
fi
2525

26-
${MVN} -B verify -DskipShade -DskipTests --no-transfer-progress \
26+
${MVN} -B verify -DskipShade -DskipTests \
2727
org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar \
2828
-Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
2929
-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache-ratis

dev-support/checks/unit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../target/unit"}
3434
mkdir -p "$REPORT_DIR"
3535

3636
export MAVEN_OPTS="-Xmx4096m"
37-
MAVEN_OPTIONS='-V -B --no-transfer-progress'
37+
MAVEN_OPTIONS='-V -B'
3838

3939
if [[ "${FAIL_FAST}" == "true" ]]; then
4040
MAVEN_OPTIONS="${MAVEN_OPTIONS} --fail-fast -Dsurefire.skipAfterFailureCount=1"

pom.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<id>${distMgmtSnapshotsId}</id>
5252
<name>${distMgmtSnapshotsName}</name>
5353
<url>${distMgmtSnapshotsUrl}</url>
54+
<releases>
55+
<enabled>false</enabled>
56+
</releases>
5457
</repository>
5558
<repository>
5659
<id>repository.jboss.org</id>
@@ -91,13 +94,6 @@
9194
<module>ratis-assembly</module>
9295
</modules>
9396

94-
<pluginRepositories>
95-
<pluginRepository>
96-
<id>apache.snapshots</id>
97-
<url>https://repository.apache.org/snapshots/</url>
98-
</pluginRepository>
99-
</pluginRepositories>
100-
10197
<scm>
10298
<connection>scm:git:git://git.apache.org/ratis.git</connection>
10399
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/ratis.git</developerConnection>
@@ -1102,7 +1098,7 @@
11021098
<execution>
11031099
<phase>package</phase>
11041100
<goals>
1105-
<goal>makeAggregateBom</goal>
1101+
<goal>makeBom</goal>
11061102
</goals>
11071103
</execution>
11081104
</executions>

0 commit comments

Comments
 (0)