From 9d0e3f435923e4772035044ed4ac33f16b4eb128 Mon Sep 17 00:00:00 2001
From: Karsten Thoms <Karsten.Thoms-extern@deutschebahn.com>
Date: Thu, 7 Nov 2024 12:18:01 +0100
Subject: [PATCH] chore(build): Merge profile 'distro-ce' into 'distro' (#152)

---
 distro/jboss/pom.xml                   |  2 +-
 distro/run/pom.xml                     | 13 ++-----------
 distro/run/qa/pom.xml                  | 10 +---------
 distro/tomcat/pom.xml                  |  8 --------
 distro/wildfly/pom.xml                 |  8 --------
 pom.xml                                | 17 -----------------
 spring-boot-starter/pom.xml            |  9 ---------
 spring-boot-starter/starter-qa/pom.xml | 23 +----------------------
 8 files changed, 5 insertions(+), 85 deletions(-)

diff --git a/distro/jboss/pom.xml b/distro/jboss/pom.xml
index cb40e4159e..cb69d0f873 100644
--- a/distro/jboss/pom.xml
+++ b/distro/jboss/pom.xml
@@ -28,7 +28,7 @@
 
   <profiles>
     <profile>
-      <id>distro-ce</id>
+      <id>distro</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
diff --git a/distro/run/pom.xml b/distro/run/pom.xml
index dc729ca55b..425aca69e5 100644
--- a/distro/run/pom.xml
+++ b/distro/run/pom.xml
@@ -66,21 +66,12 @@
       </activation>
       <modules>
         <module>modules</module>
+        <module>modules/oauth2</module>
         <module>modules/rest</module>
         <module>modules/example</module>
+        <module>modules/webapps</module>
         <module>core</module>
         <module>assembly</module>
-        <module>qa</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>modules/webapps</module>
-        <module>modules/oauth2</module>
         <module>distro</module>
         <module>qa</module>
       </modules>
diff --git a/distro/run/qa/pom.xml b/distro/run/qa/pom.xml
index 39fb1650c1..102867350f 100644
--- a/distro/run/qa/pom.xml
+++ b/distro/run/qa/pom.xml
@@ -71,19 +71,11 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
+        <module>runtime</module>
         <module>example-plugin</module>
         <module>integration-tests</module>
       </modules>
     </profile>
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>runtime</module>
-      </modules>
-    </profile>
     <profile>
       <id>integration-test-operaton-run</id>
       <modules>
diff --git a/distro/tomcat/pom.xml b/distro/tomcat/pom.xml
index 9300a6e027..91c5f07efa 100644
--- a/distro/tomcat/pom.xml
+++ b/distro/tomcat/pom.xml
@@ -34,14 +34,6 @@
       </activation>
       <modules>
         <module>assembly</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
         <module>distro</module>
         <module>webapp</module>
         <module>webapp-jakarta</module>
diff --git a/distro/wildfly/pom.xml b/distro/wildfly/pom.xml
index 1db7752061..bfa6beb450 100644
--- a/distro/wildfly/pom.xml
+++ b/distro/wildfly/pom.xml
@@ -36,14 +36,6 @@
         <module>assembly</module>
         <module>modules</module>
         <module>subsystem</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
         <module>webapp</module>
         <module>distro</module>
       </modules>
diff --git a/pom.xml b/pom.xml
index 14710023bb..71ccef8519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,23 +357,6 @@
       </modules>
     </profile>
 
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <!-- This profile is run in the CI after the webapps were built (platform-ASSEMBLY);
-          It should activate any module that has a dependency to the webapps -->
-        <module>spring-boot-starter</module>
-
-        <module>distro/license-book</module>
-        <module>distro/jboss</module>
-        <module>distro/tomcat</module>
-        <!-- module>distro/run</module -->
-      </modules>
-    </profile>
-
     <profile>
       <id>javadocs</id>
       <build>
diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml
index d1539c5769..e8fa9b9225 100644
--- a/spring-boot-starter/pom.xml
+++ b/spring-boot-starter/pom.xml
@@ -47,15 +47,6 @@
         <module>starter-test</module>
         <module>starter-client/spring</module>
         <module>starter-client/spring-boot</module>
-        <module>starter-qa</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
         <module>starter-webapp-core</module>
         <module>starter-webapp</module>
         <module>starter-qa</module>
diff --git a/spring-boot-starter/starter-qa/pom.xml b/spring-boot-starter/starter-qa/pom.xml
index a12f1accfb..b54b6eec7f 100644
--- a/spring-boot-starter/starter-qa/pom.xml
+++ b/spring-boot-starter/starter-qa/pom.xml
@@ -14,7 +14,7 @@
   <artifactId>operaton-bpm-spring-boot-starter-qa</artifactId>
   <name>Operaton - Spring Boot Starter - QA - Root POM</name>
 
-  <profiles>  
+  <profiles>
     <profile>
       <id>distro</id>
       <activation>
@@ -25,27 +25,6 @@
         <module>integration-test-request-scope</module>
         <module>integration-test-plugins</module>
         <module>integration-test-liquibase</module>
-      </modules>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <skipTests>true</skipTests>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-    <profile>
-      <id>distro-ce</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
         <module>integration-test-webapp</module>
       </modules>
       <build>