Add junit-bom:5.2.0 back in to fix errors when resolving assertj-core…

…:3.11.1 (#82) * fix: Re-add junit-bom 5.2.0 fix errors when resolving assertj-core:3.11.1 Signed-off-by: Eamonn Mansour <[email protected]> * fix: Move assertj-core dependencies so that junit-bom:5.2.0 can be resolved Signed-off-by: Eamonn Mansour <[email protected]> --------- Signed-off-by: Eamonn Mansour <[email protected]>
galasa-dev · Dec 2, 2024 · 90174ca · 90174ca
1 parent 1761d43
commit 90174ca
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/full/pom.template b/full/pom.template
@@ -116,19 +116,13 @@
 			<version>33</version>
 			<type>pom</type>
 		</dependency>
-
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-parent-pom</artifactId>
-			<version>2.2.1</version>
-			<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>junit-bom</artifactId>
 			<version>5.11.0-M2</version>
 			<type>pom</type>
 		</dependency>
+
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.component.annotations</artifactId>

diff --git a/full/pom2.xml b/full/pom2.xml
@@ -33,6 +33,22 @@
 			<version>10</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>
+			<version>2.2.1</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>5.2.0</version>
+			<type>pom</type>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/mvp/pom.template b/mvp/pom.template
@@ -104,18 +104,13 @@
 			<version>33</version>
 			<type>pom</type>
 		</dependency>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-parent-pom</artifactId>
-			<version>2.2.1</version>
-			<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>junit-bom</artifactId>
 			<version>5.11.0-M2</version>
 			<type>pom</type>
 		</dependency>
+
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.component.annotations</artifactId>

diff --git a/mvp/pom2.xml b/mvp/pom2.xml
@@ -33,6 +33,22 @@
 			<version>10</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>
+			<version>2.2.1</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>5.2.0</version>
+			<type>pom</type>
+		</dependency>
 	</dependencies>
 
 	<build>