Merge pull request #1162 from sbt/wip/fix-deprecated-ivy-in-test

Removing deprecated "re-publish release artifacts" behavior from tests.
sbt · Mar 8, 2014 · 1626226 · 1626226
2 parents a4b288f + 4a7f5aa
commit 1626226
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,19 @@
+language: scala
+script:
+  - sbt "scripted $SCRIPTED_TEST"
+env:
+  - SCRIPTED_TEST=actions/*
+  - SCRIPTED_TEST=api/*
+  - SCRIPTED_TEST=compiler-project/*
+  - SCRIPTED_TEST=dependency-management/*
+  - SCRIPTED_TEST=java/*
+  - SCRIPTED_TEST=package/*
+  - SCRIPTED_TEST=reporter/*
+  - SCRIPTED_TEST=run/*
+  - SCRIPTED_TEST=source-dependencies/*
+  - SCRIPTED_TEST=tests/*
+jdk:
+  - openjdk6
+notifications:
+  email:
+    - qbranch@typesafe.com
diff --git a/sbt/src/sbt-test/dependency-management/cache-resolver/changes/def/Build.scala b/sbt/src/sbt-test/dependency-management/cache-resolver/changes/def/Build.scala
@@ -5,7 +5,7 @@ object B extends Build {
 
 	override def settings = super.settings ++ Seq(
 		organization := "org.example",
-		version := "2.0"
+		version := "2.0-SNAPSHOT"
 	)
 
 	lazy val root = proj("root", ".") aggregate(a,b)

diff --git a/sbt/src/sbt-test/dependency-management/cache-resolver/changes/use/build.sbt b/sbt/src/sbt-test/dependency-management/cache-resolver/changes/use/build.sbt
@@ -4,6 +4,6 @@ organization := "org.example"
 
 version := "1.0"
 
-libraryDependencies += "org.example" % "b" % "2.0"
+libraryDependencies += "org.example" % "b" % "2.0-SNAPSHOT"
 
 ivyPaths <<= ivyPaths in ThisBuild