diff --git a/.travis.yml b/.travis.yml index c351d40b6..d6774cfc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ install: sudo apt-get install -y mingw-w64 ; fi - if [[ "${JOB_NAME}" == cmake* ]] && [ "${TRAVIS_OS_NAME}" == linux ]; then - CMAKE_DIST_URL="https://github.com/pdillinger/rocksdb/releases/download/cmake-3.14.5/cmake-3.14.5-Linux-$(uname -m).tar.bz2"; + CMAKE_DIST_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/cmake-3.14.5-Linux-$(uname -m).tar.bz2"; TAR_OPT="--strip-components=1 -xj"; if [ "aarch64" == "$(uname -m)" ]; then sudo apt-get install -y libuv1 librhash0; diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index dc4191171..8fc7bea9b 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -318,11 +318,9 @@ endif() if (DEFINED CUSTOM_DEPS_URL) set(DEPS_URL ${CUSTOM_DEPS_URL}/) else () - # This is a URL for artifacts from a "fake" release on pdillinger's fork, - # so as not to put binaries in git (ew). We should move to hosting these - # under the facebook account on github, or something else more reliable - # than maven.org, which has been failing frequently from Travis. - set(DEPS_URL "https://github.com/pdillinger/rocksdb/releases/download/v6.6.x-java-deps") + # Using a Facebook AWS account for S3 storage. (maven.org has a history + # of failing in Travis builds.) + set(DEPS_URL "https://rocksdb-deps.s3-us-west-2.amazonaws.com/jars") endif() if(NOT EXISTS ${JAVA_JUNIT_JAR}) diff --git a/java/Makefile b/java/Makefile index 89e96c458..c2600cf98 100644 --- a/java/Makefile +++ b/java/Makefile @@ -217,11 +217,9 @@ ifneq ($(DEBUG_LEVEL),0) JAVAC_ARGS += -Xlint:deprecation -Xlint:unchecked endif -# This is a URL for artifacts from a "fake" release on pdillinger's fork, -# so as not to put binaries in git (ew). We should move to hosting these -# under the facebook account on github, or something else more reliable -# than maven.org, which has been failing frequently from Travis. -DEPS_URL?=https://github.com/pdillinger/rocksdb/releases/download/v6.6.x-java-deps +# Using a Facebook AWS account for S3 storage. (maven.org has a history +# of failing in Travis builds.) +DEPS_URL?=https://rocksdb-deps.s3-us-west-2.amazonaws.com/jars clean: clean-not-downloaded clean-downloaded