From 90174caaaba52af14818d2825c73bcd3d3ba6901 Mon Sep 17 00:00:00 2001
From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>
Date: Mon, 2 Dec 2024 16:01:16 +0000
Subject: [PATCH] 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 <47121388+eamansour@users.noreply.github.com>

* fix: Move assertj-core dependencies so that junit-bom:5.2.0 can be resolved

Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>

---------

Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>
---
 full/pom.template |  8 +-------
 full/pom2.xml     | 16 ++++++++++++++++
 mvp/pom.template  |  7 +------
 mvp/pom2.xml      | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/full/pom.template b/full/pom.template
index 442e682..3504bf3 100644
--- 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
index 81ed8bf..7fb4b4c 100644
--- 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
index d6456b0..f5eef30 100644
--- 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
index dca1caf..e53dadc 100644
--- 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>