diff --git a/full/pom2.xml b/full/pom2.xml
index 45ef1c2..81ed8bf 100644
--- a/full/pom2.xml
+++ b/full/pom2.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-full-maven-repo2</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/full/pom3.xml b/full/pom3.xml
index 9613e4a..7d578b7 100644
--- a/full/pom3.xml
+++ b/full/pom3.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-full-maven-repo3</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -15,47 +15,19 @@
 	</properties>
 
 	<dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.14</version>
-            <type>jar</type>
-        </dependency>
+        <!--
+            The following POMs are used to resolve dev.galasa.wrapping.httpclient-osgi
+        -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcomponents-core</artifactId>
-            <version>4.4.14</version>
+            <version>4.4.16</version>
             <type>pom</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-cache</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>fluent-hc</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcomponents-client</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
             <type>pom</type>
         </dependency>
         <dependency>
diff --git a/full/pom4.xml b/full/pom4.xml
index 3f761af..eb2b28d 100644
--- a/full/pom4.xml
+++ b/full/pom4.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-full-maven-repo4</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/full/pom5.xml b/full/pom5.xml
index ec8e7ee..fc10997 100644
--- a/full/pom5.xml
+++ b/full/pom5.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-full-maven-repo5</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -45,19 +45,28 @@
 			<artifactId>biz.aQute.bnd.builder.gradle.plugin</artifactId>
 			<version>5.3.0</version>
 		</dependency>
+
+        <!--
+            The following POMs are used to resolve commons-codec:1.16.1
+        -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-parent</artifactId>
-			<version>52</version>
+			<version>66</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.apache</groupId>
 			<artifactId>apache</artifactId>
-			<version>23</version>
+			<version>31</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>5.10.1</version>
 			<type>pom</type>
 		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/full/pom6.xml b/full/pom6.xml
index 984b4f6..14c69f4 100644
--- a/full/pom6.xml
+++ b/full/pom6.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-full-maven-repo6</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/mvp/pom2.xml b/mvp/pom2.xml
index 9052016..dca1caf 100644
--- a/mvp/pom2.xml
+++ b/mvp/pom2.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-mvp-maven-repo2</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/mvp/pom3.xml b/mvp/pom3.xml
index b7a358f..58a1deb 100644
--- a/mvp/pom3.xml
+++ b/mvp/pom3.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-mvp-maven-repo3</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -15,46 +15,19 @@
 	</properties>
 
 	<dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.14</version>
-            <type>jar</type>
-        </dependency>
+        <!--
+            The following POMs are used to resolve dev.galasa.wrapping.httpclient-osgi
+        -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcomponents-core</artifactId>
-            <version>4.4.14</version>
+            <version>4.4.16</version>
             <type>pom</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-cache</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>fluent-hc</artifactId>
-            <version>4.5.13</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcomponents-client</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
             <type>pom</type>
         </dependency>
         <dependency>
diff --git a/mvp/pom4.xml b/mvp/pom4.xml
index 4824d85..9c5a9e8 100644
--- a/mvp/pom4.xml
+++ b/mvp/pom4.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-mvp-maven-repo4</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/mvp/pom5.xml b/mvp/pom5.xml
index e57cd7a..4e5d3af 100644
--- a/mvp/pom5.xml
+++ b/mvp/pom5.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-mvp-maven-repo5</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -45,18 +45,28 @@
 			<artifactId>biz.aQute.bnd.builder.gradle.plugin</artifactId>
 			<version>5.3.0</version>
 		</dependency>
+
+        <!--
+            The following POMs are used to resolve commons-codec:1.16.1
+        -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-parent</artifactId>
-            <version>52</version>
+            <version>66</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.apache</groupId>
             <artifactId>apache</artifactId>
-            <version>23</version>
+            <version>31</version>
             <type>pom</type>
         </dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>5.10.1</version>
+			<type>pom</type>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/mvp/pom6.xml b/mvp/pom6.xml
index acbf43c..c81bfea 100644
--- a/mvp/pom6.xml
+++ b/mvp/pom6.xml
@@ -7,7 +7,7 @@
 
 	<groupId>dev.galasa</groupId>
 	<artifactId>galasa-isolated-mvp-maven-repo5</artifactId>
-	<version>0.16.0</version>
+	<version>0.38.0</version>
 	<packaging>pom</packaging>
 
 	<properties>