From b291141e47a6f79ad6fe40d3aba862d4a8ada7ed Mon Sep 17 00:00:00 2001
From: Tassilo Weidner <3015690+tasso94@users.noreply.github.com>
Date: Thu, 24 Mar 2022 13:05:15 +0100
Subject: [PATCH] chore(test-utils/assert): manage `assertj` version by spring
 boot

Related to CAM-14459
---
 spring-boot-starter/starter-test/pom.xml | 11 ++----
 test-utils/assert/core/pom.xml           | 45 +++++++++++++-----------
 test-utils/junit5-extension/pom.xml      |  6 +++-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/spring-boot-starter/starter-test/pom.xml b/spring-boot-starter/starter-test/pom.xml
index 25e18fd55cb..2e297ff53e2 100644
--- a/spring-boot-starter/starter-test/pom.xml
+++ b/spring-boot-starter/starter-test/pom.xml
@@ -12,11 +12,6 @@
   <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
   <name>Camunda Platform - Spring Boot Starter - Test</name>
 
-  <properties>
-    <camunda-assert.artifact>camunda-bpm-assert-assertj3-11-1</camunda-assert.artifact>
-    <camunda-assert.version>4.0.0</camunda-assert.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -45,9 +40,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.camunda.bpm.assert</groupId>
-      <artifactId>${camunda-assert.artifact}</artifactId>
-      <version>${camunda-assert.version}</version>
+      <groupId>org.camunda.bpm</groupId>
+      <artifactId>camunda-bpm-assert</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/test-utils/assert/core/pom.xml b/test-utils/assert/core/pom.xml
index 973387decb8..e4e2d467392 100644
--- a/test-utils/assert/core/pom.xml
+++ b/test-utils/assert/core/pom.xml
@@ -11,31 +11,24 @@
     <relativePath>../../database</relativePath>
     <version>7.17.0-SNAPSHOT</version>
   </parent>
-
-  <properties>
-    <version.slf4j>1.7.26</version.slf4j>
-  </properties>
   
   <dependencyManagement>
     <dependencies>
+      <!-- spring-boot-dependencies as first element in the list
+           ensures to be chosen over internal-dependencies for assertj -->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${version.spring-boot}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
       <dependency>
         <groupId>org.camunda.bpm</groupId>
         <artifactId>camunda-core-internal-dependencies</artifactId>
         <version>${project.version}</version>
         <scope>import</scope>
         <type>pom</type>
-      </dependency>
-	  <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${version.slf4j}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>${version.slf4j}</version>
-        <scope>test</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -46,44 +39,54 @@
       <artifactId>camunda-engine</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <!-- managed by spring-boot-dependencies -->
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <version>${version.slf4j}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${version.slf4j}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${version.junit}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <version>${version.mockito}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <version>${version.mockito}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
+      <version>${version.h2}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.uuid</groupId>
       <artifactId>java-uuid-generator</artifactId>
+      <version>${version.uuid-generator}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/test-utils/junit5-extension/pom.xml b/test-utils/junit5-extension/pom.xml
index daf1828b4a8..6c36fd7f65b 100644
--- a/test-utils/junit5-extension/pom.xml
+++ b/test-utils/junit5-extension/pom.xml
@@ -11,6 +11,10 @@
     <relativePath>../../database</relativePath>
     <version>7.17.0-SNAPSHOT</version>
   </parent>
+
+  <properties>
+    <version.junit5>5.8.2</version.junit5>
+  </properties>
   
   <dependencyManagement>
     <dependencies>
@@ -33,7 +37,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>5.8.2</version>
+      <version>${version.junit5}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>