diff --git a/core/gradle/dependency-locks/deploy_jar.lockfile b/core/gradle/dependency-locks/deploy_jar.lockfile
index 186a1a743..460ca19ab 100644
--- a/core/gradle/dependency-locks/deploy_jar.lockfile
+++ b/core/gradle/dependency-locks/deploy_jar.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/core/gradle/dependency-locks/runtimeClasspath.lockfile b/core/gradle/dependency-locks/runtimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/core/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/java_common.gradle b/java_common.gradle
index 4e35c17cd..6acd4ff6a 100644
--- a/java_common.gradle
+++ b/java_common.gradle
@@ -57,7 +57,9 @@ configurations {
   runtimeClasspath {
     // JUnit is from org.apache.beam:beam-runners-google-cloud-dataflow-java,
     // testcontainer (which we use in the nomulus tool), and json-simple.
-    exclude group: 'junit'
+    // We should really be excluding this, however GenerateSqlCommand in
+    // nomulus-tool currently uses testcontainers which, in turn, needs junit.
+    //exclude group: 'junit'
     // Mockito is from org.apache.beam:beam-runners-google-cloud-dataflow-java
     // See https://issues.apache.org/jira/browse/BEAM-8862
     exclude group: 'org.mockito', module: 'mockito-core'
diff --git a/services/backend/gradle/dependency-locks/compile.lockfile b/services/backend/gradle/dependency-locks/compile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/compile.lockfile
+++ b/services/backend/gradle/dependency-locks/compile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/compileClasspath.lockfile b/services/backend/gradle/dependency-locks/compileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/backend/gradle/dependency-locks/compileClasspath.lockfile
+++ b/services/backend/gradle/dependency-locks/compileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/default.lockfile b/services/backend/gradle/dependency-locks/default.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/default.lockfile
+++ b/services/backend/gradle/dependency-locks/default.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/runtime.lockfile b/services/backend/gradle/dependency-locks/runtime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/runtime.lockfile
+++ b/services/backend/gradle/dependency-locks/runtime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/testCompile.lockfile b/services/backend/gradle/dependency-locks/testCompile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/testCompile.lockfile
+++ b/services/backend/gradle/dependency-locks/testCompile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile b/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/testRuntime.lockfile b/services/backend/gradle/dependency-locks/testRuntime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/testRuntime.lockfile
+++ b/services/backend/gradle/dependency-locks/testRuntime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/compile.lockfile b/services/default/gradle/dependency-locks/compile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/compile.lockfile
+++ b/services/default/gradle/dependency-locks/compile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/compileClasspath.lockfile b/services/default/gradle/dependency-locks/compileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/default/gradle/dependency-locks/compileClasspath.lockfile
+++ b/services/default/gradle/dependency-locks/compileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/default.lockfile b/services/default/gradle/dependency-locks/default.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/default.lockfile
+++ b/services/default/gradle/dependency-locks/default.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/runtime.lockfile b/services/default/gradle/dependency-locks/runtime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/runtime.lockfile
+++ b/services/default/gradle/dependency-locks/runtime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/runtimeClasspath.lockfile b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/testCompile.lockfile b/services/default/gradle/dependency-locks/testCompile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/testCompile.lockfile
+++ b/services/default/gradle/dependency-locks/testCompile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/testCompileClasspath.lockfile b/services/default/gradle/dependency-locks/testCompileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/default/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/services/default/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/testRuntime.lockfile b/services/default/gradle/dependency-locks/testRuntime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/testRuntime.lockfile
+++ b/services/default/gradle/dependency-locks/testRuntime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/compile.lockfile b/services/pubapi/gradle/dependency-locks/compile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/compile.lockfile
+++ b/services/pubapi/gradle/dependency-locks/compile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile b/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile
+++ b/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/default.lockfile b/services/pubapi/gradle/dependency-locks/default.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/default.lockfile
+++ b/services/pubapi/gradle/dependency-locks/default.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/runtime.lockfile b/services/pubapi/gradle/dependency-locks/runtime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/runtime.lockfile
+++ b/services/pubapi/gradle/dependency-locks/runtime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/testCompile.lockfile b/services/pubapi/gradle/dependency-locks/testCompile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/testCompile.lockfile
+++ b/services/pubapi/gradle/dependency-locks/testCompile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile b/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/testRuntime.lockfile b/services/pubapi/gradle/dependency-locks/testRuntime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/testRuntime.lockfile
+++ b/services/pubapi/gradle/dependency-locks/testRuntime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/compile.lockfile b/services/tools/gradle/dependency-locks/compile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/compile.lockfile
+++ b/services/tools/gradle/dependency-locks/compile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/compileClasspath.lockfile b/services/tools/gradle/dependency-locks/compileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/tools/gradle/dependency-locks/compileClasspath.lockfile
+++ b/services/tools/gradle/dependency-locks/compileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/default.lockfile b/services/tools/gradle/dependency-locks/default.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/default.lockfile
+++ b/services/tools/gradle/dependency-locks/default.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/runtime.lockfile b/services/tools/gradle/dependency-locks/runtime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/runtime.lockfile
+++ b/services/tools/gradle/dependency-locks/runtime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/testCompile.lockfile b/services/tools/gradle/dependency-locks/testCompile.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/testCompile.lockfile
+++ b/services/tools/gradle/dependency-locks/testCompile.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile b/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile
index 2dfe5b3e3..4d31e5a5e 100644
--- a/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -175,6 +175,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -204,6 +205,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/testRuntime.lockfile b/services/tools/gradle/dependency-locks/testRuntime.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/testRuntime.lockfile
+++ b/services/tools/gradle/dependency-locks/testRuntime.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final
diff --git a/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 186a1a743..460ca19ab 100644
--- a/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -176,6 +176,7 @@ javax.validation:validation-api:1.0.0.GA
 javax.xml.bind:jaxb-api:2.3.1
 jline:jline:1.0
 joda-time:joda-time:2.10.3
+junit:junit:4.12
 net.bytebuddy:byte-buddy:1.9.11
 net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
@@ -205,6 +206,7 @@ org.dom4j:dom4j:2.1.1
 org.easymock:easymock:3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.1
 org.glassfish.jaxb:txw2:2.3.1
+org.hamcrest:hamcrest-core:1.3
 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
 org.hibernate:hibernate-core:5.4.4.Final
 org.hibernate:hibernate-hikaricp:5.4.4.Final