Skip to content

Commit b1cff82

Browse files
committed
Merge pull request #243 from adriaanm/arti
use caching artifactory
2 parents 7f89652 + 67475f6 commit b1cff82

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

common.conf

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,21 +173,9 @@ vars.base.extra.commands = ${vars.default-commands}
173173
vars.ivyPat: ", [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]"
174174
options.resolvers: {
175175
01: "local"
176-
02: "maven-cache: https://scala-ci.typesafe.com/artifactory/central/"
177-
03: "typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly"
178-
04: "sbt-plugin-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/"${vars.ivyPat}
179-
05: "old-sbt-plugins: https://repo.typesafe.com/typesafe/ivy-releases/"${vars.ivyPat} // e.g. sbteclipse-plugin 2.x
180-
09: "dbuild-snapshots: http://repo.typesafe.com/typesafe/temp-distributed-build-snapshots"${vars.ivyPat}
181-
10: "maven-central"
182-
11: "old-typesafe-maven-releases: https://repo.typesafe.com/typesafe/maven-releases" // for play 2.3.9's netty-http-pipelining 1.1.2
183-
184-
// temporary, enables the fix of https://github.com/sbt/sbt-web/pull/107/files
185-
// discussion here: https://github.com/sbt/sbt-web/pull/107#issuecomment-94004046
186-
13: "bintray-eed3si9n-sbt-plugins: https://dl.bintray.com/eed3si9n/sbt-plugins"${vars.ivyPat}
187-
188-
// for Ensime's netbeans dependency
189-
14: "netbeans: http://bits.netbeans.org/nexus/content/groups/netbeans"
190-
176+
02: "dbuild: https://scala-ci.typesafe.com/artifactory/dbuild/"
177+
03: "dbuild-ivy: https://scala-ci.typesafe.com/artifactory/dbuild-ivy/"${vars.ivyPat}
178+
04: "dbuild-unchecked: https://scala-ci.typesafe.com/artifactory/dbuild-unchecked/" // for sbt plugins not available on ivy (they'll fail the pom check on the `dbuild` cache repo above)
191179
}
192180

193181
// we don't have enough disk space to keep stuff longer

0 commit comments

Comments
 (0)