More changes tested locally

Signed-off-by: Jade Carino <[email protected]>
galasa-dev · Dec 17, 2024 · 32dba69 · 32dba69
1 parent 5bcd15d
commit 32dba69
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 39 deletions.
diff --git a/full/pom4.xml b/full/pom4.xml
@@ -14,18 +14,6 @@
 		<galasa.target.repo>file:${project.build.directory}/repo</galasa.target.repo>
 	</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>dev.galasa</groupId>
-				<artifactId>dev.galasa.platform</artifactId>
-				<version>0.39.0</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/full/pom5.xml b/full/pom5.xml
@@ -50,6 +50,7 @@
 		<dependency>
 			<groupId>biz.aQute.bnd.builder</groupId>
 			<artifactId>biz.aQute.bnd.builder.gradle.plugin</artifactId>
+			<version>5.3.0</version>
 		</dependency>
 
         <!--

diff --git a/mvp/pom.template b/mvp/pom.template
@@ -19,7 +19,7 @@
 			<dependency>
 				<groupId>dev.galasa</groupId>
 				<artifactId>dev.galasa.platform</artifactId>
-				<version>0.39.0</version>
+				<version>{{.Release}}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -58,37 +58,37 @@
         <dependency>
             <groupId>dev.galasa</groupId>
             <artifactId>galasa-simplatform</artifactId>
-            <version>0.39.0</version>
+            <version>{{.Release}}</version>
             <type>jar</type>
         </dependency>
 
-{{range .Artifacts}}
-        <dependency>
-            <groupId>{{.GroupId}}</groupId>
-            <artifactId>{{.ArtifactId}}</artifactId>{{if .Version}}
-            <version>{{.Version}}</version>{{end}}
-        </dependency>
-    {{end}}
-
         <dependency>
             <groupId>dev.galasa</groupId>
             <artifactId>dev.galasa.simbank.manager</artifactId>
-            <version>0.39.0</version>
+            <version>{{.Release}}</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>dev.galasa</groupId>
             <artifactId>dev.galasa.simbank.tests</artifactId>
-            <version>0.39.0</version>
+            <version>{{.Release}}</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>dev.galasa</groupId>
             <artifactId>dev.galasa.simbank.obr</artifactId>
-            <version>0.39.0</version>
+            <version>{{.Release}}</version>
             <type>obr</type>
         </dependency>
 
+{{range .Artifacts}}
+        <dependency>
+            <groupId>{{.GroupId}}</groupId>
+            <artifactId>{{.ArtifactId}}</artifactId>{{if .Version}}
+            <version>{{.Version}}</version>{{end}}
+        </dependency>
+    {{end}}
+
         <!--
             To resolve commons-logging:1.3.4, commons-parent:72 and org.apache:33 are required.
         -->
@@ -111,13 +111,6 @@
 			<type>pom</type>
 		</dependency>
 
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.service.component.annotations</artifactId>
-			<type>jar</type>
-		</dependency>
-
-
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-api</artifactId>

diff --git a/mvp/pom2.xml b/mvp/pom2.xml
@@ -14,12 +14,22 @@
 		<galasa.target.repo>file:${project.build.directory}/repo</galasa.target.repo>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>dev.galasa</groupId>
+				<artifactId>dev.galasa.platform</artifactId>
+				<version>0.39.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbyclient</artifactId>
-            <version>10.14.2.0</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>

diff --git a/mvp/pom5.xml b/mvp/pom5.xml
@@ -14,31 +14,38 @@
 		<galasa.target.repo>file:${project.build.directory}/repo</galasa.target.repo>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>dev.galasa</groupId>
+				<artifactId>dev.galasa.platform</artifactId>
+				<version>0.39.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
         <dependency>
 			<groupId>biz.aQute.bnd</groupId>
 			<artifactId>biz.aQute.bnd.gradle</artifactId>
-			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>biz.aQute.bnd</groupId>
 			<artifactId>biz.aQute.bnd.embedded-repo</artifactId>
-			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>biz.aQute.bnd</groupId>
 			<artifactId>biz.aQute.bndlib</artifactId>
-			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>biz.aQute.bnd</groupId>
 			<artifactId>biz.aQute.repository</artifactId>
-			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>biz.aQute.bnd</groupId>
 			<artifactId>biz.aQute.resolve</artifactId>
-			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>biz.aQute.bnd.builder</groupId>