fix(bom): fix bom imports in camunda-only-bom (#4628)

* use type pom with scope import for camunda-spin-bom * use type pom with scope import for camunda-commons-bom * use type pom with scope import for camunda-connect-bom * remove project.version from dependency declarations * use camunda-root as parent for camunda-spin-bom, camunda-commons-bom, camunda-connect-bom related to #4605
camunda · Sep 20, 2024 · 7644178 · 7644178
1 parent 1b9de30
commit 7644178
Show file tree

Hide file tree

Showing 36 changed files with 60 additions and 140 deletions.
diff --git a/bom/camunda-only-bom/pom.xml b/bom/camunda-only-bom/pom.xml
@@ -213,35 +213,15 @@
         <groupId>org.camunda.spin</groupId>
         <artifactId>camunda-spin-bom</artifactId>
         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.camunda.spin</groupId>
-        <artifactId>camunda-spin-dataformat-all</artifactId>
-        <version>${project.version}</version>
-        <!-- Excluding dependencies that are shaded in camunda-spin-dataformat-all -->
-        <exclusions>
-          <exclusion>
-            <groupId>org.camunda.spin</groupId>
-            <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.camunda.spin</groupId>
-            <artifactId>camunda-spin-dataformat-xml-dom</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-          </exclusion>
-        </exclusions>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.camunda.commons</groupId>
         <artifactId>camunda-commons-bom</artifactId>
         <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.camunda.template-engines</groupId>
@@ -252,6 +232,8 @@
         <groupId>org.camunda.connect</groupId>
         <artifactId>camunda-connect-bom</artifactId>
         <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
 
       <!-- dmn engine dependencies

diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
@@ -53,13 +53,11 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-logging</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-typed-values</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -108,7 +106,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-all</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/commons/bom/pom.xml b/commons/bom/pom.xml
@@ -1,11 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <!-- HEADS-UP: Do not use camunda-parent as parent,
+  it would introduce a cyclic dependency to this bom -->
   <parent>
     <groupId>org.camunda.bpm</groupId>
-    <artifactId>camunda-parent</artifactId>
-    <relativePath>../../parent</relativePath>
+    <artifactId>camunda-root</artifactId>
     <version>7.22.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.camunda.commons</groupId>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -2,12 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.camunda.commons</groupId>
-    <artifactId>camunda-commons-bom</artifactId>
+    <groupId>org.camunda.bpm</groupId>
+    <artifactId>camunda-parent</artifactId>
+    <relativePath>../parent</relativePath>
     <version>7.22.0-SNAPSHOT</version>
-    <relativePath>bom</relativePath>
   </parent>
 
+  <groupId>org.camunda.commons</groupId>
   <artifactId>camunda-commons-root</artifactId>
   <name>camunda Commons - Root Pom</name>
   <inceptionYear>2014</inceptionYear>

diff --git a/commons/typed-values/pom.xml b/commons/typed-values/pom.xml
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-utils</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/connect/bom/pom.xml b/connect/bom/pom.xml
@@ -1,11 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <!-- HEADS-UP: Do not use camunda-parent as parent,
+  it would introduce a cyclic dependency to this bom -->
   <parent>
     <groupId>org.camunda.bpm</groupId>
-    <artifactId>camunda-parent</artifactId>
-    <relativePath>../../parent</relativePath>
+    <artifactId>camunda-root</artifactId>
     <version>7.22.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.camunda.connect</groupId>

diff --git a/connect/pom.xml b/connect/pom.xml
@@ -2,12 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.camunda.connect</groupId>
-    <artifactId>camunda-connect-bom</artifactId>
+    <groupId>org.camunda.bpm</groupId>
+    <artifactId>camunda-parent</artifactId>
+    <relativePath>../parent</relativePath>
     <version>7.22.0-SNAPSHOT</version>
-    <relativePath>bom</relativePath>
   </parent>
 
+  <groupId>org.camunda.connect</groupId>
   <artifactId>camunda-connect-root</artifactId>
   <name>Camunda Platform - connect - root</name>
   <inceptionYear>2014</inceptionYear>
@@ -35,14 +36,6 @@
   <dependencyManagement>
     <dependencies>
 
-      <dependency>
-        <groupId>org.camunda.commons</groupId>
-        <artifactId>camunda-commons-bom</artifactId>
-        <version>${project.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>

diff --git a/distro/run/core/pom.xml b/distro/run/core/pom.xml
@@ -42,7 +42,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-all</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/distro/tomcat/assembly/pom.xml b/distro/tomcat/assembly/pom.xml
@@ -110,7 +110,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -122,13 +121,11 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-all</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -140,7 +137,6 @@
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-connectors-all</artifactId>
-      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.camunda.connect</groupId>

diff --git a/distro/wildfly/modules/pom.xml b/distro/wildfly/modules/pom.xml
@@ -55,13 +55,11 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-xml-dom-jakarta</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -72,13 +70,11 @@
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-http-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-soap-http-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- script engine dependencies -->

diff --git a/distro/wildfly26/modules/pom.xml b/distro/wildfly26/modules/pom.xml
@@ -55,13 +55,11 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-xml-dom</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -72,13 +70,11 @@
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-http-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-soap-http-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- script engine dependencies -->

diff --git a/engine-dmn/engine/pom.xml b/engine-dmn/engine/pom.xml
@@ -20,13 +20,11 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-utils</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-typed-values</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/engine-dmn/feel-api/pom.xml b/engine-dmn/feel-api/pom.xml
@@ -17,7 +17,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-typed-values</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/engine-dmn/feel-juel/pom.xml b/engine-dmn/feel-juel/pom.xml
@@ -23,13 +23,11 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-logging</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-typed-values</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/engine-plugins/connect-plugin/pom.xml b/engine-plugins/connect-plugin/pom.xml
@@ -16,20 +16,17 @@
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-http-client</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-soap-http-client</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/engine-plugins/identity-ldap/pom.xml b/engine-plugins/identity-ldap/pom.xml
@@ -21,7 +21,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-logging</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- LDAP Libraries to start test server -->

diff --git a/engine-plugins/pom.xml b/engine-plugins/pom.xml
@@ -64,7 +64,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-testing</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/engine-plugins/spin-plugin/pom.xml b/engine-plugins/spin-plugin/pom.xml
@@ -16,7 +16,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -36,14 +35,12 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-xml-dom</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -128,7 +125,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-testing</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/engine-rest/engine-rest-jakarta/pom.xml b/engine-rest/engine-rest-jakarta/pom.xml
@@ -116,7 +116,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-logging</artifactId>
-      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -194,7 +193,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-testing</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/engine-rest/engine-rest/pom.xml b/engine-rest/engine-rest/pom.xml
@@ -86,7 +86,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-logging</artifactId>
-      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -218,7 +217,6 @@
     <dependency>
       <groupId>org.camunda.commons</groupId>
       <artifactId>camunda-commons-testing</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>