diff --git a/.gitignore b/.gitignore
index 967513c..18bc158 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+.bsp
 target
diff --git a/build.sbt b/build.sbt
index 42a3f23..c042d41 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,10 +17,10 @@
   .enablePlugins(ScriptedPlugin)
   .settings(
     name := "daffodil-schema.g8",
-    scalaVersion := "2.12.11",
-    crossScalaVersions := Seq("2.12.11"),
-    test in Test := {
-      val _ = (g8Test in Test).toTask("").value
+    scalaVersion := "2.12.15",
+    crossScalaVersions := Seq("2.12.15"),
+    Test / test := {
+      val _ = (Test / g8Test).toTask("").value
     },
     ratFailBinaries := true,
     ratExcludes := Seq(
diff --git a/project/build.properties b/project/build.properties
index 68f0755..98655aa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sbt.version=1.3.9
+sbt.version=1.6.1
diff --git "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$scala$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.scala" "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$scala$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.scala"
index 83135ce..7aa19b7 100644
--- "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$scala$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.scala"
+++ "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$scala$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.scala"
@@ -24,7 +24,7 @@
 object Test$name;format="Camel"$ {
   lazy val runner = Runner("/$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$", "Test$name;format="Camel"$.tdml")
 
-  @AfterClass def shutDown {
+  @AfterClass def shutDown: Unit = {
     runner.reset
   }
 }
diff --git a/src/main/g8/.gitignore b/src/main/g8/.gitignore
index 5c0c8e8..2645a10 100644
--- a/src/main/g8/.gitignore
+++ b/src/main/g8/.gitignore
@@ -14,4 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 !$
+.bsp
 target
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index b6f4c78..32dd11c 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -20,12 +20,13 @@
 
 version := "0.1.0-SNAPSHOT"
 
-scalaVersion := "2.12.11"
+scalaVersion := "2.12.15"
 
 libraryDependencies ++= Seq(
+  "com.github.sbt" % "junit-interface" % "0.13.2" % "test",
+  "junit" % "junit" % "4.13.2" % "test",
   "org.apache.daffodil" %% "daffodil-tdml-processor" % "$daffodil_version$" % "test",
-  "com.novocode" % "junit-interface" % "0.11" % "test",
-  "junit" % "junit" % "4.12" % "test",
+  "org.apache.logging.log4j" % "log4j-core" % "2.17.1" % "test",
 )
 
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties
index 0f32320..0f20dc5 100644
--- a/src/main/g8/project/build.properties
+++ b/src/main/g8/project/build.properties
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 !$
-sbt.version=1.3.9
+sbt.version=1.6.1