From 1fee279ee527b254335e920b0c5a98ea57e3d3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6sle?= Date: Wed, 31 Jul 2024 15:52:35 +0200 Subject: [PATCH] refactoring: use single maven version for miranum connect and platform --- .github/workflows/build.yml | 4 +- .github/workflows/release.yml | 38 +- .../workflow-build-and-release-services.yml | 103 +--- .github/workflows/workflow-bump-version.yaml | 54 +- .../workflows/workflow-github-release.yaml | 8 +- connect/camunda7-remote/all/pom.xml | 12 +- connect/camunda7-remote/message/pom.xml | 6 +- connect/camunda7-remote/oauth/pom.xml | 2 +- connect/camunda7-remote/pom.xml | 2 +- connect/camunda7-remote/process/pom.xml | 6 +- connect/camunda7-remote/task/pom.xml | 6 +- connect/camunda7-remote/utils/pom.xml | 2 +- connect/camunda7-remote/worker/pom.xml | 6 +- connect/camunda8/all/pom.xml | 10 +- connect/camunda8/message/pom.xml | 4 +- connect/camunda8/pom.xml | 2 +- connect/camunda8/process/pom.xml | 4 +- connect/camunda8/worker/pom.xml | 4 +- connect/core/element-template-api/pom.xml | 4 +- connect/core/json/api/pom.xml | 2 +- connect/core/json/pom.xml | 2 +- connect/core/json/schema-registry/pom.xml | 4 +- connect/core/message-api/pom.xml | 2 +- connect/core/pom.xml | 2 +- connect/core/process-api/pom.xml | 2 +- connect/core/s3/pom.xml | 2 +- connect/core/shared/pom.xml | 2 +- connect/core/task-api/pom.xml | 2 +- connect/core/worker-api/pom.xml | 4 +- connect/pom.xml | 497 +----------------- connect/templates/camunda7/pom.xml | 8 +- .../c7/Camunda7ElementTemplateGenerator.java | 8 +- .../c7/CamundaC7ElementTemplateConverter.java | 2 +- connect/templates/camunda8/pom.xml | 6 +- .../generator-maven-plugin-core/pom.xml | 8 +- .../templates/generator-maven-plugin/pom.xml | 10 +- connect/templates/pom.xml | 2 +- {connect/coverage => coverage}/pom.xml | 97 +++- examples/inquiry-integration-service/pom.xml | 54 +- examples/pom.xml | 14 +- .../single-deployment-unit-example/pom.xml | 62 +-- platform/coverage/pom.xml | 18 +- platform/deployment/core/pom.xml | 2 +- .../deployment/core/receiver-core/pom.xml | 2 +- platform/deployment/core/server-core/pom.xml | 2 +- .../examples/embedded-example/pom.xml | 6 +- platform/deployment/examples/pom.xml | 2 +- .../deployment/examples/rest-example/pom.xml | 4 +- platform/deployment/pom.xml | 2 +- platform/deployment/rest/pom.xml | 2 +- .../rest/receiver-rest-starter/pom.xml | 4 +- .../rest/server-rest-starter/pom.xml | 4 +- .../server-embedded-starter/pom.xml | 6 +- platform/engine/core/pom.xml | 14 +- platform/engine/pom.xml | 2 +- platform/engine/task/pom.xml | 19 +- platform/engine/user/pom.xml | 2 +- platform/libs/pom.xml | 2 +- platform/libs/spring-security/pom.xml | 2 +- .../spring-security-core/pom.xml | 2 +- .../spring-security-starter/pom.xml | 4 +- platform/libs/unit-test/pom.xml | 2 +- platform/pom.xml | 475 +---------------- pom.xml | 466 +++++++++++++++- 64 files changed, 720 insertions(+), 1393 deletions(-) rename {connect/coverage => coverage}/pom.xml (69%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08d8859c3..04ccc2619 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,8 @@ jobs: with: docker-release-version: dev snapshot-release: true - maven-release: false + maven-release: true docker-release: ${{ github.ref_name == 'main' }} - release-connect: ${{ github.ref_name == 'main' }} - release-platform: ${{ github.ref_name == 'main' }} secrets: inherit labelPR: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6471bcfe..b2071ee5c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,25 +3,8 @@ name: Release on: workflow_dispatch: inputs: - release-tag: - description: 'Release Tag' - required: false - default: 'platform_XXX_connect_XXX' - release-connect: - description: 'Release miranum connect?' - type: boolean - required: true - default: false - connect-maven-new-version: - description: '(Optional) Specify new connect maven version - SNAPSHOT will be added to the version' - required: false - release-platform: - description: 'Release miranum platform?' - type: boolean - required: true - default: false - platform-maven-new-version: - description: '(Optional) Specify new platform maven version - SNAPSHOT will be added to the version' + new-maven-version: + description: '(Optional) Specify new maven version - SNAPSHOT will be added to the version' required: false jobs: @@ -36,37 +19,30 @@ jobs: run: ./mvnw versions:set --batch-mode -DremoveSnapshot -DprocessAllModules - name: PREP / Set services release version env variables run: | - echo "CONNECT_RELEASE_VERSION=$(./mvnw -f connect help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - echo "PLATFORM_RELEASE_VERSION=$(./mvnw -f platform help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + echo "RELEASE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV outputs: - connect-release-version: ${{ env.CONNECT_RELEASE_VERSION }} - platform-release-version: ${{ env.PLATFORM_RELEASE_VERSION }} + release-version: ${{ env.RELEASE_VERSION }} release: needs: release-version uses: ./.github/workflows/workflow-build-and-release-services.yml with: - docker-release-version: ${{ needs.release-version.outputs.platform-release-version }} + docker-release-version: ${{ needs.release-version.outputs.release-version }} snapshot-release: false maven-release: true docker-release: true - release-connect: ${{ inputs.release-connect }} - release-platform: ${{ inputs.release-platform }} secrets: inherit github-release: needs: release uses: ./.github/workflows/workflow-github-release.yaml with: - release-tag: ${{ github.event.inputs.release-tag }} + release-version: ${{ needs.release-version.outputs.release-version }} secrets: inherit bump-versions: needs: github-release uses: ./.github/workflows/workflow-bump-version.yaml with: - connect-bump-version: ${{ github.event.inputs.release-connect == true }} - connect-new-maven-version: ${{ github.event.inputs.connect-maven-new-version }} - platform-bump-version: ${{ github.event.inputs.release-platform == true }} - platform-new-maven-version: ${{ github.event.inputs.platform-maven-new-version }} + new-maven-version: ${{ github.event.inputs.new-maven-version }} secrets: inherit diff --git a/.github/workflows/workflow-build-and-release-services.yml b/.github/workflows/workflow-build-and-release-services.yml index 499405384..98268e0d7 100644 --- a/.github/workflows/workflow-build-and-release-services.yml +++ b/.github/workflows/workflow-build-and-release-services.yml @@ -22,16 +22,6 @@ on: type: boolean required: true default: true - release-connect: - description: 'Release miranum connect' - type: boolean - required: true - default: false - release-platform: - description: 'Release miranum platform' - type: boolean - required: true - default: false jobs: build-and-test: @@ -55,15 +45,15 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: false - files: ./connect/coverage/target/coverage/jacoco.xml,./platform/coverage/target/coverage/jacoco.xml + files: ./coverage/target/coverage/jacoco.xml flags: unittests name: miranum verbose: true - release-connect: + release: runs-on: ubuntu-latest needs: build-and-test - if: inputs.release-connect == true + if: inputs.maven-release == true steps: - name: PREP / Check out Git repository uses: actions/checkout@v4 @@ -82,95 +72,12 @@ jobs: if: inputs.snapshot-release == false run: | chmod +x ./mvnw - ./mvnw -f connect versions:set --batch-mode -DremoveSnapshot -DprocessAllModules + ./mvnw versions:set --batch-mode -DremoveSnapshot -DprocessAllModules - name: RELEASE / Build and Release Maven - if: inputs.maven-release == true run: | - ./mvnw -f connect --batch-mode --no-transfer-progress deploy --activate-profiles deploy -DskipTests + ./mvnw --batch-mode --no-transfer-progress deploy --activate-profiles deploy -DskipTests env: MAVEN_USERNAME: ${{ secrets.nexus_username }} MAVEN_PASSWORD: ${{ secrets.nexus_password }} MAVEN_GPG_PASSPHRASE: ${{ secrets.PGP_PRIVATE_KEY_SECRET }} - - - release-platform: - runs-on: ubuntu-latest - needs: build-and-test - if: inputs.release-platform == true - steps: - - name: PREP / Check out Git repository - uses: actions/checkout@v4 - - name: PREP / Install Java and Maven - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'adopt' - server-id: "ossrh" - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.PGP_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - - name: PREP / Set up QEMU - if: inputs.docker-release == true - uses: docker/setup-qemu-action@v3 - - name: PREP / Set up Docker Buildx - if: inputs.docker-release == true - uses: docker/setup-buildx-action@v3 - - name: PREP / Login to DockerHub - if: inputs.docker-release == true - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_MIRAGON_USERNAME }} - password: ${{ secrets.DOCKER_MIRAGON_PASSWORD }} - - - name: RELEASE / Remove SNAPSHOT - if: inputs.snapshot-release == false - run: | - chmod +x ./mvnw - ./mvnw -f platform versions:set --batch-mode -DremoveSnapshot -DprocessAllModules - - - name: BUILD / Build Maven - run: | - ./mvnw -f platform --batch-mode install -DskipTests - env: - MAVEN_USERNAME: ${{ secrets.nexus_username }} - MAVEN_PASSWORD: ${{ secrets.nexus_password }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.PGP_PRIVATE_KEY_SECRET }} - - - name: RELEASE / Release Maven - if: inputs.maven-release == true - run: | - ./mvnw -f platform --batch-mode --no-transfer-progress deploy --activate-profiles deploy -DskipTests - env: - MAVEN_USERNAME: ${{ secrets.nexus_username }} - MAVEN_PASSWORD: ${{ secrets.nexus_password }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.PGP_PRIVATE_KEY_SECRET }} - - # deployment examples - #- name: DOCKER / BUILD & PUBLISH / miragon/miranum-deployment-embedded-example - # if: inputs.docker-release == true - # uses: docker/build-push-action@v5 - # with: - # context: ./platform/deployment/examples/embedded-example/. - # push: true - # tags: miragon/miranum-deployment-embedded-example:${{ inputs.docker-release-version }} - # platforms: linux/amd64, linux/arm64/v8 - #- name: DOCKER / BUILD & PUBLISH / miragon/miranum-deployment-rest-example - # if: inputs.docker-release == true - # uses: docker/build-push-action@v5 - # with: - # context: ./platform/deployment/examples/rest-example/. - # push: true - # tags: miragon/miranum-deployment-rest-example:${{ inputs.docker-release-version }} - # platforms: linux/amd64, linux/arm64/v8 - - ## miranum-examples - #- name: DOCKER / BUILD & PUBLISH / miragon/miranum-single-deployment-unit-example - # if: inputs.docker-release == true - # uses: docker/build-push-action@v5 - # with: - # context: ./examples/single-deployment-unit-example/. - # push: true - # tags: miragon/miranum-single-deployment-unit-example:${{ inputs.docker-release-version }} - # platforms: linux/amd64, linux/arm64/v8 diff --git a/.github/workflows/workflow-bump-version.yaml b/.github/workflows/workflow-bump-version.yaml index 07f69216d..b98470fc2 100644 --- a/.github/workflows/workflow-bump-version.yaml +++ b/.github/workflows/workflow-bump-version.yaml @@ -3,40 +3,16 @@ name: Bump version on: workflow_call: inputs: - connect-bump-version: - description: 'Bump connect version?' - type: boolean - default: true - connect-new-maven-version: + new-maven-version: description: 'Connect new maven version' type: string required: false - platform-bump-version: - description: 'Bump platform version?' - type: boolean - default: true - platform-new-maven-version: - description: 'Platform new maven version' - type: string - required: false workflow_dispatch: inputs: - connect-bump-version: - description: 'Bump connect version?' - type: boolean - default: true - connect-new-maven-version: + new-maven-version: description: 'Connect new maven version' type: string required: false - platform-bump-version: - description: 'Bump platform version?' - type: boolean - default: true - platform-new-maven-version: - description: 'Platform new maven version' - type: string - required: false jobs: bump-versions: @@ -57,44 +33,26 @@ jobs: java-version: '17' distribution: 'corretto' - - name: BUMP CONNECT VERSION / Raise mvn version - if: inputs.connect-new-maven-version != '' && inputs.connect-bump-version == true + - name: BUMP VERSION / Raise mvn version + if: inputs.new-maven-version != '' run: | sed -i "s/.*<\/revision>/${{ inputs.connect-new-maven-version }}-SNAPSHOT<\/revision>/" connect/pom.xml - - name: BUMP CONNECT VERSION / Raise mvn version - if: inputs.connect-new-maven-version == '' && inputs.connect-bump-version == true + - name: BUMP VERSION / Raise mvn version + if: inputs.new-maven-version == '' run: | # increment minor version sed -i "s/.*<\/revision>/$(./mvnw -f connect help:evaluate -Dexpression=project.version -q -DforceStdout | awk -F'.' '{print $1"."$2+1".0-SNAPSHOT"}' | sed s/[.]$//)<\/revision>/" connect/pom.xml - name: GIT / Git commit - if: inputs.connect-bump-version == true run: | git add . git commit -m "chore: mvn auto version bump connect to $(./mvnw -f connect help:evaluate -Dexpression=project.version -q -DforceStdout)" - - name: BUMP PLATFORM VERSION / Raise mvn version - if: inputs.platform-new-maven-version != '' && inputs.platform-bump-version == true - run: | - sed -i "s/.*<\/revision>/${{ inputs.platform-new-maven-version }}-SNAPSHOT<\/revision>/" platform/pom.xml - - name: BUMP PLATFORM VERSION / Raise mvn version - if: inputs.platform-new-maven-version == '' && inputs.platform-bump-version == true - run: | - # increment minor version - sed -i "s/.*<\/revision>/$(./mvnw -f platform help:evaluate -Dexpression=project.version -q -DforceStdout | awk -F'.' '{print $1"."$2+1".0-SNAPSHOT"}' | sed s/[.]$//)<\/revision>/" platform/pom.xml - - name: GIT / Git commit - if: inputs.platform-bump-version == true - run: | - git add . - git commit -m "chore: mvn auto version bump platform to $(./mvnw -f platform help:evaluate -Dexpression=project.version -q -DforceStdout)" - - name: GIT / Push changes to new branch - if: inputs.platform-bump-version == true || inputs.connect-bump-version == true run: | git checkout -b ${{ github.ref_name }}-version-bump git push --force origin ${{ github.ref_name }}-version-bump - name: GIT / Create pull request uses: actions/github-script@v7 - if: inputs.platform-bump-version == true || inputs.connect-bump-version == true with: script: | const { repo, owner } = context.repo; diff --git a/.github/workflows/workflow-github-release.yaml b/.github/workflows/workflow-github-release.yaml index 920787595..2f9bcd619 100644 --- a/.github/workflows/workflow-github-release.yaml +++ b/.github/workflows/workflow-github-release.yaml @@ -3,8 +3,8 @@ name: Github Release on: workflow_call: inputs: - release-tag: - description: 'Release tag' + release-version: + description: 'Release version' type: string required: true @@ -23,14 +23,14 @@ jobs: github.rest.git.createRef({ owner: context.repo.owner, repo: context.repo.repo, - ref: 'refs/tags/${{ inputs.release-tag }}', + ref: 'refs/tags/${{ inputs.release-version }}', sha: context.sha }) - name: GIT / Create GitHub Release id: create_release uses: softprops/action-gh-release@v2 with: - tag_name: ${{ inputs.release-tag }} + tag_name: ${{ inputs.release-version }} draft: false prerelease: false generate_release_notes: true diff --git a/connect/camunda7-remote/all/pom.xml b/connect/camunda7-remote/all/pom.xml index 66afc3f20..f408f089d 100644 --- a/connect/camunda7-remote/all/pom.xml +++ b/connect/camunda7-remote/all/pom.xml @@ -8,34 +8,34 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} - io.miragon.miranum.connect + io.miragon.miranum worker-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum task-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum process-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum message-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-c7 ${project.version} diff --git a/connect/camunda7-remote/message/pom.xml b/connect/camunda7-remote/message/pom.xml index 972e34d91..9bb903244 100644 --- a/connect/camunda7-remote/message/pom.xml +++ b/connect/camunda7-remote/message/pom.xml @@ -8,14 +8,14 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} - io.miragon.miranum.connect + io.miragon.miranum connect-message-api ${project.version} @@ -26,7 +26,7 @@ provided - io.miragon.miranum.connect + io.miragon.miranum utils-camunda7-remote ${project.version} compile diff --git a/connect/camunda7-remote/oauth/pom.xml b/connect/camunda7-remote/oauth/pom.xml index 419fdfffc..c4eac8e46 100644 --- a/connect/camunda7-remote/oauth/pom.xml +++ b/connect/camunda7-remote/oauth/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} diff --git a/connect/camunda7-remote/pom.xml b/connect/camunda7-remote/pom.xml index c1b37c0da..d21cad2a5 100644 --- a/connect/camunda7-remote/pom.xml +++ b/connect/camunda7-remote/pom.xml @@ -8,7 +8,7 @@ pom - io.miragon.miranum.connect + io.miragon.miranum miranum-connect ${revision} diff --git a/connect/camunda7-remote/process/pom.xml b/connect/camunda7-remote/process/pom.xml index 3d6e03511..4741e225f 100644 --- a/connect/camunda7-remote/process/pom.xml +++ b/connect/camunda7-remote/process/pom.xml @@ -8,14 +8,14 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} - io.miragon.miranum.connect + io.miragon.miranum connect-process-api ${project.version} @@ -26,7 +26,7 @@ provided - io.miragon.miranum.connect + io.miragon.miranum utils-camunda7-remote ${project.version} compile diff --git a/connect/camunda7-remote/task/pom.xml b/connect/camunda7-remote/task/pom.xml index 54d8ae3f8..d0b9bcc85 100644 --- a/connect/camunda7-remote/task/pom.xml +++ b/connect/camunda7-remote/task/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} @@ -35,7 +35,7 @@ - io.miragon.miranum.connect + io.miragon.miranum connect-task-api ${project.version} @@ -48,7 +48,7 @@ provided - io.miragon.miranum.connect + io.miragon.miranum utils-camunda7-remote ${project.version} diff --git a/connect/camunda7-remote/utils/pom.xml b/connect/camunda7-remote/utils/pom.xml index 9004faac6..06bcaacae 100644 --- a/connect/camunda7-remote/utils/pom.xml +++ b/connect/camunda7-remote/utils/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} diff --git a/connect/camunda7-remote/worker/pom.xml b/connect/camunda7-remote/worker/pom.xml index 4e953fa20..9febad990 100644 --- a/connect/camunda7-remote/worker/pom.xml +++ b/connect/camunda7-remote/worker/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote ${revision} @@ -16,12 +16,12 @@ - io.miragon.miranum.connect + io.miragon.miranum connect-worker-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum utils-camunda7-remote ${project.version} diff --git a/connect/camunda8/all/pom.xml b/connect/camunda8/all/pom.xml index 286f1c756..aa29cf4a0 100644 --- a/connect/camunda8/all/pom.xml +++ b/connect/camunda8/all/pom.xml @@ -8,29 +8,29 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-c8 ${revision} - io.miragon.miranum.connect + io.miragon.miranum message-adapter-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum process-adapter-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum worker-adapter-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-c8 ${project.version} diff --git a/connect/camunda8/message/pom.xml b/connect/camunda8/message/pom.xml index 14b53d8e0..96cef80c8 100644 --- a/connect/camunda8/message/pom.xml +++ b/connect/camunda8/message/pom.xml @@ -8,14 +8,14 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-c8 ${revision} - io.miragon.miranum.connect + io.miragon.miranum connect-message-api ${project.version} diff --git a/connect/camunda8/pom.xml b/connect/camunda8/pom.xml index f3da7e684..a64b0156d 100644 --- a/connect/camunda8/pom.xml +++ b/connect/camunda8/pom.xml @@ -8,7 +8,7 @@ pom - io.miragon.miranum.connect + io.miragon.miranum miranum-connect ${revision} diff --git a/connect/camunda8/process/pom.xml b/connect/camunda8/process/pom.xml index 3c060be3f..422a4244d 100644 --- a/connect/camunda8/process/pom.xml +++ b/connect/camunda8/process/pom.xml @@ -8,14 +8,14 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-c8 ${revision} - io.miragon.miranum.connect + io.miragon.miranum connect-process-api ${project.version} diff --git a/connect/camunda8/worker/pom.xml b/connect/camunda8/worker/pom.xml index 4a29bbae2..a759e4d5b 100644 --- a/connect/camunda8/worker/pom.xml +++ b/connect/camunda8/worker/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-c8 ${revision} @@ -16,7 +16,7 @@ - io.miragon.miranum.connect + io.miragon.miranum connect-worker-api ${project.version} diff --git a/connect/core/element-template-api/pom.xml b/connect/core/element-template-api/pom.xml index 59e38faab..753d7aaeb 100644 --- a/connect/core/element-template-api/pom.xml +++ b/connect/core/element-template-api/pom.xml @@ -8,14 +8,14 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} - io.miragon.miranum.connect + io.miragon.miranum connect-shared ${project.version} diff --git a/connect/core/json/api/pom.xml b/connect/core/json/api/pom.xml index eb048139e..61e4ea62b 100644 --- a/connect/core/json/api/pom.xml +++ b/connect/core/json/api/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-json ${revision} diff --git a/connect/core/json/pom.xml b/connect/core/json/pom.xml index f85d479c2..f7c4c36ea 100644 --- a/connect/core/json/pom.xml +++ b/connect/core/json/pom.xml @@ -8,7 +8,7 @@ pom - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} diff --git a/connect/core/json/schema-registry/pom.xml b/connect/core/json/schema-registry/pom.xml index 7e0129768..448bcf291 100644 --- a/connect/core/json/schema-registry/pom.xml +++ b/connect/core/json/schema-registry/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-json ${revision} @@ -59,7 +59,7 @@ - io.miragon.miranum.connect + io.miragon.miranum connect-shared ${project.version} diff --git a/connect/core/message-api/pom.xml b/connect/core/message-api/pom.xml index 05edf7e79..ab3bfe226 100644 --- a/connect/core/message-api/pom.xml +++ b/connect/core/message-api/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} diff --git a/connect/core/pom.xml b/connect/core/pom.xml index d9e8f6439..fcbb47324 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -7,7 +7,7 @@ pom - io.miragon.miranum.connect + io.miragon.miranum miranum-connect ${revision} diff --git a/connect/core/process-api/pom.xml b/connect/core/process-api/pom.xml index 93ec46798..6be8e1ee3 100644 --- a/connect/core/process-api/pom.xml +++ b/connect/core/process-api/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} diff --git a/connect/core/s3/pom.xml b/connect/core/s3/pom.xml index c52bc7c09..04fd6e250 100644 --- a/connect/core/s3/pom.xml +++ b/connect/core/s3/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} diff --git a/connect/core/shared/pom.xml b/connect/core/shared/pom.xml index dc6bc6bd3..37b1cf801 100644 --- a/connect/core/shared/pom.xml +++ b/connect/core/shared/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} diff --git a/connect/core/task-api/pom.xml b/connect/core/task-api/pom.xml index 21e4f623f..cb1963794 100644 --- a/connect/core/task-api/pom.xml +++ b/connect/core/task-api/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} diff --git a/connect/core/worker-api/pom.xml b/connect/core/worker-api/pom.xml index 9942d3c3a..ac3704d6d 100644 --- a/connect/core/worker-api/pom.xml +++ b/connect/core/worker-api/pom.xml @@ -8,7 +8,7 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-core ${revision} @@ -33,7 +33,7 @@ spring-boot-starter - io.miragon.miranum.connect + io.miragon.miranum connect-shared ${project.version} diff --git a/connect/pom.xml b/connect/pom.xml index 634fb3450..752fb29ec 100644 --- a/connect/pom.xml +++ b/connect/pom.xml @@ -2,510 +2,29 @@ 4.0.0 - io.miragon.miranum.connect + + io.miragon.miranum + miranum + ${revision} + + miranum-connect miranum-connect - ${revision} pom - Engine neutral framework to build integrations. Simplifying the complexity process automation comes with. - https://github.com/Miragon/miranum - - - 0.7.4-SNAPSHOT - 17 - 17 - 17 - UTF-8 - 3.1.9 - 2022.0.4 - 1.18.34 - 0.2.0 - 1.5.5.Final - 7.20.0 - 8.4.0 - 2.6.0 - 1.9.24 - 7.4 - 3.15.0 - core templates camunda7-remote camunda8 - coverage - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - - - org.camunda.bpm - camunda-bom - ${camunda7.version} - import - pom - - - io.holunda.data - camunda-bpm-data - 1.5.0 - - - org.jetbrains.kotlin - kotlin-bom - ${kotlin.version} - pom - import - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi.version} - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - net.logstash.logback - logstash-logback-encoder - ${logstash.encoder.version} - - - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - org.assertj - assertj-core + io.miragon.miranum + miranum-unit-test test - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.4.0 - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - UTF-8 - - - - org.apache.maven.plugins - maven-install-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - enforce-maven - - enforce - - - - - 11 - - - 3.6.0 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 17 - 17 - true - true - - - org.projectlombok - lombok - - ${lombok.version} - - - org.projectlombok - lombok-mapstruct-binding - ${lombok.mapstruct.binding.version} - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - - - -Amapstruct.defaultComponentModel=spring - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.3.1 - - @{argLine} -Xms256m -Xmx2048m -Dfile.encoding=${project.build.sourceEncoding} - random - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.3.1 - - - run-itests - - integration-test - verify - - - - - ${project.build.outputDirectory} - @{argLine} -Xms256m -Xmx2048m -Dfile.encoding=${project.build.sourceEncoding} - - - - org.jacoco - jacoco-maven-plugin - 0.8.12 - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-release-plugin - 3.1.1 - - false - false - release - deploy - @{project.version} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - org.openapitools - openapi-generator-maven-plugin - 7.7.0 - - - org.codehaus.mojo - versions-maven-plugin - 2.17.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.8.0 - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.4 - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.6.0 - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.jacoco - jacoco-maven-plugin - - - prepare-agent - - prepare-agent - - - - - - org.apache.maven.plugins - maven-release-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://s01.oss.sonatype.org/ - true - - - - - - - - - deploy - - - - - org.codehaus.mojo - versions-maven-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - none - - **/*.java - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - - - Dominik Horn - Miragon GmbH - https://github.com/dominikhorn93 - - initiator - - - - Lukas Mösle - Miragon GmbH - https://github.com/lmoesle - - initiator - - - - Andreas Riepl - Miragon GmbH - https://github.com/DaAnda97 - - initiator - - - - - - - MIT License - - - - - https://github.com/Miragon/miranum - scm:git:git@github.com:Miragon/miranum.git - scm:git:git@github.com:Miragon/miranum.git - HEAD - - - diff --git a/connect/templates/camunda7/pom.xml b/connect/templates/camunda7/pom.xml index eb9eb7e45..a3df3890d 100644 --- a/connect/templates/camunda7/pom.xml +++ b/connect/templates/camunda7/pom.xml @@ -8,20 +8,20 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-element-templates-maven-plugin ${revision} - io.miragon.miranum.connect + io.miragon.miranum element-templates-generator-maven-plugin-core ${project.version} provided - io.miragon.miranum.connect + io.miragon.miranum connect-element-template-api ${project.version} @@ -39,7 +39,7 @@ 1.2.1 ${basedir}/src/main/resources/schema - io.miragon.miranum.platform.connect.c7.elementtemplates.gen + io.miragon.miranum.connect.c7.elementtemplates.gen true true diff --git a/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/Camunda7ElementTemplateGenerator.java b/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/Camunda7ElementTemplateGenerator.java index 64195c9bf..97221889f 100644 --- a/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/Camunda7ElementTemplateGenerator.java +++ b/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/Camunda7ElementTemplateGenerator.java @@ -3,10 +3,10 @@ import io.miragon.miranum.connect.elementtemplate.api.BPMNElementType; import io.miragon.miranum.connect.elementtemplate.api.PropertyType; import io.miragon.miranum.connect.elementtemplate.core.*; -import io.miragon.miranum.platform.connect.c7.elementtemplates.gen.Binding; -import io.miragon.miranum.platform.connect.c7.elementtemplates.gen.CamundaC7ElementTemplate; -import io.miragon.miranum.platform.connect.c7.elementtemplates.gen.Constraints; -import io.miragon.miranum.platform.connect.c7.elementtemplates.gen.Property; +import io.miragon.miranum.connect.c7.elementtemplates.gen.Binding; +import io.miragon.miranum.connect.c7.elementtemplates.gen.CamundaC7ElementTemplate; +import io.miragon.miranum.connect.c7.elementtemplates.gen.Constraints; +import io.miragon.miranum.connect.c7.elementtemplates.gen.Property; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/CamundaC7ElementTemplateConverter.java b/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/CamundaC7ElementTemplateConverter.java index 7dca7961f..3828e74ad 100644 --- a/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/CamundaC7ElementTemplateConverter.java +++ b/connect/templates/camunda7/src/main/java/io/miragon/miranum/connect/elementtemplate/c7/CamundaC7ElementTemplateConverter.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.json.JsonMapper; -import io.miragon.miranum.platform.connect.c7.elementtemplates.gen.CamundaC7ElementTemplate; +import io.miragon.miranum.connect.c7.elementtemplates.gen.CamundaC7ElementTemplate; public class CamundaC7ElementTemplateConverter { diff --git a/connect/templates/camunda8/pom.xml b/connect/templates/camunda8/pom.xml index 5397e472f..1123c63bd 100644 --- a/connect/templates/camunda8/pom.xml +++ b/connect/templates/camunda8/pom.xml @@ -8,20 +8,20 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-element-templates-maven-plugin ${revision} - io.miragon.miranum.connect + io.miragon.miranum element-templates-generator-maven-plugin-core ${project.version} provided - io.miragon.miranum.connect + io.miragon.miranum connect-element-template-api ${project.version} diff --git a/connect/templates/generator-maven-plugin-core/pom.xml b/connect/templates/generator-maven-plugin-core/pom.xml index 428190ba5..bdbc81738 100644 --- a/connect/templates/generator-maven-plugin-core/pom.xml +++ b/connect/templates/generator-maven-plugin-core/pom.xml @@ -8,25 +8,25 @@ jar - io.miragon.miranum.connect + io.miragon.miranum connect-element-templates-maven-plugin ${revision} - io.miragon.miranum.connect + io.miragon.miranum connect-shared ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-element-template-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-worker-api ${project.version} compile diff --git a/connect/templates/generator-maven-plugin/pom.xml b/connect/templates/generator-maven-plugin/pom.xml index 9ad21fa50..dc59fb2d5 100644 --- a/connect/templates/generator-maven-plugin/pom.xml +++ b/connect/templates/generator-maven-plugin/pom.xml @@ -14,7 +14,7 @@ - io.miragon.miranum.connect + io.miragon.miranum connect-element-templates-maven-plugin ${revision} @@ -55,25 +55,25 @@ - io.miragon.miranum.connect + io.miragon.miranum element-templates-generator-maven-plugin-core ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-c7 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-shared ${project.version} diff --git a/connect/templates/pom.xml b/connect/templates/pom.xml index 57b215862..b905c4519 100644 --- a/connect/templates/pom.xml +++ b/connect/templates/pom.xml @@ -8,7 +8,7 @@ pom - io.miragon.miranum.connect + io.miragon.miranum miranum-connect ${revision} diff --git a/connect/coverage/pom.xml b/coverage/pom.xml similarity index 69% rename from connect/coverage/pom.xml rename to coverage/pom.xml index 787776353..b9f7f590a 100644 --- a/connect/coverage/pom.xml +++ b/coverage/pom.xml @@ -4,124 +4,168 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.connect - miranum-connect + io.miragon.miranum + miranum ${revision} - connect-coverage - connect-coverage + miranum-coverage + miranum-coverage Jacoco Code Coverage pom - io.miragon.miranum.connect + io.miragon.miranum + miranum-engine-core + ${project.version} + + + io.miragon.miranum + miranum-engine-task + ${project.version} + + + io.miragon.miranum + miranum-engine-user + ${project.version} + + + + + io.miragon.miranum + miranum-deployment-receiver-core + ${project.version} + + + io.miragon.miranum + miranum-deployment-server-core + ${project.version} + + + io.miragon.miranum + miranum-deployment-receiver-rest-starter + ${project.version} + + + io.miragon.miranum + miranum-deployment-server-rest-starter + ${project.version} + + + io.miragon.miranum + miranum-deployment-server-embedded-starter + ${project.version} + + + + + io.miragon.miranum message-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum oauth-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum process-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum task-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum utils-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum worker-camunda7-remote ${project.version} - io.miragon.miranum.connect + io.miragon.miranum message-adapter-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum process-adapter-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum worker-adapter-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-element-template-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum json-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum schema-registry ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-message-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-process-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum miranum-connect-s3 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-shared ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-task-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-worker-api ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-c7 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-c8 ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-generator-maven-plugin-core ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-generator-maven-plugin ${project.version} @@ -202,4 +246,5 @@ + diff --git a/examples/inquiry-integration-service/pom.xml b/examples/inquiry-integration-service/pom.xml index 4f0d598aa..cba843068 100644 --- a/examples/inquiry-integration-service/pom.xml +++ b/examples/inquiry-integration-service/pom.xml @@ -11,30 +11,6 @@ ${revision} - - 1.0.0 - 3.1.9 - 7.20.0 - 0.7.4-SNAPSHOT - 0.3.7-SNAPSHOT - 2.6.0 - 1.18.34 - 1.5.5.Final - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - @@ -50,18 +26,6 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi.version} - - - org.projectlombok - lombok - ${lombok.version} - provided - - - org.mapstruct - mapstruct - ${mapstruct.version} org.camunda.community @@ -71,28 +35,28 @@ - io.miragon.miranum.platform + io.miragon.miranum spring-security-starter - ${miranum-platform.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum oauth-camunda7-remote - ${miranum-connect.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-camunda7-remote-all - ${miranum-connect.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum element-templates-generator-maven-plugin - ${miranum-connect.version} + ${project.version} C7 ATTRIBUTE_NAME @@ -129,7 +93,7 @@ org.mapstruct mapstruct-processor - ${mapstruct.version} + ${org.mapstruct.version} org.projectlombok diff --git a/examples/pom.xml b/examples/pom.xml index 5effa77b0..04a549aaf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,10 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum + + io.miragon.miranum + miranum + ${revision} + + miranum-examples miranum-examples - ${revision} pom @@ -14,10 +18,4 @@ single-deployment-unit-example - - 1.0.0 - 17 - 17 - - diff --git a/examples/single-deployment-unit-example/pom.xml b/examples/single-deployment-unit-example/pom.xml index 3fee4da46..2c5a02fd5 100644 --- a/examples/single-deployment-unit-example/pom.xml +++ b/examples/single-deployment-unit-example/pom.xml @@ -11,35 +11,6 @@ ${revision} - - 1.0.0 - 3.1.9 - 1.18.34 - 7.20.0 - 0.7.4-SNAPSHOT - 0.3.7-SNAPSHOT - 2.6.0 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.camunda.bpm - camunda-bom - ${camunda7.version} - import - pom - - - @@ -74,7 +45,6 @@ io.holunda.data camunda-bpm-data - 1.5.0 org.camunda.bpm @@ -91,42 +61,42 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-core - ${miranum-platform.version} + ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-task - ${miranum-platform.version} + ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-embedded-starter - ${miranum-platform.version} + ${project.version} - io.miragon.miranum.platform + io.miragon.miranum spring-security-starter - ${miranum-platform.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum schema-registry - ${miranum-connect.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-message-api - ${miranum-connect.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-process-api - ${miranum-connect.version} + ${project.version} @@ -143,9 +113,9 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-unit-test - ${miranum-platform.version} + ${project.version} test diff --git a/platform/coverage/pom.xml b/platform/coverage/pom.xml index 2bee1a34d..5e6e2162e 100644 --- a/platform/coverage/pom.xml +++ b/platform/coverage/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-platform ${revision} @@ -16,44 +16,44 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-core ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-task ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-user ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-receiver-core ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-core ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-receiver-rest-starter ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-rest-starter ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-embedded-starter ${project.version} diff --git a/platform/deployment/core/pom.xml b/platform/deployment/core/pom.xml index f576b26f7..0e7157ada 100644 --- a/platform/deployment/core/pom.xml +++ b/platform/deployment/core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment ${revision} diff --git a/platform/deployment/core/receiver-core/pom.xml b/platform/deployment/core/receiver-core/pom.xml index 095cc2782..7aaa710e1 100644 --- a/platform/deployment/core/receiver-core/pom.xml +++ b/platform/deployment/core/receiver-core/pom.xml @@ -8,7 +8,7 @@ miranum-deployment-receiver-core - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-core ${revision} diff --git a/platform/deployment/core/server-core/pom.xml b/platform/deployment/core/server-core/pom.xml index 2dd5581d5..9cec9ba0d 100644 --- a/platform/deployment/core/server-core/pom.xml +++ b/platform/deployment/core/server-core/pom.xml @@ -8,7 +8,7 @@ miranum-deployment-server-core - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-core ${revision} diff --git a/platform/deployment/examples/embedded-example/pom.xml b/platform/deployment/examples/embedded-example/pom.xml index 1fd5043fc..4156bc172 100644 --- a/platform/deployment/examples/embedded-example/pom.xml +++ b/platform/deployment/examples/embedded-example/pom.xml @@ -7,7 +7,7 @@ miranum-deployment-example - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-examples ${revision} @@ -27,14 +27,14 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-receiver-rest-starter ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-embedded-starter ${project.version} diff --git a/platform/deployment/examples/pom.xml b/platform/deployment/examples/pom.xml index 0b8f5ce78..80b801aa0 100644 --- a/platform/deployment/examples/pom.xml +++ b/platform/deployment/examples/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment ${revision} diff --git a/platform/deployment/examples/rest-example/pom.xml b/platform/deployment/examples/rest-example/pom.xml index 487306711..36d04933a 100644 --- a/platform/deployment/examples/rest-example/pom.xml +++ b/platform/deployment/examples/rest-example/pom.xml @@ -8,7 +8,7 @@ miranum-deployment-example-service - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-examples ${revision} @@ -22,7 +22,7 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-rest-starter ${project.version} diff --git a/platform/deployment/pom.xml b/platform/deployment/pom.xml index 7fef13bb2..22af08aeb 100644 --- a/platform/deployment/pom.xml +++ b/platform/deployment/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-platform ${revision} diff --git a/platform/deployment/rest/pom.xml b/platform/deployment/rest/pom.xml index af735be77..904392285 100644 --- a/platform/deployment/rest/pom.xml +++ b/platform/deployment/rest/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment ${revision} diff --git a/platform/deployment/rest/receiver-rest-starter/pom.xml b/platform/deployment/rest/receiver-rest-starter/pom.xml index c6f79af68..699279e03 100644 --- a/platform/deployment/rest/receiver-rest-starter/pom.xml +++ b/platform/deployment/rest/receiver-rest-starter/pom.xml @@ -8,7 +8,7 @@ miranum-deployment-receiver-rest-starter - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-rest ${revision} @@ -44,7 +44,7 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-receiver-core ${project.version} diff --git a/platform/deployment/rest/server-rest-starter/pom.xml b/platform/deployment/rest/server-rest-starter/pom.xml index 34a028158..4e58716d9 100644 --- a/platform/deployment/rest/server-rest-starter/pom.xml +++ b/platform/deployment/rest/server-rest-starter/pom.xml @@ -8,7 +8,7 @@ miranum-deployment-server-rest-starter - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-rest ${revision} @@ -58,7 +58,7 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-core ${project.version} diff --git a/platform/deployment/server-embedded-starter/pom.xml b/platform/deployment/server-embedded-starter/pom.xml index 094cc2838..4ee5a5658 100644 --- a/platform/deployment/server-embedded-starter/pom.xml +++ b/platform/deployment/server-embedded-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment ${revision} @@ -34,13 +34,13 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-server-core ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-receiver-core ${project.version} diff --git a/platform/engine/core/pom.xml b/platform/engine/core/pom.xml index a990aaaca..1c8af7342 100644 --- a/platform/engine/core/pom.xml +++ b/platform/engine/core/pom.xml @@ -6,7 +6,7 @@ miranum-engine-core - io.miragon.miranum.platform + io.miragon.miranum miranum-engine ${revision} @@ -52,26 +52,26 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-deployment-receiver-core ${project.version} provided - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-user ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-message-api - ${miranum-connect.version} + ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-process-api - ${miranum-connect.version} + ${project.version} diff --git a/platform/engine/pom.xml b/platform/engine/pom.xml index 548c4458c..642cf81c4 100644 --- a/platform/engine/pom.xml +++ b/platform/engine/pom.xml @@ -7,7 +7,7 @@ pom - io.miragon.miranum.platform + io.miragon.miranum miranum-platform ${revision} diff --git a/platform/engine/task/pom.xml b/platform/engine/task/pom.xml index 19ada1116..1dac928c7 100644 --- a/platform/engine/task/pom.xml +++ b/platform/engine/task/pom.xml @@ -6,15 +6,11 @@ miranum-engine-task - io.miragon.miranum.platform + io.miragon.miranum miranum-engine ${revision} - - - - org.springframework.boot @@ -35,31 +31,30 @@ io.holunda.data camunda-bpm-data - 1.5.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-user ${project.version} - io.miragon.miranum.platform + io.miragon.miranum miranum-engine-core ${project.version} - io.miragon.miranum.platform + io.miragon.miranum spring-security-starter ${project.version} - io.miragon.miranum.connect + io.miragon.miranum connect-task-api - 0.7.0 + ${project.version} @@ -74,7 +69,7 @@ - io.miragon.miranum.platform + io.miragon.miranum miranum-unit-test test diff --git a/platform/engine/user/pom.xml b/platform/engine/user/pom.xml index d68823618..c584a34a2 100644 --- a/platform/engine/user/pom.xml +++ b/platform/engine/user/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-engine ${revision} diff --git a/platform/libs/pom.xml b/platform/libs/pom.xml index cdfb71219..f3e01ef58 100644 --- a/platform/libs/pom.xml +++ b/platform/libs/pom.xml @@ -7,7 +7,7 @@ pom - io.miragon.miranum.platform + io.miragon.miranum miranum-platform ${revision} diff --git a/platform/libs/spring-security/pom.xml b/platform/libs/spring-security/pom.xml index b75b4219e..6df3e71a7 100644 --- a/platform/libs/spring-security/pom.xml +++ b/platform/libs/spring-security/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-libs ${revision} diff --git a/platform/libs/spring-security/spring-security-core/pom.xml b/platform/libs/spring-security/spring-security-core/pom.xml index 672a7069c..7ff0a5bc2 100644 --- a/platform/libs/spring-security/spring-security-core/pom.xml +++ b/platform/libs/spring-security/spring-security-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum spring-security ${revision} diff --git a/platform/libs/spring-security/spring-security-starter/pom.xml b/platform/libs/spring-security/spring-security-starter/pom.xml index 0cd9e54aa..c4c5319b2 100644 --- a/platform/libs/spring-security/spring-security-starter/pom.xml +++ b/platform/libs/spring-security/spring-security-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum spring-security ${revision} @@ -13,7 +13,7 @@ - io.miragon.miranum.platform + io.miragon.miranum spring-security-core ${project.version} diff --git a/platform/libs/unit-test/pom.xml b/platform/libs/unit-test/pom.xml index 0770fb0a8..c61af1193 100644 --- a/platform/libs/unit-test/pom.xml +++ b/platform/libs/unit-test/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + io.miragon.miranum miranum-libs ${revision} diff --git a/platform/pom.xml b/platform/pom.xml index f8874c0c9..34d7e8d46 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -3,118 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.miragon.miranum.platform + + io.miragon.miranum + miranum + ${revision} + + miranum-platform miranum-platform - ${revision} pom - Miranum Platform - https://github.com/Miragon/miranum - - - 0.3.7-SNAPSHOT - 17 - 17 - 17 - UTF-8 - 3.1.9 - 2021.0.5 - 1.18.34 - 0.2.0 - 1.5.5.Final - 7.20.0 - 8.4.0 - 2.6.0 - 1.9.24 - 7.4 - 0.7.0 - 3.15.0 - deployment engine libs - coverage - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - - - org.camunda.bpm - camunda-bom - ${camunda7.version} - import - pom - - - io.holunda.data - camunda-bpm-data - 1.5.0 - - - org.jetbrains.kotlin - kotlin-bom - ${kotlin.version} - pom - import - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi.version} - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - net.logstash.logback - logstash-logback-encoder - ${logstash.encoder.version} - - - io.miragon.miranum.platform - miranum-unit-test - ${project.version} - - - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - provided - com.h2database h2 @@ -127,373 +33,4 @@ - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.4.0 - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - UTF-8 - - - - org.apache.maven.plugins - maven-install-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - enforce-maven - - enforce - - - - - 11 - - - 3.6.0 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 17 - 17 - true - true - - - org.projectlombok - lombok - - ${lombok.version} - - - org.projectlombok - lombok-mapstruct-binding - ${lombok.mapstruct.binding.version} - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - - - -Amapstruct.defaultComponentModel=spring - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.3.1 - - @{argLine} -Xms256m -Xmx2048m -Dfile.encoding=${project.build.sourceEncoding} - random - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.3.1 - - - run-itests - - integration-test - verify - - - - - ${project.build.outputDirectory} - @{argLine} -Xms256m -Xmx2048m -Dfile.encoding=${project.build.sourceEncoding} - - - - org.jacoco - jacoco-maven-plugin - 0.8.12 - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-release-plugin - 3.1.1 - - false - false - release - deploy - @{project.version} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - org.openapitools - openapi-generator-maven-plugin - 7.7.0 - - - org.codehaus.mojo - versions-maven-plugin - 2.17.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.8.0 - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.4 - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.6.0 - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.jacoco - jacoco-maven-plugin - - - prepare-agent - - prepare-agent - - - - - - org.apache.maven.plugins - maven-release-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://s01.oss.sonatype.org/ - true - - - - - - - - - deploy - - - - - org.codehaus.mojo - versions-maven-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - none - - **/*.java - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - - - Dominik Horn - Miragon GmbH - https://github.com/dominikhorn93 - - initiator - - - - Lukas Mösle - Miragon GmbH - https://github.com/lmoesle - - initiator - - - - Andreas Riepl - Miragon GmbH - https://github.com/DaAnda97 - - initiator - - - - - - - MIT License - - - - - https://github.com/Miragon/miranum - scm:git:git@github.com:Miragon/miranum.git - scm:git:git@github.com:Miragon/miranum.git - HEAD - - diff --git a/pom.xml b/pom.xml index 642f69d5c..c9b9acd84 100644 --- a/pom.xml +++ b/pom.xml @@ -5,24 +5,484 @@ 4.0.0 io.miragon.miranum miranum - 1.0.0 + ${revision} miranum pom - Miranum + Engine neutral framework to build integrations. Simplifying the complexity process automation comes with. https://github.com/Miragon/miranum + 0.8.0-SNAPSHOT 17 17 17 UTF-8 - 3.14.0 + + 3.1.9 + 2022.0.4 + 1.18.34 + 0.2.0 + 1.5.5.Final + 7.20.0 + 8.4.0 + 2.6.0 + 1.9.24 + 7.4 + 3.15.0 connect platform examples + coverage + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + org.camunda.bpm + camunda-bom + ${camunda7.version} + import + pom + + + io.holunda.data + camunda-bpm-data + 1.5.0 + + + org.jetbrains.kotlin + kotlin-bom + ${kotlin.version} + pom + import + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc-openapi.version} + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + + net.logstash.logback + logstash-logback-encoder + ${logstash.encoder.version} + + + io.miragon.miranum + miranum-unit-test + ${project.version} + + + + + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + UTF-8 + + + + org.apache.maven.plugins + maven-install-plugin + 3.1.2 + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-maven + + enforce + + + + + 11 + + + 3.6.0 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 17 + 17 + true + true + + + org.projectlombok + lombok + + ${lombok.version} + + + org.projectlombok + lombok-mapstruct-binding + ${lombok.mapstruct.binding.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + + + -Amapstruct.defaultComponentModel=spring + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.3.1 + + @{argLine} -Xms256m -Xmx2048m -Dfile.encoding=${project.build.sourceEncoding} + random + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.3.1 + + + run-itests + + integration-test + verify + + + + + ${project.build.outputDirectory} + @{argLine} -Xms256m -Xmx2048m -Dfile.encoding=${project.build.sourceEncoding} + + + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.2 + + + org.apache.maven.plugins + maven-release-plugin + 3.1.1 + + false + false + release + deploy + @{project.version} + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + org.openapitools + openapi-generator-maven-plugin + 7.7.0 + + + org.codehaus.mojo + versions-maven-plugin + 2.17.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.8.0 + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.4 + + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.6.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.jacoco + jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + + + org.apache.maven.plugins + maven-release-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + + + + + deploy + + + + + org.codehaus.mojo + versions-maven-plugin + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + none + + **/*.java + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + + + + Dominik Horn + Miragon GmbH + https://github.com/dominikhorn93 + + initiator + + + + Lukas Mösle + Miragon GmbH + https://github.com/lmoesle + + initiator + + + + Andreas Riepl + Miragon GmbH + https://github.com/DaAnda97 + + initiator + + + + + + + MIT License + + + + + https://github.com/Miragon/miranum + scm:git:git@github.com:Miragon/miranum.git + scm:git:git@github.com:Miragon/miranum.git + HEAD + +