From bd32be41ecd49d46303f6015e13c70f0fccd037e Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 30 Jul 2018 14:59:04 -0400 Subject: [PATCH 1/2] Configure sbt repos for JDK6 --- .sbtrepos | 8 ++++++++ admin/build.sh | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .sbtrepos diff --git a/.sbtrepos b/.sbtrepos new file mode 100644 index 000000000..07c21ad68 --- /dev/null +++ b/.sbtrepos @@ -0,0 +1,8 @@ +[repositories] + local + local-preloaded-ivy: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] + local-preloaded: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/} + maven-central: https://repo1.maven.org/maven2/ + sonatype-public: https://oss.sonatype.org/content/repositories/public + typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + sbt-ivy-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly diff --git a/admin/build.sh b/admin/build.sh index 5c5ae5724..2ebd80311 100755 --- a/admin/build.sh +++ b/admin/build.sh @@ -52,4 +52,9 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then fi fi -sbt "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask" +# Maven Central and Bintray are unreachable over HTTPS +if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then + SBTOPTS="-Dsbt.override.build.repos=true -Dsbt.repository.config=./.sbtrepos" +fi + +sbt $SBTOPTS "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask" From 7962fbc2a4fd50aeea073f7140f4f738bca7fa7a Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Mon, 30 Jul 2018 14:59:12 -0400 Subject: [PATCH 2/2] Switch to http for sbt resolvers --- .sbtrepos | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.sbtrepos b/.sbtrepos index 07c21ad68..b9e49c484 100644 --- a/.sbtrepos +++ b/.sbtrepos @@ -2,7 +2,7 @@ local local-preloaded-ivy: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] local-preloaded: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/} - maven-central: https://repo1.maven.org/maven2/ - sonatype-public: https://oss.sonatype.org/content/repositories/public - typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly - sbt-ivy-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + maven-central: http://repo1.maven.org/maven2/ + sonatype-public: http://oss.sonatype.org/content/repositories/public + typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + sbt-ivy-releases: http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly