From dff52ce11e33ce3daab74c5799d4b2ec08a70024 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Sat, 8 Mar 2014 09:30:23 -0500
Subject: [PATCH 1/4] Removing deprecated "re-publish release artifacts"
 behavior from tests.

In sbt 1.0 republishing released artifacts will be removed, causing these tests
to fail.  We migrate to SNAPSHOT version now, to prevent suprises.
---
 .../cache-resolver/changes/def/Build.scala                      | 2 +-
 .../dependency-management/cache-resolver/changes/use/build.sbt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
index d9aec4fe0..6ac5b8a06 100644
--- 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
index b458ab994..943590924 100644
--- 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
\ No newline at end of file

From 56232e20254d542f48558cc199401d14562ba266 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Thu, 20 Feb 2014 20:11:17 -0500
Subject: [PATCH 2/4] First attempt at travis-ci integration for sbt.

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..98060f5ae
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: scala
+script:
+  - sbt launcher/test actions/test api/test apply-macro/test cache/test classfile/test classpath/test collections/test command/test compile/test completion/test contorl/test cross/test incremental-compiler/test io/test ivy/test logic/test main/test main-settings/test persist/test relation/test run/test tasks/test test-agent/test tracking/test testing/test
+  - sbt scripted 
+jdk:
+  - openjdk6
+notifications:
+  email:
+    - qbranch@typesafe.com

From c09c78a9b5cd48463b4d92cb593b817bf27e8cab Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Sat, 8 Mar 2014 10:22:03 -0500
Subject: [PATCH 3/4] For now only run integration tests from travis (OoM
 errors).

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 98060f5ae..57126e4b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: scala
 script:
-  - sbt launcher/test actions/test api/test apply-macro/test cache/test classfile/test classpath/test collections/test command/test compile/test completion/test contorl/test cross/test incremental-compiler/test io/test ivy/test logic/test main/test main-settings/test persist/test relation/test run/test tasks/test test-agent/test tracking/test testing/test
   - sbt scripted 
 jdk:
   - openjdk6

From 4a7f5aa92f280c7bd6bc8aeb48785825d01cc477 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Sat, 8 Mar 2014 10:50:33 -0500
Subject: [PATCH 4/4] Split scripted tests into matrix so we run on parallel
 virtual machines.

---
 .travis.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 57126e4b7..09b114161 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,17 @@
 language: scala
 script:
-  - sbt scripted 
+  - 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: