Skip to content

Commit 7e8a496

Browse files
authored
Merge pull request #247 from ashawley/http-maven-resolver
Use HTTP sbt repos for JDK6
2 parents 4acc662 + 7962fbc commit 7e8a496

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.sbtrepos

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[repositories]
2+
local
3+
local-preloaded-ivy: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
4+
local-preloaded: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}
5+
maven-central: http://repo1.maven.org/maven2/
6+
sonatype-public: http://oss.sonatype.org/content/repositories/public
7+
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
8+
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

admin/build.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,9 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
5252
fi
5353
fi
5454

55-
sbt "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"
55+
# Maven Central and Bintray are unreachable over HTTPS
56+
if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then
57+
SBTOPTS="-Dsbt.override.build.repos=true -Dsbt.repository.config=./.sbtrepos"
58+
fi
59+
60+
sbt $SBTOPTS "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"

0 commit comments

Comments
 (0)