From 59096a1b41ee2f0ee6f038ccfa404a76824f6d89 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 11:33:39 +0200 Subject: [PATCH 01/22] :bug: root pom fix missing release properties --- pom.xml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4fcb41fc..692ed95d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,32 @@ de.muenchen refarch + refarch + Collection of different ready to use RefArch components 1.1.0-SNAPSHOT pom - refarch refarch-gateway refarch-integrations + + + https://github.com/it-at-m/refarch.git + scm:git:https://github.com/it-at-m/refarch.git + scm:git:https://github.com/it-at-m/refarch.git + HEAD + + + + MIT + + + + + it@M + opensource@muenchen.de + https://github.com/it-at-m + + From adabd5a183001e7fdfcef1396129097b3b11fe0d Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 12:14:35 +0200 Subject: [PATCH 02/22] :bug: ci rm deploy skip --- .github/workflows/maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 7ac8884d..65bf0ba0 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -51,7 +51,7 @@ jobs: git config --global user.email "github-actions@github.com" git config --global user.name "GitHub Actions" mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false - mvn release:perform -Darguments="-Dmaven.deploy.skip=true" -DlocalCheckout=true + mvn release:perform -DlocalCheckout=true env: SIGN_KEY_PASS: ${{ secrets.gpg_passphrase }} CENTRAL_USERNAME: ${{ secrets.sonatype_username }} From 412cdcc2c4ccc1edb82bc8fb5ada813aded5062a Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 12:14:47 +0200 Subject: [PATCH 03/22] :bug: ci create release notes --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 477e013d..a7d22f24 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,4 +39,4 @@ jobs: tag_name: ${{ github.event.inputs.release-version }} draft: false prerelease: false - generate_release_notes: false + generate_release_notes: true From 0bc40c1989b0fb3ef160d40c9501734b3a24d112 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 13:42:24 +0200 Subject: [PATCH 04/22] :bug: pom add missing url --- pom.xml | 1 + refarch-gateway/pom.xml | 1 + refarch-integrations/pom.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 692ed95d..1860923e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,7 @@ refarch refarch Collection of different ready to use RefArch components + https://github.com/it-at-m/refarch.git 1.1.0-SNAPSHOT pom diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 6503a0a0..2dccb49f 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -14,6 +14,7 @@ refarch-gateway refarch-gateway Ready to use RefArch gateway based on Spring Cloud Gateway + https://github.com/it-at-m/refarch.git 1.1.0-SNAPSHOT jar diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 55f16029..319e8077 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -14,6 +14,7 @@ refarch-integrations refarch-integrations Collection of different ready to use RefArch integrations + https://github.com/it-at-m/refarch.git 1.1.0-SNAPSHOT pom From ce7c1afed3e35a19af9f53124defa4bfebf77b13 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 13:43:13 +0200 Subject: [PATCH 05/22] :construction_worker: ci disable snapshot release by default --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a7d22f24..d4abe579 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,7 +6,7 @@ on: snapshot-release: description: 'Snapshot release?' type: boolean - default: true + default: false release-version: description: 'Release version' type: string From 115db0eca264e1104f39c539cbee24cbd64e4820 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 13:54:10 +0200 Subject: [PATCH 06/22] :bug: pom add distribution management --- pom.xml | 5 +++++ refarch-gateway/pom.xml | 5 +++++ refarch-integrations/pom.xml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index 1860923e..5d29a3f2 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,11 @@ refarch-integrations + + + central + + https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 2dccb49f..2acfa457 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -219,6 +219,11 @@ + + + central + + https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 319e8077..e15109d3 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -295,6 +295,11 @@ + + + central + + https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git From 01ad789cf2fbd75fa07c7a1b218dfe97bcb269fd Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 13:54:49 +0200 Subject: [PATCH 07/22] :construction_worker: ci maven build hide transfer progress --- .github/workflows/maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 65bf0ba0..b5d30fb9 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -50,7 +50,7 @@ jobs: run: | git config --global user.email "github-actions@github.com" git config --global user.name "GitHub Actions" - mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false + mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false -ntp mvn release:perform -DlocalCheckout=true env: SIGN_KEY_PASS: ${{ secrets.gpg_passphrase }} From e543ad340995874d58c44b30ea07694afa5c26f5 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 13:58:27 +0200 Subject: [PATCH 08/22] Revert ":construction_worker: ci maven build hide transfer progress" This reverts commit 01ad789cf2fbd75fa07c7a1b218dfe97bcb269fd. --- .github/workflows/maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index b5d30fb9..65bf0ba0 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -50,7 +50,7 @@ jobs: run: | git config --global user.email "github-actions@github.com" git config --global user.name "GitHub Actions" - mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false -ntp + mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false mvn release:perform -DlocalCheckout=true env: SIGN_KEY_PASS: ${{ secrets.gpg_passphrase }} From 4e04528a78f4112999f995ab85856eab1b135f45 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 14:10:18 +0200 Subject: [PATCH 09/22] Revert ":bug: pom add distribution management" This reverts commit 115db0eca264e1104f39c539cbee24cbd64e4820. --- pom.xml | 5 ----- refarch-gateway/pom.xml | 5 ----- refarch-integrations/pom.xml | 5 ----- 3 files changed, 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5d29a3f2..1860923e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,11 +16,6 @@ refarch-integrations - - - central - - https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 2acfa457..2dccb49f 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -219,11 +219,6 @@ - - - central - - https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index e15109d3..319e8077 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -295,11 +295,6 @@ - - - central - - https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git From 3557b062f1962a769549c33c24d11b4686c4cd14 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 14:21:48 +0200 Subject: [PATCH 10/22] :bug: gateway add missing maven-release-plugin --- refarch-gateway/pom.xml | 16 ++++++++++++++++ refarch-integrations/pom.xml | 1 + 2 files changed, 17 insertions(+) diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 2dccb49f..e47b1487 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -35,6 +35,9 @@ 2.34.0 1.0.10 + + 3.1.1 + 0.8.12 @@ -182,6 +185,19 @@ + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + true + false + release + deploy + @{project.version} + + diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 319e8077..efc17263 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -209,6 +209,7 @@ false release deploy + @{project.version} From 39dcc0342d0be3c99376c30057066f1e9b669ade Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Fri, 16 Aug 2024 14:33:02 +0200 Subject: [PATCH 11/22] :recycle: make gateway pom same as integrations --- refarch-gateway/pom.xml | 78 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index e47b1487..4e082ff2 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -36,7 +36,9 @@ 1.0.10 + 0.5.0 3.1.1 + 3.2.5 0.8.12 @@ -149,6 +151,8 @@ org.apache.maven.plugins maven-compiler-plugin + ${java.version} + ${java.version} org.projectlombok @@ -158,6 +162,33 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + accessibility,html,reference,syntax + + + + attach-javadocs + + jar + + + + org.apache.maven.plugins @@ -235,6 +266,53 @@ + + + release + + + + + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} + true + + true + ${project.groupId}:${project.artifactId}:${project.version} + + + refarch-gateway + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + + https://github.com/it-at-m/refarch.git scm:git:https://github.com/it-at-m/refarch.git From 3e9e2dc3c94c920d04f491fad3689a8c316ad794 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:21:06 +0200 Subject: [PATCH 12/22] :bug: wip fix release disable image build and pr --- .github/workflows/maven.yaml | 134 +++++++++++++++++------------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 432956ce..4a1b7d96 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -62,71 +62,71 @@ jobs: name: target path: "**/target" retention-days: 5 - - name: Push changes to new branch - if: ${{ inputs.snapshot-release == false }} - run: | - git checkout -b ${{ github.ref_name }}-version-bump - git push --force origin ${{ github.ref_name }}-version-bump - - name: Create pull request - if: ${{ inputs.snapshot-release == false }} - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 - with: - script: | - const { repo, owner } = context.repo; - const pullResult = await github.rest.pulls.create({ - title: 'chore: bump release version ${{ github.ref_name }}', - owner, - repo, - head: '${{ github.ref_name }}-version-bump', - base: '${{ github.ref_name }}', - body: [ - 'This PR is auto-generated' - ].join('\n') - }); - await github.rest.issues.addAssignees({ - owner, - repo, - issue_number: pullResult.data.number, - assignees: ['${{ github.actor }}'], - }); - console.log(`Pull Request created: ${pullResult.data.html_url}`); +# - name: Push changes to new branch +# if: ${{ inputs.snapshot-release == false }} +# run: | +# git checkout -b ${{ github.ref_name }}-version-bump +# git push --force origin ${{ github.ref_name }}-version-bump +# - name: Create pull request +# if: ${{ inputs.snapshot-release == false }} +# uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 +# with: +# script: | +# const { repo, owner } = context.repo; +# const pullResult = await github.rest.pulls.create({ +# title: 'chore: bump release version ${{ github.ref_name }}', +# owner, +# repo, +# head: '${{ github.ref_name }}-version-bump', +# base: '${{ github.ref_name }}', +# body: [ +# 'This PR is auto-generated' +# ].join('\n') +# }); +# await github.rest.issues.addAssignees({ +# owner, +# repo, +# issue_number: pullResult.data.number, +# assignees: ['${{ github.actor }}'], +# }); +# console.log(`Pull Request created: ${pullResult.data.html_url}`); - build-images: - if: inputs.build-images == true - needs: build-maven - runs-on: ubuntu-latest - strategy: - matrix: - include: - - name: refarch-gateway - path: ./refarch-gateway - - name: s3-integration-rest-service - path: ./refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service - steps: - - name: Checkout code - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Download target artifacts - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - name: target - - name: Login to Registry - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for image - id: meta - uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 - with: - images: "${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.name }}" - tags: | - type=raw,value=${{ inputs.release-version }} - type=raw,value=latest,enable=${{ inputs.snapshot-release == false }} - - name: Build and push image - uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0 - with: - context: ${{ matrix.path }} - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} +# build-images: +# if: inputs.build-images == true +# needs: build-maven +# runs-on: ubuntu-latest +# strategy: +# matrix: +# include: +# - name: refarch-gateway +# path: ./refarch-gateway +# - name: s3-integration-rest-service +# path: ./refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service +# steps: +# - name: Checkout code +# uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 +# - name: Download target artifacts +# uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 +# with: +# name: target +# - name: Login to Registry +# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 +# with: +# registry: ${{ env.REGISTRY }} +# username: ${{ github.actor }} +# password: ${{ secrets.GITHUB_TOKEN }} +# - name: Extract metadata (tags, labels) for image +# id: meta +# uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 +# with: +# images: "${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.name }}" +# tags: | +# type=raw,value=${{ inputs.release-version }} +# type=raw,value=latest,enable=${{ inputs.snapshot-release == false }} +# - name: Build and push image +# uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0 +# with: +# context: ${{ matrix.path }} +# push: true +# tags: ${{ steps.meta.outputs.tags }} +# labels: ${{ steps.meta.outputs.labels }} From 6c4bbbd97fc3c49df939695b4d43eec303a076f2 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:23:07 +0200 Subject: [PATCH 13/22] :bug: wip release integrations only --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 4a1b7d96..95e40063 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -50,8 +50,8 @@ jobs: run: | git config --global user.email "github-actions@github.com" git config --global user.name "GitHub Actions" - mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false - mvn release:perform -DlocalCheckout=true + mvn release:prepare -f ./refarch-integrations/pom.xml -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false + mvn release:perform -f ./refarch-integrations/pom.xml -DlocalCheckout=true env: SIGN_KEY_PASS: ${{ secrets.gpg_passphrase }} CENTRAL_USERNAME: ${{ secrets.sonatype_username }} From 301d6327f5858231fd883d45648830b3980843e2 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:24:22 +0200 Subject: [PATCH 14/22] :bug: wip fix release disable github release --- .github/workflows/release.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7782ccfc..e45ac3c5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,16 +27,16 @@ jobs: release-version: ${{ inputs.release-version }} secrets: inherit - create-github-release: - if: ${{ inputs.snapshot-release == false }} - needs: build - runs-on: ubuntu-latest - steps: - - name: Create GitHub Release - id: create_release - uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8 - with: - tag_name: ${{ github.event.inputs.release-version }} - draft: false - prerelease: false - generate_release_notes: true +# create-github-release: +# if: ${{ inputs.snapshot-release == false }} +# needs: build +# runs-on: ubuntu-latest +# steps: +# - name: Create GitHub Release +# id: create_release +# uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8 +# with: +# tag_name: ${{ github.event.inputs.release-version }} +# draft: false +# prerelease: false +# generate_release_notes: true From 61fd9be59b9cf1b260c61a4d17544dc04b9db195 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:30:42 +0200 Subject: [PATCH 15/22] Revert ":bug: wip release integrations only" This reverts commit 6c4bbbd97fc3c49df939695b4d43eec303a076f2. --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 95e40063..4a1b7d96 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -50,8 +50,8 @@ jobs: run: | git config --global user.email "github-actions@github.com" git config --global user.name "GitHub Actions" - mvn release:prepare -f ./refarch-integrations/pom.xml -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false - mvn release:perform -f ./refarch-integrations/pom.xml -DlocalCheckout=true + mvn release:prepare -B -DreleaseVersion=${{ inputs.release-version }} -DdevelopmentVersion=${{ inputs.next-version }} -DpushChanges=false -DremoteTagging=false + mvn release:perform -DlocalCheckout=true env: SIGN_KEY_PASS: ${{ secrets.gpg_passphrase }} CENTRAL_USERNAME: ${{ secrets.sonatype_username }} From ca7b370fce28c5dff08d2728591d09ebf1fc1310 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:31:08 +0200 Subject: [PATCH 16/22] :bug: wip release integrations only via pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1860923e..2bc82a50 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ pom - refarch-gateway + refarch-integrations From 8e823c8f2b41136973814f9d0b51ea9c112acf5a Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:40:24 +0200 Subject: [PATCH 17/22] :bug: wip release pom add repositories --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 2bc82a50..5b74ec86 100644 --- a/pom.xml +++ b/pom.xml @@ -34,4 +34,17 @@ https://github.com/it-at-m + + + + + true + + + true + + central + http://central + + From e86f9978d16ce83798f5004c5869eff5fbd21501 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 10:45:16 +0200 Subject: [PATCH 18/22] :bug: wip release pom add distributionManagement --- pom.xml | 10 ++-------- refarch-integrations/pom.xml | 7 +++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 5b74ec86..1d6140db 100644 --- a/pom.xml +++ b/pom.xml @@ -35,16 +35,10 @@ - + - - true - - - true - central http://central - + diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 0e7eae1f..bb557e8c 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -314,4 +314,11 @@ https://github.com/it-at-m + + + + central + http://central + + From 82d7cc578237a268f0846a3dbf24907d55323b24 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 12:55:16 +0200 Subject: [PATCH 19/22] :recycle: wip release root pom as parent --- pom.xml | 14 +++++++------- refarch-gateway/pom.xml | 26 +++----------------------- refarch-integrations/pom.xml | 33 +++------------------------------ 3 files changed, 13 insertions(+), 60 deletions(-) diff --git a/pom.xml b/pom.xml index 1d6140db..2921264b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.3 + + + de.muenchen refarch refarch @@ -34,11 +41,4 @@ https://github.com/it-at-m - - - - central - http://central - - diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 8f2ef0f9..5a64522e 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -4,10 +4,9 @@ 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 3.3.3 - + de.muenchen + refarch + 1.1.0-SNAPSHOT de.muenchen.refarch @@ -312,23 +311,4 @@ - - - https://github.com/it-at-m/refarch.git - scm:git:https://github.com/it-at-m/refarch.git - scm:git:https://github.com/it-at-m/refarch.git - HEAD - - - - MIT - - - - - it@M - opensource@muenchen.de - https://github.com/it-at-m - - diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index bb557e8c..839fd6c8 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -4,10 +4,9 @@ 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 3.3.3 - + de.muenchen + refarch + 1.1.0-SNAPSHOT de.muenchen.refarch @@ -295,30 +294,4 @@ - - - https://github.com/it-at-m/refarch.git - scm:git:https://github.com/it-at-m/refarch.git - scm:git:https://github.com/it-at-m/refarch.git - HEAD - - - - MIT - - - - - it@M - opensource@muenchen.de - https://github.com/it-at-m - - - - - - central - http://central - - From b093f57544f444f1b18ed563c4000b21f6f0993d Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 12:55:27 +0200 Subject: [PATCH 20/22] Revert ":bug: wip release integrations only via pom" This reverts commit ca7b370fce28c5dff08d2728591d09ebf1fc1310. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2921264b..a76bd649 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ pom - + refarch-gateway refarch-integrations From 18cde99482c2fa440cc37320ee4ce11796ab1fab Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 13:09:05 +0200 Subject: [PATCH 21/22] :recycle: wip release mv central release plugin to root pom --- pom.xml | 55 ++++++++++++++++++++++++++++++++++++ refarch-gateway/pom.xml | 47 ------------------------------ refarch-integrations/pom.xml | 47 ------------------------------ 3 files changed, 55 insertions(+), 94 deletions(-) diff --git a/pom.xml b/pom.xml index a76bd649..97ec4436 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,13 @@ 1.1.0-SNAPSHOT pom + + + 0.5.0 + 3.1.1 + 3.2.5 + + refarch-gateway refarch-integrations @@ -41,4 +48,52 @@ https://github.com/it-at-m + + + + + release + + + + + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} + true + + true + ${project.groupId}:${project.artifactId}:${project.version} + + + refarch-gateway + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 5a64522e..7cd1f5e9 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -264,51 +264,4 @@ - - - - release - - - - - org.sonatype.central - central-publishing-maven-plugin - ${central-publishing-maven-plugin.version} - true - - true - ${project.groupId}:${project.artifactId}:${project.version} - - - refarch-gateway - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - - - diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 839fd6c8..5900fce5 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -247,51 +247,4 @@ - - - - release - - - - - org.sonatype.central - central-publishing-maven-plugin - ${central-publishing-maven-plugin.version} - true - - true - ${project.groupId}:${project.artifactId}:${project.version} - - - refarch-s3-integration-rest-service - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - - - From 7d533b371b86346ab9d9cc19719bee4a21b493e6 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Mon, 2 Sep 2024 13:16:35 +0200 Subject: [PATCH 22/22] :recycle: wip release mv build to root pom --- pom.xml | 149 +++++++++++++++++++++++++++++++++++ refarch-gateway/pom.xml | 121 ---------------------------- refarch-integrations/pom.xml | 131 ------------------------------ 3 files changed, 149 insertions(+), 252 deletions(-) diff --git a/pom.xml b/pom.xml index 97ec4436..b1c45e01 100644 --- a/pom.xml +++ b/pom.xml @@ -19,10 +19,27 @@ pom + + 21 + ${java.version} + ${java.version} + ${java.version} + + + 2.34.0 + 1.0.10 + 0.5.0 3.1.1 3.2.5 + + + 0.8.12 + + + 1.6.0 + 0.2.0 @@ -50,6 +67,138 @@ + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok-mapstruct-binding + ${lombok-mapstruct-binding.version} + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + accessibility,html,reference,syntax + + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dfile.encoding=${project.build.sourceEncoding} + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + report + prepare-package + + report + + + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + true + false + release + deploy + @{project.version} + + + + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless-maven-plugin.version} + + + de.muenchen.oss + itm-java-codeformat + ${itm-java-codeformat.version} + + + + + + src/main/java/**/*.java + src/test/java/**/*.java + + + itm-java-codeformat/java_codestyle_formatter.xml + + + + + + + + + check + + + + + + + release diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml index 7cd1f5e9..d82bf9c0 100644 --- a/refarch-gateway/pom.xml +++ b/refarch-gateway/pom.xml @@ -143,125 +143,4 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - accessibility,html,reference,syntax - - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=${project.build.sourceEncoding} - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - false - release - deploy - @{project.version} - - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless-maven-plugin.version} - - - de.muenchen.oss - itm-java-codeformat - ${itm-java-codeformat.version} - - - - - - src/main/java/**/*.java - src/test/java/**/*.java - - - itm-java-codeformat/java_codestyle_formatter.xml - - - - - - - - - check - - - - - - diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 5900fce5..884ba070 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -116,135 +116,4 @@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - org.projectlombok - lombok - ${lombok.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok-mapstruct-binding - ${lombok-mapstruct-binding.version} - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - accessibility,html,reference,syntax - - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=${project.build.sourceEncoding} - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - false - release - deploy - @{project.version} - - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless-maven-plugin.version} - - - de.muenchen.oss - itm-java-codeformat - ${itm-java-codeformat.version} - - - - - - src/main/java/**/*.java - src/test/java/**/*.java - - - itm-java-codeformat/java_codestyle_formatter.xml - - - - - - - - - check - - - - - -