diff --git a/Jenkinsfile b/Jenkinsfile
index 537be14..a42ad8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -177,7 +177,7 @@ pipeline {
                         sh "git checkout ${env.RELEASE_TAG}"
                     }
                 }
-                withMaven(maven: 'maven-latest', jdk: 'jdk11', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
+                withMaven(maven: 'maven-latest', jdk: 'jdk21', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
                     withCredentials([string(credentialsId: 'sonarqube-token', variable: 'SONAR_TOKEN')]) {
                         script {
                             // If this build is not a pull request, run sonar scan
@@ -247,7 +247,7 @@ pipeline {
                     }
                 }
 
-                withMaven(maven: 'maven-latest', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
+                withMaven(maven: 'maven-latest', jdk: 'jdk21-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
                     sh 'mvn deploy -B -DskipStatic=true -DskipTests=true -DretryFailedDeploymentCount=10 -nsu $DISABLE_DOWNLOAD_PROGRESS_OPTS'
                 }
             }
diff --git a/dominion-pax-exam-driver/pom.xml b/dominion-pax-exam-driver/pom.xml
index da64c3f..472b59a 100644
--- a/dominion-pax-exam-driver/pom.xml
+++ b/dominion-pax-exam-driver/pom.xml
@@ -124,12 +124,6 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -138,8 +132,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/dominion-pax-exam-invokers/pom.xml b/dominion-pax-exam-invokers/pom.xml
index 315b3aa..d9a1c27 100644
--- a/dominion-pax-exam-invokers/pom.xml
+++ b/dominion-pax-exam-invokers/pom.xml
@@ -63,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
@@ -77,12 +77,6 @@
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tracker</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -91,8 +85,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/dominion-pax-exam-options/pom.xml b/dominion-pax-exam-options/pom.xml
index bcb2fbf..95a6872 100644
--- a/dominion-pax-exam-options/pom.xml
+++ b/dominion-pax-exam-options/pom.xml
@@ -58,12 +58,6 @@
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-karaf</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -72,8 +66,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/dominion-pax-exam/pom.xml b/dominion-pax-exam/pom.xml
index eeb9e96..1336e4f 100644
--- a/dominion-pax-exam/pom.xml
+++ b/dominion-pax-exam/pom.xml
@@ -59,12 +59,6 @@
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-karaf</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -73,8 +67,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/dominion/pom.xml b/dominion/pom.xml
index 97ce187..000411e 100644
--- a/dominion/pom.xml
+++ b/dominion/pom.xml
@@ -63,12 +63,6 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -77,8 +71,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/failsafe-controller/pom.xml b/failsafe-controller/pom.xml
index 1c14a78..c4fc997 100644
--- a/failsafe-controller/pom.xml
+++ b/failsafe-controller/pom.xml
@@ -46,8 +46,10 @@
             <artifactId>failsafe</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <scope>compile</scope>
+            <type>pom</type>
         </dependency>
 
         <dependency>
diff --git a/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java b/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java
index b3b4e36..2a33c50 100644
--- a/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java
+++ b/failsafe-controller/src/main/java/net/jodah/failsafe/internal/actions/Action.java
@@ -38,7 +38,7 @@ public abstract class Action<R> {
   private static final Set<String> PACKAGE_PREFIXES =
       ImmutableSet.of(
           FailsafeController.class.getPackage().getName() + ".",
-          "org.codehaus.groovy.",
+          "org.apache.groovy.",
           "sun.",
           "com.sun.",
           "java.",
diff --git a/internal/pom.xml b/internal/pom.xml
index 6b42b4c..84dd583 100644
--- a/internal/pom.xml
+++ b/internal/pom.xml
@@ -40,20 +40,34 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.codice.test</groupId>
-            <artifactId>spock-all</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>1.7.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codice.test</groupId>
+            <artifactId>spock-all</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy b/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy
index 96da82a..0718ae9 100644
--- a/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy
+++ b/internal/src/test/groovy/org/codice/test/commons/ReflectionUtilsSpec.groovy
@@ -13,6 +13,8 @@
  */
 package org.codice.test.commons
 
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.runner.RunWith
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -22,6 +24,7 @@ import java.lang.annotation.Retention
 import java.lang.annotation.Target
 import java.util.stream.Collectors
 
+@RunWith(JUnitPlatform.class)
 class ReflectionUtilsSpec extends Specification {
   @Unroll
   def "test annotationsByType() finds recursively from #from_what with no filters"() {
diff --git a/junit-extensions/pom.xml b/junit-extensions/pom.xml
index 360d472..0b73790 100644
--- a/junit-extensions/pom.xml
+++ b/junit-extensions/pom.xml
@@ -42,19 +42,39 @@
             <artifactId>javassist</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <version>${groovy.version}</version>
             <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>1.7.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -62,11 +82,6 @@
             <type>pom</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -122,7 +137,7 @@
                                         <limit implementation="org.codice.jacoco.LenientLimit">
                                             <counter>BRANCH</counter>
                                             <value>COVEREDRATIO</value>
-                                            <minimum>0.40</minimum>
+                                            <minimum>0.38</minimum>
                                         </limit>
                                         <limit implementation="org.codice.jacoco.LenientLimit">
                                             <counter>COMPLEXITY</counter>
diff --git a/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java b/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java
index 5b5df75..9934aec 100644
--- a/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java
+++ b/junit-extensions/src/main/java/org/codice/junit/DeFinalizer.java
@@ -17,6 +17,7 @@
 import java.util.Arrays;
 import java.util.List;
 import org.codice.junit.impl.DeFinalizeClassLoader;
+import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.Describable;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
@@ -28,7 +29,6 @@
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.JUnit4;
 import org.junit.runners.model.InitializationError;
-import org.spockframework.runtime.Sputnik;
 import spock.lang.Specification;
 
 /**
@@ -141,7 +141,7 @@ private Runner newTestRunner() throws InitializationError {
     if (a != null) {
       runnerClass = a.value();
     } else if (Specification.class.isAssignableFrom(testClass)) {
-      runnerClass = Sputnik.class;
+      runnerClass = JUnitPlatform.class;
     } else {
       runnerClass = JUnit4.class;
     }
diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml
index 129256f..3873e53 100644
--- a/maven-extensions/pom.xml
+++ b/maven-extensions/pom.xml
@@ -48,12 +48,6 @@
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-aether</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -62,8 +56,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pax-exam-extensions/pom.xml b/pax-exam-extensions/pom.xml
index 3301601..7c5c42c 100644
--- a/pax-exam-extensions/pom.xml
+++ b/pax-exam-extensions/pom.xml
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
@@ -80,12 +80,6 @@
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.codice.test</groupId>
             <artifactId>spock-all</artifactId>
@@ -94,8 +88,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java b/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java
index 33d971b..97b9366 100644
--- a/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java
+++ b/pax-exam-extensions/src/main/java/org/codice/pax/exam/junit/rules/ServiceAdmin.java
@@ -70,7 +70,9 @@
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkListener;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.wiring.BundleRequirement;
@@ -224,6 +226,11 @@ public boolean isRepositoryUriBlacklisted(URI uri) {
     return service(FeaturesService.class).isRepositoryUriBlacklisted(uri);
   }
 
+  @Override
+  public Feature[] repositoryProvidedFeatures(URI uri) throws Exception {
+    return service(FeaturesService.class).repositoryProvidedFeatures(uri);
+  }
+
   /**
    * {@inheritDoc}
    *
@@ -976,6 +983,12 @@ public <S> ServiceRegistration<S> registerService(
     return service(BundleContext.class).registerService(clazz, service, properties);
   }
 
+  @Override
+  public <S> ServiceRegistration<S> registerService(
+      Class<S> clazz, ServiceFactory<S> serviceFactory, Dictionary<String, ?> properties) {
+    return service(BundleContext.class).registerService(clazz, serviceFactory, properties);
+  }
+
   @Override
   public ServiceReference<?>[] getServiceReferences(String clazz, String filter)
       throws InvalidSyntaxException {
@@ -1014,6 +1027,11 @@ public boolean ungetService(ServiceReference<?> reference) {
     return service(BundleContext.class).ungetService(reference);
   }
 
+  @Override
+  public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> serviceReference) {
+    return service(BundleContext.class).getServiceObjects(serviceReference);
+  }
+
   @Override
   public File getDataFile(String filename) {
     return service(BundleContext.class).getDataFile(filename);
diff --git a/pom.xml b/pom.xml
index 4f47afc..77952ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,14 +41,14 @@
         <snapshots.repository.url />
         <reports.repository.url />
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
-        <codice-maven.version>0.1</codice-maven.version>
+        <codice-maven.version>0.3</codice-maven.version>
 
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.8</commons-lang3.version>
-        <commons-io.version>2.6</commons-io.version>
+        <commons-io.version>2.15.0</commons-io.version>
         <commons-text.version>1.6</commons-text.version>
         <commons-compress.version>1.18</commons-compress.version>
         <sshd-core.version>1.7.0</sshd-core.version>
@@ -62,22 +62,24 @@
         <httpclient.version>4.5.6</httpclient.version>
         <httpcore.version>4.4.10</httpcore.version>
 
-        <osgi.version>5.0.0</osgi.version>
-        <karaf.version>4.2.1</karaf.version>
-        <felix.configadmin.version>1.9.4</felix.configadmin.version>
+        <osgi.version>8.0.0</osgi.version>
+        <karaf.version>4.4.5</karaf.version>
+        <felix.configadmin.version>1.9.26</felix.configadmin.version>
         <pax.exam.version>4.12.0</pax.exam.version>
         <pax.swissbox.version>1.8.2</pax.swissbox.version>
         <pax.url.aether.version>2.5.4</pax.url.aether.version>
 
-        <junit.version>4.12</junit.version>
-        <spock.version>1.1-groovy-2.4</spock.version>
-        <groovy.version>2.4.7</groovy.version>
+        <junit.version>4.13.1</junit.version>
+        <junit-jupiter.version>5.8.2</junit-jupiter.version>
+        <spock.version>2.3-groovy-4.0</spock.version>
+        <groovy.version>4.0.23</groovy.version>
         <mockito-core.version>2.8.47</mockito-core.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
         <hamcrest-all.servicemix.version>1.3_1</hamcrest-all.servicemix.version>
-        <restassured.version>2.9.0</restassured.version>
+        <restassured.version>5.5.0</restassured.version>
+        <maven.surefire.version>2.22.2</maven.surefire.version>
 
-        <javassist.version>3.22.0-GA</javassist.version>
+        <javassist.version>3.27.0-GA</javassist.version>
 
         <!-- Gitflow Incremental Builder Properties -->
         <gib.referenceBranch>refs/remotes/origin/master</gib.referenceBranch>
@@ -86,7 +88,7 @@
         <gib.failOnError>false</gib.failOnError>
 
         <!-- Maven Plugin Version Properties -->
-        <maven-jacoco-plugin.version>0.8.1</maven-jacoco-plugin.version>
+        <maven-jacoco-plugin.version>0.8.12</maven-jacoco-plugin.version>
         <maven-servicemix-depends.version>1.4.0</maven-servicemix-depends.version>
     </properties>
 
@@ -221,13 +223,13 @@
 
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
+                <artifactId>osgi.compendium</artifactId>
                 <version>${osgi.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
+                <artifactId>osgi.core</artifactId>
                 <version>${osgi.version}</version>
                 <scope>provided</scope>
             </dependency>
@@ -308,37 +310,22 @@
                 <artifactId>hamcrest-core</artifactId>
                 <version>${hamcrest-all.version}</version>
             </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito-core.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
                 <version>${groovy.version}</version>
                 <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${groovy.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.spockframework</groupId>
                 <artifactId>spock-core</artifactId>
                 <version>${spock.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-all</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -357,12 +344,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2.2</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -387,14 +374,21 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20.1</version>
+                    <version>${maven.surefire.version}</version>
                     <configuration>
-                        <argLine>${argLine} -Djava.awt.headless=true -noverify</argLine>
+                        <argLine>${argLine} -Djava.awt.headless=true -noverify --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
                         <includes>
                             <include>**/*Test.java</include>
                             <include>**/*Spec.class</include>
                         </includes>
                     </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit47</artifactId>
+                            <version>${maven.surefire.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
@@ -416,17 +410,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.2.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>5.1.4</version>
                 <extensions>true</extensions>
                 <configuration>
                     <!-- Disabled OBR to increase build speed -->
@@ -457,15 +451,25 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.5</version>
+                <version>4.0.1</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>compile</goal>
-                            <goal>testCompile</goal>
+                            <goal>compileTests</goal>
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <testSources>
+                        <testSource>
+                            <directory>${project.basedir}/src/test/groovy</directory>
+                            <includes>
+                                <include>**/*.groovy</include>
+                            </includes>
+                        </testSource>
+                    </testSources>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
diff --git a/spock-all/pom.xml b/spock-all/pom.xml
index 6d0ea98..1dc343a 100644
--- a/spock-all/pom.xml
+++ b/spock-all/pom.xml
@@ -46,7 +46,7 @@
             <version>2.6</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <type>pom</type>
         </dependency>
diff --git a/spock-extensions/pom.xml b/spock-extensions/pom.xml
index 8ff5213..efffaac 100644
--- a/spock-extensions/pom.xml
+++ b/spock-extensions/pom.xml
@@ -27,8 +27,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
diff --git a/thirdparty/rest-assured/pom.xml b/thirdparty/rest-assured/pom.xml
index f30f678..60a0b78 100644
--- a/thirdparty/rest-assured/pom.xml
+++ b/thirdparty/rest-assured/pom.xml
@@ -28,7 +28,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <version>${restassured.version}</version>
             <exclusions>
@@ -130,35 +130,7 @@
                             *;artifactId=!dominion|junit-extensions|maven-extensions|groovy-all|hamcrest-core|hamcrest-library|hamcrest-all|junit|mockito-core;scope=!test
                         </Embed-Dependency>
                         <Export-Package>
-                            com.jayway.restassured;version="${restassured.version}",
-                            com.jayway.restassured.assertion;version="${restassured.version}",
-                            com.jayway.restassured.authentication;version="${restassured.version}",
-                            com.jayway.restassured.builder;version="${restassured.version}",
-                            com.jayway.restassured.config;version="${restassured.version}",
-                            com.jayway.restassured.exception;version="${restassured.version}",
-                            com.jayway.restassured.filter;version="${restassured.version}",
-                            com.jayway.restassured.filter.log;version="${restassured.version}",
-                            com.jayway.restassured.http;version="${restassured.version}",
-                            com.jayway.restassured.internal;version="${restassured.version}",
-                            com.jayway.restassured.internal.filter;version="${restassured.version}",
-                            com.jayway.restassured.internal.http;version="${restassured.version}",
-                            com.jayway.restassured.internal.mapping;version="${restassured.version}",
-                            com.jayway.restassured.internal.matcher.xml;version="${restassured.version}",
-                            com.jayway.restassured.internal.path;version="${restassured.version}",
-                            com.jayway.restassured.internal.path.xml;version="${restassured.version}",
-                            com.jayway.restassured.internal.support;version="${restassured.version}",
-                            com.jayway.restassured.mapper;version="${restassured.version}",
-                            com.jayway.restassured.mapper.factory;version="${restassured.version}",
-                            com.jayway.restassured.mapper.resolver;version="${restassured.version}",
-                            com.jayway.restassured.matcher;version="${restassured.version}",
-                            com.jayway.restassured.parsing;version="${restassured.version}",
-                            com.jayway.restassured.path.json;version="${restassured.version}",
-                            com.jayway.restassured.path.xml;version="${restassured.version}",
-                            com.jayway.restassured.path.xml.element;version="${restassured.version}",
-                            com.jayway.restassured.path.xml.config;version="${restassured.version}",
-                            com.jayway.restassured.response;version="${restassured.version}",
-                            com.jayway.restassured.specification;version="${restassured.version}",
-                            com.jayway.restassured.spi;version="${restassured.version}"
+                            io.rest-assured;version="${restassured.version}"
                         </Export-Package>
                         <Import-Package>
                             org.hamcrest,