From 2f4b747bc04a037d6f7d38900184cbc498107101 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Sat, 15 Feb 2025 18:02:49 +0100
Subject: Reenable tests for more of the bpmn modules

- MSOCommonBPMN
- MSOCoreBPMN
- resolve build warnings due to duplicate dependency declarations in other modules

Issue-ID: SO-4142
Change-Id: I37a09eec3e09f0f280c3ae3440b11b1b16447710
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 bpmn/MSOCommonBPMN/pom.xml                 | 12 ++++-----
 bpmn/MSOCoreBPMN/pom.xml                   |  5 ++++
 bpmn/so-bpmn-infrastructure-common/pom.xml |  5 ----
 bpmn/so-bpmn-infrastructure-flows/pom.xml  | 42 +++++++++---------------------
 bpmn/so-bpmn-moi/pom.xml                   |  5 ----
 deployment-configs/pom.xml                 |  1 +
 6 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index b6b3586871..ab90c5cd25 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -98,7 +98,7 @@
     </plugins>
     <pluginManagement>
       <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings 
+        <!--This plugin's configuration is used to store Eclipse m2e settings
           only. It has no influence on the Maven build itself. -->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
@@ -151,6 +151,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.camunda.bpm.extension.mockito</groupId>
       <artifactId>camunda-bpm-mockito</artifactId>
@@ -251,11 +256,6 @@
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>uk.co.blackpepper.bowman</groupId>
       <artifactId>bowman-client</artifactId>
diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml
index a14b8cd589..662bd30532 100644
--- a/bpmn/MSOCoreBPMN/pom.xml
+++ b/bpmn/MSOCoreBPMN/pom.xml
@@ -88,5 +88,10 @@
       <artifactId>json-schema-validator</artifactId>
       <version>2.2.6</version>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index 667737b571..227102411b 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -182,11 +182,6 @@
       <artifactId>camunda-spin-dataformat-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <artifactId>camunda-spin-dataformat-all</artifactId>
-      <groupId>org.camunda.spin</groupId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-spin</artifactId>
diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index f71b153306..48d2360442 100644
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -61,6 +61,19 @@
                     <ignore />
                   </action>
                 </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[1.0.0,)</versionRange>
+                    <goals>
+                      <goal>unpack</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute />
+                  </action>
+                </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>
@@ -107,30 +120,6 @@
             <parallel>suites</parallel>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[1.0.0,)</versionRange>
-                    <goals>
-                      <goal>unpack</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
     <finalName>${project.artifactId}-${project.version}</finalName>
@@ -227,11 +216,6 @@
       <artifactId>camunda-spin-dataformat-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <artifactId>camunda-spin-dataformat-all</artifactId>
-      <groupId>org.camunda.spin</groupId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-spin</artifactId>
diff --git a/bpmn/so-bpmn-moi/pom.xml b/bpmn/so-bpmn-moi/pom.xml
index 8460f0f728..5146e2b410 100644
--- a/bpmn/so-bpmn-moi/pom.xml
+++ b/bpmn/so-bpmn-moi/pom.xml
@@ -137,11 +137,6 @@
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>uk.co.blackpepper.bowman</groupId>
       <artifactId>bowman-client</artifactId>
diff --git a/deployment-configs/pom.xml b/deployment-configs/pom.xml
index c3ee2bc005..ca2066df45 100644
--- a/deployment-configs/pom.xml
+++ b/deployment-configs/pom.xml
@@ -18,6 +18,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
         <configuration>
           <nonFilteredFileExtensions>
             <nonFilteredFileExtension>jks</nonFilteredFileExtension>
-- 
cgit