Commit fffeee1

committed

Fix JDK6 build: use http-only repos for JDK6

Workaround the lack of TLS 1.2 support in JDK6 by using http to talk to maven central, as done in scala/scala-xml#247. See scala/sbt-scala-module#41. Fixes #169.

1 parent de1c5f2 commit fffeee1Copy full SHA for fffeee1

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff 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`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,8 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then`
`50`	`50`	`openssl aes-256-cbc -K $K -iv $IV -in admin/secring.asc.enc -out admin/secring.asc -d`
`51`	`51`	`fi`
`52`	`52`
`53`		`-sbt "$publishVersion" "$publishScalaVersion" clean update +test +publishLocal $extraTarget`
	`53`	`+if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then`
	`54`	`+ SBTOPTS="-Dsbt.override.build.repos=true -Dsbt.repository.config=./.sbtrepos"`
	`55`	`+fi`
	`56`	`+`
	`57`	`+sbt $SBTOPTS "$publishVersion" "$publishScalaVersion" clean update +test +publishLocal $extraTarget`

Comments

(0)