diff --git a/mantis-client/dependencies.lock b/mantis-client/dependencies.lock
index 902e9021e..7050be460 100644
--- a/mantis-client/dependencies.lock
+++ b/mantis-client/dependencies.lock
@@ -172,11 +172,14 @@
         }
     },
     "baseline-exact-dependencies-test": {
-        "junit:junit": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
@@ -681,12 +684,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -723,6 +720,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
@@ -893,12 +899,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -947,6 +947,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
diff --git a/mantis-common/dependencies.lock b/mantis-common/dependencies.lock
index 0e40cf5e4..1867c2ab4 100644
--- a/mantis-common/dependencies.lock
+++ b/mantis-common/dependencies.lock
@@ -65,12 +65,6 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.commons:commons-lang3": {
             "locked": "3.5"
         },
@@ -83,6 +77,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
@@ -271,12 +274,6 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "locked": "1.0"
         },
@@ -292,6 +289,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
@@ -552,12 +558,6 @@
             ],
             "locked": "0.9.2"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -576,6 +576,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
diff --git a/mantis-connectors/mantis-connector-iceberg/dependencies.lock b/mantis-connectors/mantis-connector-iceberg/dependencies.lock
index a623bb6e0..0df1ceffb 100644
--- a/mantis-connectors/mantis-connector-iceberg/dependencies.lock
+++ b/mantis-connectors/mantis-connector-iceberg/dependencies.lock
@@ -5,113 +5,14 @@
         }
     },
     "baseline-exact-dependencies-main": {
-        "com.netflix:mantis-rxnetty": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "0.4.19.1"
-        },
-        "io.mantisrx:mantis-common": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-network",
-                "io.mantisrx:mantis-runtime"
-            ],
-            "project": true
-        },
-        "io.mantisrx:mantis-common-serde": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "project": true
-        },
-        "io.mantisrx:mantis-network": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-runtime"
-            ],
-            "project": true
-        },
-        "io.mantisrx:mantis-remote-observable": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-runtime"
-            ],
-            "project": true
-        },
-        "io.mantisrx:mantis-runtime": {
-            "project": true
-        },
-        "io.mantisrx:mantis-shaded": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common",
-                "io.mantisrx:mantis-common-serde"
-            ],
-            "project": true
-        },
-        "io.netty:netty-buffer": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "4.1.17.Final"
-        },
-        "io.netty:netty-codec-http": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "4.1.17.Final"
-        },
-        "io.netty:netty-handler": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-network"
-            ],
-            "locked": "4.1.17.Final"
-        },
-        "io.netty:netty-transport-native-epoll": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "4.1.17.Final"
-        },
-        "io.reactivex:rxjava": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "1.3.8"
-        },
-        "org.jctools:jctools-core": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "1.2.1"
-        },
         "org.slf4j:slf4j-api": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common",
-                "io.mantisrx:mantis-runtime"
-            ],
-            "locked": "1.7.6"
-        },
-        "org.slf4j:slf4j-log4j12": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
             "locked": "1.7.0"
-        },
-        "org.xerial.snappy:snappy-java": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-common"
-            ],
-            "locked": "1.1.9.1"
         }
     },
     "baseline-exact-dependencies-test": {
         "com.netflix.spectator:spectator-api": {
             "locked": "1.3.10"
         },
-        "org.apache.hadoop:hadoop-common": {
-            "locked": "2.7.3"
-        },
-        "org.apache.iceberg:iceberg-data": {
-            "locked": "0.14.1"
-        },
         "org.junit.jupiter:junit-jupiter-api": {
             "locked": "5.4.2"
         },
@@ -359,6 +260,9 @@
             ],
             "locked": "1.0"
         },
+        "org.apache.hadoop:hadoop-common": {
+            "locked": "2.7.3"
+        },
         "org.jctools:jctools-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -371,14 +275,14 @@
                 "io.mantisrx:mantis-remote-observable",
                 "io.mantisrx:mantis-runtime"
             ],
-            "locked": "1.7.6"
+            "locked": "1.7.10"
         },
         "org.slf4j:slf4j-log4j12": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
                 "io.mantisrx:mantis-remote-observable"
             ],
-            "locked": "1.7.0"
+            "locked": "1.7.10"
         },
         "org.xerial.snappy:snappy-java": {
             "firstLevelTransitive": [
@@ -387,32 +291,6 @@
             "locked": "1.1.9.1"
         }
     },
-    "shadow": {
-        "org.apache.avro:avro": {
-            "locked": "1.10.2"
-        },
-        "org.apache.hadoop:hadoop-common": {
-            "locked": "2.7.3"
-        },
-        "org.apache.iceberg:iceberg-api": {
-            "locked": "0.14.1"
-        },
-        "org.apache.iceberg:iceberg-core": {
-            "locked": "0.14.1"
-        },
-        "org.apache.iceberg:iceberg-data": {
-            "locked": "0.14.1"
-        },
-        "org.apache.iceberg:iceberg-parquet": {
-            "locked": "0.14.1"
-        },
-        "org.apache.parquet:parquet-hadoop": {
-            "locked": "1.12.0"
-        },
-        "org.slf4j:slf4j-log4j12": {
-            "locked": "1.7.10"
-        }
-    },
     "testAnnotationProcessor": {
         "org.projectlombok:lombok": {
             "locked": "1.18.20"
@@ -701,6 +579,9 @@
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
+        "org.projectlombok:lombok": {
+            "locked": "1.18.20"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
diff --git a/mantis-connectors/mantis-connector-job/dependencies.lock b/mantis-connectors/mantis-connector-job/dependencies.lock
index a1ce20559..adf7cfcc8 100644
--- a/mantis-connectors/mantis-connector-job/dependencies.lock
+++ b/mantis-connectors/mantis-connector-job/dependencies.lock
@@ -18,7 +18,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -199,7 +199,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -388,13 +388,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
@@ -656,7 +656,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -840,13 +840,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
diff --git a/mantis-connectors/mantis-connector-kafka/dependencies.lock b/mantis-connectors/mantis-connector-kafka/dependencies.lock
index caa733c59..6b78d1a36 100644
--- a/mantis-connectors/mantis-connector-kafka/dependencies.lock
+++ b/mantis-connectors/mantis-connector-kafka/dependencies.lock
@@ -106,11 +106,14 @@
         "com.github.tomakehurst:wiremock-jre8": {
             "locked": "2.21.0"
         },
-        "junit:junit": {
-            "locked": "4.12"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
@@ -118,10 +121,10 @@
     },
     "compileClasspath": {
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "locked": "0.82.0"
@@ -236,10 +239,10 @@
     },
     "runtimeClasspath": {
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
@@ -388,10 +391,10 @@
             "locked": "2.21.0"
         },
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "locked": "0.82.0"
@@ -467,12 +470,6 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.12"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.kafka:kafka-clients": {
             "locked": "2.2.2"
         },
@@ -482,6 +479,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -513,10 +519,10 @@
             "locked": "2.21.0"
         },
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
@@ -618,12 +624,6 @@
             ],
             "locked": "0.9.2"
         },
-        "junit:junit": {
-            "locked": "4.12"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -639,6 +639,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
diff --git a/mantis-connectors/mantis-connector-publish/dependencies.lock b/mantis-connectors/mantis-connector-publish/dependencies.lock
index 429ddb1d2..56713bef7 100644
--- a/mantis-connectors/mantis-connector-publish/dependencies.lock
+++ b/mantis-connectors/mantis-connector-publish/dependencies.lock
@@ -124,7 +124,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -304,13 +304,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
@@ -531,7 +531,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -715,13 +715,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
diff --git a/mantis-control-plane/mantis-control-plane-client/dependencies.lock b/mantis-control-plane/mantis-control-plane-client/dependencies.lock
index 861346788..30b79fc1e 100644
--- a/mantis-control-plane/mantis-control-plane-client/dependencies.lock
+++ b/mantis-control-plane/mantis-control-plane-client/dependencies.lock
@@ -65,18 +65,21 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.jctools:jctools-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -491,12 +494,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -536,6 +533,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -668,12 +674,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -719,6 +719,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
diff --git a/mantis-control-plane/mantis-control-plane-core/dependencies.lock b/mantis-control-plane/mantis-control-plane-core/dependencies.lock
index db23ebff2..676ed2839 100644
--- a/mantis-control-plane/mantis-control-plane-core/dependencies.lock
+++ b/mantis-control-plane/mantis-control-plane-core/dependencies.lock
@@ -77,12 +77,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -119,6 +113,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -455,12 +458,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -497,6 +494,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -894,12 +900,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -948,6 +948,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
diff --git a/mantis-control-plane/mantis-control-plane-server/dependencies.lock b/mantis-control-plane/mantis-control-plane-server/dependencies.lock
index f937fde48..06506be05 100644
--- a/mantis-control-plane/mantis-control-plane-server/dependencies.lock
+++ b/mantis-control-plane/mantis-control-plane-server/dependencies.lock
@@ -132,6 +132,9 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.vintage:junit-vintage-engine": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "3.12.4"
         },
@@ -663,6 +666,9 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.vintage:junit-vintage-engine": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "3.12.4"
         },
@@ -816,7 +822,7 @@
             "locked": "2.12.5"
         },
         "junit:junit": {
-            "locked": "4.11"
+            "locked": "4.12"
         },
         "junit:junit-dep": {
             "locked": "4.11"
@@ -869,6 +875,9 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.vintage:junit-vintage-engine": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "3.12.4"
         },
diff --git a/mantis-discovery-proto/dependencies.lock b/mantis-discovery-proto/dependencies.lock
index 021074b6f..30c62d521 100644
--- a/mantis-discovery-proto/dependencies.lock
+++ b/mantis-discovery-proto/dependencies.lock
@@ -5,11 +5,14 @@
         }
     },
     "baseline-exact-dependencies-test": {
-        "junit:junit": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         }
     },
     "compileClasspath": {
@@ -45,11 +48,14 @@
         "io.mantisrx:mantis-shaded": {
             "project": true
         },
-        "junit:junit": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         },
         "org.projectlombok:lombok": {
             "locked": "1.18.20"
@@ -65,11 +71,14 @@
             ],
             "locked": "0.9.2"
         },
-        "junit:junit": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         }
     }
 }
\ No newline at end of file
diff --git a/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock b/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock
index 54427aba6..2a3995b9b 100644
--- a/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock
+++ b/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock
@@ -12,13 +12,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -71,13 +71,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -141,7 +141,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
@@ -149,13 +149,13 @@
                 "io.mantisrx:mantis-publish-netty",
                 "io.mantisrx:mantis-publish-netty-guice"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-netty-guice"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -261,13 +261,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -326,7 +326,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
@@ -334,13 +334,13 @@
                 "io.mantisrx:mantis-publish-netty",
                 "io.mantisrx:mantis-publish-netty-guice"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-netty-guice"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
diff --git a/mantis-publish/mantis-publish-core/dependencies.lock b/mantis-publish/mantis-publish-core/dependencies.lock
index fce9aa7f1..5f5c11d3c 100644
--- a/mantis-publish/mantis-publish-core/dependencies.lock
+++ b/mantis-publish/mantis-publish-core/dependencies.lock
@@ -6,7 +6,7 @@
     },
     "baseline-exact-dependencies-main": {
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-ext-ipc": {
             "locked": "0.134.0"
@@ -52,10 +52,10 @@
     },
     "compileClasspath": {
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "locked": "0.134.0"
@@ -93,10 +93,10 @@
     },
     "runtimeClasspath": {
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "locked": "0.134.0"
@@ -140,10 +140,10 @@
             "locked": "2.21.0"
         },
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "locked": "0.134.0"
@@ -197,10 +197,10 @@
             "locked": "2.21.0"
         },
         "com.netflix.archaius:archaius2-api": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "locked": "0.134.0"
diff --git a/mantis-publish/mantis-publish-netty-guice/dependencies.lock b/mantis-publish/mantis-publish-netty-guice/dependencies.lock
index 3006c8a1b..768e7485a 100644
--- a/mantis-publish/mantis-publish-netty-guice/dependencies.lock
+++ b/mantis-publish/mantis-publish-netty-guice/dependencies.lock
@@ -9,10 +9,10 @@
             "locked": "4.2.2"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-ext-ipc": {
             "locked": "0.96.0"
@@ -52,13 +52,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -110,17 +110,17 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core",
                 "io.mantisrx:mantis-publish-netty"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -205,13 +205,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -273,17 +273,17 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core",
                 "io.mantisrx:mantis-publish-netty"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-guice": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
diff --git a/mantis-publish/mantis-publish-netty/dependencies.lock b/mantis-publish/mantis-publish-netty/dependencies.lock
index 87e33e035..19f4dd46e 100644
--- a/mantis-publish/mantis-publish-netty/dependencies.lock
+++ b/mantis-publish/mantis-publish-netty/dependencies.lock
@@ -9,10 +9,10 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -67,10 +67,10 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -116,13 +116,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -190,10 +190,10 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -249,13 +249,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
diff --git a/mantis-remote-observable/dependencies.lock b/mantis-remote-observable/dependencies.lock
index de66523db..ffa5c434c 100644
--- a/mantis-remote-observable/dependencies.lock
+++ b/mantis-remote-observable/dependencies.lock
@@ -83,11 +83,14 @@
         }
     },
     "baseline-exact-dependencies-test": {
-        "junit:junit": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         }
     },
     "compileClasspath": {
@@ -330,18 +333,21 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.jctools:jctools-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.projectlombok:lombok": {
             "locked": "1.18.20"
         },
@@ -429,12 +435,6 @@
             ],
             "locked": "0.9.2"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -447,6 +447,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.slf4j:slf4j-api": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
diff --git a/mantis-runtime-loader/dependencies.lock b/mantis-runtime-loader/dependencies.lock
index 12117fc25..627ea29e7 100644
--- a/mantis-runtime-loader/dependencies.lock
+++ b/mantis-runtime-loader/dependencies.lock
@@ -54,18 +54,21 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.jctools:jctools-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -501,12 +504,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -543,6 +540,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -684,12 +690,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -738,6 +738,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
diff --git a/mantis-runtime/dependencies.lock b/mantis-runtime/dependencies.lock
index 75bb93024..fc45cf130 100644
--- a/mantis-runtime/dependencies.lock
+++ b/mantis-runtime/dependencies.lock
@@ -8,11 +8,14 @@
         "com.netflix.spectator:spectator-api": {
             "locked": "1.3.10"
         },
-        "junit:junit": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
         },
-        "junit:junit-dep": {
-            "locked": "4.11"
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
         },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
@@ -310,18 +313,21 @@
             ],
             "locked": "1.3.8"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.jctools:jctools-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
@@ -438,12 +444,6 @@
             ],
             "locked": "0.9.2"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -456,6 +456,15 @@
             ],
             "locked": "1.2.1"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-core": {
             "locked": "2.0.111-beta"
         },
diff --git a/mantis-server/mantis-server-agent/dependencies.lock b/mantis-server/mantis-server-agent/dependencies.lock
index 4b1a2bf06..e8c2c4b53 100644
--- a/mantis-server/mantis-server-agent/dependencies.lock
+++ b/mantis-server/mantis-server-agent/dependencies.lock
@@ -154,12 +154,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -196,6 +190,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -739,12 +742,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.lingala.zip4j:zip4j": {
             "locked": "2.9.0"
         },
@@ -787,6 +784,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -1001,12 +1007,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -1086,6 +1086,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
diff --git a/mantis-server/mantis-server-worker-client/dependencies.lock b/mantis-server/mantis-server-worker-client/dependencies.lock
index 46030458e..cea08ac7d 100644
--- a/mantis-server/mantis-server-worker-client/dependencies.lock
+++ b/mantis-server/mantis-server-worker-client/dependencies.lock
@@ -8,15 +8,18 @@
         "com.netflix.spectator:spectator-api": {
             "locked": "1.3.10"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.hamcrest:hamcrest-all": {
             "locked": "1.3"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         }
@@ -436,12 +439,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -481,6 +478,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
@@ -624,12 +630,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -681,6 +681,15 @@
             ],
             "locked": "20180813"
         },
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
         "org.mockito:mockito-all": {
             "locked": "2.0.2-beta"
         },
diff --git a/mantis-server/mantis-server-worker/dependencies.lock b/mantis-server/mantis-server-worker/dependencies.lock
index 3488a6ff8..4b9c61709 100644
--- a/mantis-server/mantis-server-worker/dependencies.lock
+++ b/mantis-server/mantis-server-worker/dependencies.lock
@@ -105,12 +105,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "org.apache.flink:flink-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
@@ -150,8 +144,17 @@
             ],
             "locked": "20180813"
         },
-        "org.mockito:mockito-all": {
-            "locked": "2.0.2-beta"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
+        "org.mockito:mockito-core": {
+            "locked": "4.8.1"
         },
         "org.skife.config:config-magic": {
             "firstLevelTransitive": [
@@ -774,12 +777,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "nz.ac.waikato.cms.moa:moa": {
             "locked": "2017.06"
         },
@@ -825,8 +822,17 @@
             ],
             "locked": "20180813"
         },
-        "org.mockito:mockito-all": {
-            "locked": "2.0.2-beta"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
+        "org.mockito:mockito-core": {
+            "locked": "4.8.1"
         },
         "org.projectlombok:lombok": {
             "locked": "1.18.20"
@@ -1022,12 +1028,6 @@
             ],
             "locked": "2.12.5"
         },
-        "junit:junit": {
-            "locked": "4.11"
-        },
-        "junit:junit-dep": {
-            "locked": "4.11"
-        },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
@@ -1103,8 +1103,17 @@
             ],
             "locked": "20180813"
         },
-        "org.mockito:mockito-all": {
-            "locked": "2.0.2-beta"
+        "org.junit.jupiter:junit-jupiter-api": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-engine": {
+            "locked": "5.4.2"
+        },
+        "org.junit.jupiter:junit-jupiter-params": {
+            "locked": "5.4.2"
+        },
+        "org.mockito:mockito-core": {
+            "locked": "4.8.1"
         },
         "org.skife.config:config-magic": {
             "firstLevelTransitive": [
diff --git a/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock b/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock
index 25a967ca9..065064a22 100644
--- a/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock
+++ b/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock
@@ -9,13 +9,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -138,13 +138,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -275,13 +275,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
@@ -444,13 +444,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -576,13 +576,13 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-connector-kafka"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
diff --git a/mantis-source-jobs/mantis-source-job-publish/dependencies.lock b/mantis-source-jobs/mantis-source-job-publish/dependencies.lock
index b466eb1d9..fdef77334 100644
--- a/mantis-source-jobs/mantis-source-job-publish/dependencies.lock
+++ b/mantis-source-jobs/mantis-source-job-publish/dependencies.lock
@@ -15,7 +15,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -213,7 +213,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -405,14 +405,14 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core",
                 "io.mantisrx:mantis-publish-netty"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [
@@ -658,7 +658,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
@@ -857,14 +857,14 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.archaius:archaius2-core": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-publish-core",
                 "io.mantisrx:mantis-publish-netty"
             ],
-            "locked": "2.3.20"
+            "locked": "2.3.21"
         },
         "com.netflix.rxjava:rxjava-math": {
             "firstLevelTransitive": [