Skip to content

Commit

Permalink
RATIS-2204. Avoid downloads from repository.apache.org (#1187)
Browse files Browse the repository at this point in the history
  • Loading branch information
adoroszlai authored Dec 11, 2024
1 parent a4826e2 commit e9755a6
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dev-support/checks/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dev-support/checks/checkstyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dev-support/checks/coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dev-support/checks/findbugs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-support/checks/rat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dev-support/checks/repro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dev-support/checks/sonar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion dev-support/checks/unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 4 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -1102,7 +1098,7 @@
<execution>
<phase>package</phase>
<goals>
<goal>makeAggregateBom</goal>
<goal>makeBom</goal>
</goals>
</execution>
</executions>
Expand Down

0 comments on commit e9755a6

Please sign in to comment.