Merge branch 'gh-4605' of github.com:cachescrubber/camunda-bpm-platfo…

…rm into cachescrubber-gh-4605
camunda · Sep 18, 2024 · cb7a99c · cb7a99c
2 parents 79ff55d + 39581a9
commit cb7a99c
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 81 deletions.
diff --git a/bom/camunda-only-bom/pom.xml b/bom/camunda-only-bom/pom.xml
@@ -213,30 +213,8 @@
         <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>

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

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,7 +121,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-all</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

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>

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>

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>
 

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

diff --git a/qa/integration-tests-engine-jakarta/pom.xml b/qa/integration-tests-engine-jakarta/pom.xml
@@ -215,13 +215,11 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/qa/integration-tests-engine/pom.xml b/qa/integration-tests-engine/pom.xml
@@ -163,13 +163,11 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/qa/test-db-instance-migration/test-fixture-722/pom.xml b/qa/test-db-instance-migration/test-fixture-722/pom.xml
@@ -39,7 +39,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/qa/test-db-instance-migration/test-migration/pom.xml b/qa/test-db-instance-migration/test-migration/pom.xml
@@ -21,7 +21,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.camunda.bpm</groupId>

diff --git a/qa/tomcat9-runtime/pom.xml b/qa/tomcat9-runtime/pom.xml
@@ -134,7 +134,6 @@
         <dependency>
           <groupId>org.camunda.spin</groupId>
           <artifactId>camunda-spin-core</artifactId>
-          <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -145,7 +144,6 @@
         <dependency>
           <groupId>org.camunda.spin</groupId>
           <artifactId>camunda-spin-dataformat-all</artifactId>
-          <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/spin/bom/pom.xml b/spin/bom/pom.xml
@@ -1,22 +1,12 @@
 <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>
 
-  <parent>
-    <groupId>org.camunda.bpm</groupId>
-    <artifactId>camunda-parent</artifactId>
-    <relativePath>../../parent</relativePath>
-    <version>7.22.0-SNAPSHOT</version>
-  </parent>
-
   <groupId>org.camunda.spin</groupId>
   <artifactId>camunda-spin-bom</artifactId>
   <name>camunda spin - bom</name>
+  <version>7.22.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <properties>
-    <plugin.version.javadoc>3.3.1</plugin.version.javadoc>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
 
@@ -37,6 +27,25 @@
         <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>
       </dependency>
 
       <dependency>
@@ -59,22 +68,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${plugin.version.javadoc}</version>
-          <configuration combine.children="append">
-            <doclint>none</doclint>
-            <detectJavaApiLink>false</detectJavaApiLink>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <scm>
     <url>https://github.com/camunda/camunda-bpm-platform</url>
     <connection>scm:git:[email protected]:camunda/camunda-bpm-platform.git</connection>

diff --git a/spin/pom.xml b/spin/pom.xml
@@ -3,12 +3,13 @@
 
   <!-- camunda BPM parent release pom -->
   <parent>
-    <groupId>org.camunda.spin</groupId>
-    <artifactId>camunda-spin-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.spin</groupId>
   <artifactId>camunda-spin-root</artifactId>
   <name>camunda Spin - root</name>
   <inceptionYear>2014</inceptionYear>
@@ -27,6 +28,7 @@
     <powermock.version>2.0.9</powermock.version>
     <mockito.version>3.3.3</mockito.version>
     <spin.version.old>1.23.0</spin.version.old>
+    <plugin.version.javadoc>3.3.1</plugin.version.javadoc>
 
     <license.includeTransitiveDependencies>false</license.includeTransitiveDependencies>
     <additionalparam>-Xdoclint:none</additionalparam>
@@ -130,6 +132,15 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${plugin.version.javadoc}</version>
+          <configuration combine.children="append">
+            <doclint>none</doclint>
+            <detectJavaApiLink>false</detectJavaApiLink>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>

diff --git a/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all/pom.xml b/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all/pom.xml
@@ -29,7 +29,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-all</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/...oot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson/pom.xml b/...oot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson/pom.xml
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/spring-boot-starter/starter/pom.xml b/spring-boot-starter/starter/pom.xml
@@ -55,7 +55,6 @@
     <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
-      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
 

diff --git a/webapps/assembly-jakarta/pom.xml b/webapps/assembly-jakarta/pom.xml
@@ -490,12 +490,10 @@
         <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>
           <groupId>org.camunda.bpm</groupId>

diff --git a/webapps/assembly/pom.xml b/webapps/assembly/pom.xml
@@ -232,12 +232,10 @@
         <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>
           <groupId>org.camunda.bpm</groupId>