fix: Re-add junit-bom 5.2.0 fix errors when resolving assertj-core:3.…

…11.1 Signed-off-by: Eamonn Mansour <[email protected]>
galasa-dev · Dec 2, 2024 · 2783078 · 2783078
1 parent 1761d43
commit 2783078
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/full/pom.template b/full/pom.template
@@ -116,7 +116,16 @@
 			<version>33</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>5.11.0-M2</version>
+			<type>pom</type>
+		</dependency>
 
+        <!--
+            The following POMs are used to resolve assertj-core:3.11.1
+        -->
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-parent-pom</artifactId>
@@ -126,9 +135,10 @@
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>junit-bom</artifactId>
-			<version>5.11.0-M2</version>
+			<version>5.2.0</version>
 			<type>pom</type>
 		</dependency>
+
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.component.annotations</artifactId>

diff --git a/mvp/pom.template b/mvp/pom.template
@@ -104,6 +104,16 @@
 			<version>33</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>5.11.0-M2</version>
+			<type>pom</type>
+		</dependency>
+
+        <!--
+            The following POMs are used to resolve assertj-core:3.11.1
+        -->
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-parent-pom</artifactId>
@@ -113,9 +123,10 @@
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>junit-bom</artifactId>
-			<version>5.11.0-M2</version>
+			<version>5.2.0</version>
 			<type>pom</type>
 		</dependency>
+
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.component.annotations</artifactId>