5 files changed, 12 insertions, 12 deletions
diff --git a/test/library-test/build/build.scala b/test/library-test/build/build.scala
index 85c09ac..f16f0c2 100644
--- a/test/library-test/build/build.scala
+++ b/test/library-test/build/build.scala
@@ -1,6 +1,6 @@
 import cbt._
 
-// cbt:https://github.com/cvogt/cbt.git#fe04889a6c3fe73ccdb4b19b44ac62e2b1a96f7d
+// cbt:https://github.com/cvogt/cbt.git#f11b8318b85f16843d8cfa0743f64c1576614ad6
 class Build(val context: Context) extends BaseBuild with PackageJars{
   def groupId = "cbt.test"
   def version = "0.1"
diff --git a/test/simple-fixed-cbt/build/build.scala b/test/simple-fixed-cbt/build/build.scala
index 857f6b7..2ce1d02 100644
--- a/test/simple-fixed-cbt/build/build.scala
+++ b/test/simple-fixed-cbt/build/build.scala
@@ -1,6 +1,6 @@
 import cbt._
 
-// cbt:https://github.com/cvogt/cbt.git#fe04889a6c3fe73ccdb4b19b44ac62e2b1a96f7d
+// cbt:https://github.com/cvogt/cbt.git#f11b8318b85f16843d8cfa0743f64c1576614ad6
 class Build(val context: cbt.Context) extends PackageJars{
   override def dependencies = super.dependencies ++ Seq(
     DirectoryDependency( context.cbtHome ++ "/test/library-test" )
diff --git a/test/simple-fixed/build/build.scala b/test/simple-fixed/build/build.scala
index a0b192a..b46c337 100644
--- a/test/simple-fixed/build/build.scala
+++ b/test/simple-fixed/build/build.scala
@@ -5,7 +5,7 @@ class Build(context: cbt.Context) extends BasicBuild(context){
     super.dependencies
     ++
     Seq(
-      GitDependency("https://github.com/cvogt/cbt.git", "fe04889a6c3fe73ccdb4b19b44ac62e2b1a96f7d", Some("test/library-test"))
+      GitDependency("https://github.com/cvogt/cbt.git", "f11b8318b85f16843d8cfa0743f64c1576614ad6", Some("test/library-test"))
     )
     ++
     Resolver(mavenCentral).bind(
diff --git a/test/simple/build/build.scala b/test/simple/build/build.scala
index 3d0e105..a132dd1 100644
--- a/test/simple/build/build.scala
+++ b/test/simple/build/build.scala
@@ -5,7 +5,7 @@ class Build(val context: cbt.Context) extends BaseBuild{
     super.dependencies
     ++
     Seq(
-      GitDependency("https://github.com/cvogt/cbt.git", "fe04889a6c3fe73ccdb4b19b44ac62e2b1a96f7d", Some("test/library-test"))
+      GitDependency("https://github.com/cvogt/cbt.git", "f11b8318b85f16843d8cfa0743f64c1576614ad6", Some("test/library-test"))
     ) ++
     // FIXME: make the below less verbose
     Resolver( mavenCentral ).bind(
diff --git a/test/test.scala b/test/test.scala
index 0eb0bef..e9da8bf 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -1,9 +1,9 @@
 package cbt
 package test
-import java.util.concurrent.ConcurrentHashMap
 import java.io.File
 import java.nio.file._
 import java.net.URL
+import java.util.{Iterator=>_,_}
 import scala.concurrent._
 import scala.concurrent.duration._
 // micro framework
@@ -103,21 +103,21 @@ object Main{
 
     val cache = cbtHome ++ "/cache"
     val mavenCache = cache ++ "/maven"
-    val cbtHasChanged = true
-    def Resolver(urls: URL*) = MavenResolver(cbtHasChanged, mavenCache, urls: _*)
+    val cbtLastModified = System.currentTimeMillis
+    implicit val transientCache: java.util.Map[AnyRef,AnyRef] = new java.util.HashMap
+    def Resolver(urls: URL*) = MavenResolver(cbtLastModified, mavenCache, urls: _*)
 
     {
-      val noContext = ContextImplementation(
+      val noContext = new ContextImplementation(
         cbtHome ++ "/test/nothing",
         cbtHome,
         Array(),
         Array(),
         start,
-        cbtHasChanged,
+        cbtLastModified,
         null,
-        new ConcurrentHashMap[String,AnyRef],
-        new ConcurrentHashMap[AnyRef,ClassLoader],
-        new java.util.concurrent.ConcurrentHashMap[AnyRef,AnyRef],
+        new HashMap[AnyRef,AnyRef],
+        new HashMap[AnyRef,AnyRef],
         cache,
         cbtHome,
         cbtHome,