From c59cdbca143275d7b55744e84f792a7824697845 Mon Sep 17 00:00:00 2001
From: arolfes <arolfes@users.noreply.github.com>
Date: Tue, 14 Nov 2023 08:00:07 +0100
Subject: [PATCH] Closes #2433: submodules must start with pro.taskana

---
 .github/workflows/continuous-integration.yml | 30 --------------------
 pom.xml                                      |  6 ----
 routing/dmn-xlsx-converter/pom.xml           |  5 ++--
 routing/taskana-routing-rest/pom.xml         |  4 +--
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ecc0c69b4..8242bbe92 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -20,8 +20,6 @@ env:
   ARTIFACTS_CYPRESS_TESTS_PATH: web/cypress
   ARTIFACTS_TASKANA_JARS_NAME: taskana-jars
   ARTIFACTS_TASKANA_JARS_PATH: ~/.m2/repository/pro/taskana
-  ARTIFACTS_TASKANA_CAMUNDA_JARS_NAME: taskana-camunda-jars
-  ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH: ~/.m2/repository/org/camunda/bpm/extension/dmn/dmn-xlsx-converter
   ARTIFACTS_TASKANA_WEB_NAME: taskana-web
   ARTIFACTS_TASKANA_WEB_PATH: web/dist
   ARTIFACTS_JACOCO_REPORTS_NAME: jacoco-reports
@@ -68,16 +66,8 @@ jobs:
           name: ${{ env.ARTIFACTS_TASKANA_JARS_NAME }}
           path: ${{ env.ARTIFACTS_TASKANA_JARS_PATH }}
           if-no-files-found: error
-      - name: Upload taskana camunda extension artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_NAME }}
-          path: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH }}
-          if-no-files-found: error
       - name: Remove taskana artifacts from cache
         run: rm -rf ${{ env.ARTIFACTS_TASKANA_JARS_PATH }}
-      - name: Remove taskana camunda extension artifact from cache
-        run: rm -rf ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH }}
       - name: Cancel workflow
         if: failure()
         uses: andymckay/cancel-action@0.3
@@ -217,11 +207,6 @@ jobs:
         with:
           name: ${{ env.ARTIFACTS_TASKANA_JARS_NAME }}
           path: ${{ env.ARTIFACTS_TASKANA_JARS_PATH }}
-      - name: Download taskana camunda artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_NAME }}
-          path: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH }}
       - name: Change versions to match tag
         run: ci/change_version.sh -m .
         # Theoretically this step below not necessary because we reuse the cache from the 'compile_frontend' job.
@@ -331,11 +316,6 @@ jobs:
         with:
           name: ${{ env.ARTIFACTS_TASKANA_JARS_NAME }}
           path: ${{ env.ARTIFACTS_TASKANA_JARS_PATH }}
-      - name: Download taskana camunda artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_NAME }}
-          path: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH }}
       - name: Change versions to match tag
         run: |
           ci/change_version.sh -m .
@@ -393,11 +373,6 @@ jobs:
         with:
           name: ${{ env.ARTIFACTS_TASKANA_JARS_NAME }}
           path: ${{ env.ARTIFACTS_TASKANA_JARS_PATH }}
-      - name: Download taskana camunda artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_NAME }}
-          path: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH }}
       - name: Download taskana-web dist artifact
         uses: actions/download-artifact@v3
         with:
@@ -461,11 +436,6 @@ jobs:
         with:
           name: ${{ env.ARTIFACTS_TASKANA_JARS_NAME }}
           path: ${{ env.ARTIFACTS_TASKANA_JARS_PATH }}
-      - name: Download taskana camunda artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_NAME }}
-          path: ${{ env.ARTIFACTS_TASKANA_CAMUNDA_JARS_PATH }}
       - name: Download taskana-web dist artifact
         uses: actions/download-artifact@v3
         with:
diff --git a/pom.xml b/pom.xml
index 14e6c331b..dbbddd14f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,12 +96,6 @@
     <version.aspectj>1.9.20.1</version.aspectj>
 
     <!-- Excel to DMN converter dependencies -->
-    <!-- If there is new version of org.camunda.bpm.extension.dmn:dmn-xlsx-converter that is
-     |   compatible with jakarta then you need to enter this version here, remove the
-     |   submodule dmn-xlsx-converter under routing and you can also delete the property version.docx4j
-    -->
-    <version.dmn-xlsx-converter>0.4.0-taskana-patch</version.dmn-xlsx-converter>
-    <!-- when docx4j version is upgraded, the version from dmn-xlsx-converter needs to be increased too -->
     <version.docx4j>11.4.9</version.docx4j>
     <version.jakarta.xml.bind-api>4.0.1</version.jakarta.xml.bind-api>
     <version.jaxb-core>4.0.4</version.jaxb-core>
diff --git a/routing/dmn-xlsx-converter/pom.xml b/routing/dmn-xlsx-converter/pom.xml
index b1c3e783d..665c0926c 100644
--- a/routing/dmn-xlsx-converter/pom.xml
+++ b/routing/dmn-xlsx-converter/pom.xml
@@ -3,10 +3,9 @@
          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>
-  <groupId>org.camunda.bpm.extension.dmn</groupId>
+  <groupId>pro.taskana.camunda.bpm.extension.dmn</groupId>
   <artifactId>dmn-xlsx-converter</artifactId>
-  <version>${version.dmn-xlsx-converter}</version>
-  <name>DMN-XLSX Converter</name>
+  <name>${project.groupId}:${project.artifactId}</name>
   <packaging>jar</packaging>
 
   <parent>
diff --git a/routing/taskana-routing-rest/pom.xml b/routing/taskana-routing-rest/pom.xml
index b7834a437..a70784445 100644
--- a/routing/taskana-routing-rest/pom.xml
+++ b/routing/taskana-routing-rest/pom.xml
@@ -27,9 +27,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.camunda.bpm.extension.dmn</groupId>
+      <groupId>pro.taskana.camunda.bpm.extension.dmn</groupId>
       <artifactId>dmn-xlsx-converter</artifactId>
-      <version>${version.dmn-xlsx-converter}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>