From 1641a7cfe875ac9a1818b32f3086e549c3762e12 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 07:46:44 +0000 Subject: [PATCH 01/61] Update dependency de.muenchen.oss:itm-java-codeformat to v1.0.9 --- wls-broadcast-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index aab520883..e0f7035f6 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -366,7 +366,7 @@ de.muenchen.oss itm-java-codeformat - 1.0.7 + 1.0.9 From c7054ee89e0a77064954806e6bc7391db0155e43 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:57:11 +0000 Subject: [PATCH 02/61] Update dependency com.diffplug.spotless:spotless-maven-plugin to v2.43.0 --- wls-broadcast-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index aab520883..6ff53f6a8 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -361,7 +361,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.28.0 + 2.43.0 de.muenchen.oss From ef97fe92b0ea0c93418c1f72f644fa0a224b614a Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 10:41:31 +0200 Subject: [PATCH 03/61] workflow for broadcast-service pull requests --- .../build_broadcast-service_pull-request.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/build_broadcast-service_pull-request.yml diff --git a/.github/workflows/build_broadcast-service_pull-request.yml b/.github/workflows/build_broadcast-service_pull-request.yml new file mode 100644 index 000000000..b9be42b10 --- /dev/null +++ b/.github/workflows/build_broadcast-service_pull-request.yml @@ -0,0 +1,22 @@ +name: verify pull request broadcast-service + +on: + pull_request: + paths: + - 'wls-broadcast-service/**' + - '.github/workflows/build_broadcast-service_pull-request.yml' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Build with Maven + run: mvn -f wls-broadcast-service/pom.xml verify \ No newline at end of file From 03e4a4d7f7a8e7a7f020cc7b184822f6b3d8123b Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:19:08 +0200 Subject: [PATCH 04/61] =?UTF-8?q?=F0=9F=9A=A7=20init=20draft=20for=20workf?= =?UTF-8?q?low=20for=20broadcast=20server=20on=20push?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build_broadcast-service_push-dev.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/build_broadcast-service_push-dev.yml diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml new file mode 100644 index 000000000..03a0d0336 --- /dev/null +++ b/.github/workflows/build_broadcast-service_push-dev.yml @@ -0,0 +1,48 @@ +name: build push dev broadcast-service + +on: +# push: +# branches: +# - dev +# paths: +# - 'wls-broadcast-service/**' +# - '.github/workflows/build_broadcast-service_push-dev.yml' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Build with Maven + run: mvn -f wls-broadcast-service/pom.xml package + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ghcr.io/${{ github.repository }}-broadcast-service + tags: | + # set latest tag for default branch + type=raw,value=latest,enable={{is_default_branch}} + + - name: Build and push untested Docker image to GHCR + uses: docker/build-push-action@v5 + with: + context: ./wls-broadcast-service + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file From 48483db8cac58ea80fae96633c2618d9a85eaec5 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:19:48 +0200 Subject: [PATCH 05/61] unifying workflow name --- .github/workflows/build_wls-common_pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wls-common_pull-request.yaml b/.github/workflows/build_wls-common_pull-request.yaml index aad7edca8..ed0780cad 100644 --- a/.github/workflows/build_wls-common_pull-request.yaml +++ b/.github/workflows/build_wls-common_pull-request.yaml @@ -1,4 +1,4 @@ -name: build wls-common +name: verify pull request wls-common on: pull_request: From ac93bc7c78b735aafdd6bc3dd3aa2c3c786ca6af Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:20:06 +0200 Subject: [PATCH 06/61] add dockerfile for broadcast service --- wls-broadcast-service/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 wls-broadcast-service/Dockerfile diff --git a/wls-broadcast-service/Dockerfile b/wls-broadcast-service/Dockerfile new file mode 100644 index 000000000..cc5bed40e --- /dev/null +++ b/wls-broadcast-service/Dockerfile @@ -0,0 +1,3 @@ +FROM registry.access.redhat.com/ubi8/openjdk-17:latest + +COPY target/*.jar /deployments/spring-boot-application.jar \ No newline at end of file From c0797af8d1e7e1cb18e8cd8fd15edee2cd9bb5b5 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:21:56 +0200 Subject: [PATCH 07/61] fix syntax error on workflow --- .github/workflows/build_broadcast-service_push-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml index 03a0d0336..4892a28d5 100644 --- a/.github/workflows/build_broadcast-service_push-dev.yml +++ b/.github/workflows/build_broadcast-service_push-dev.yml @@ -1,6 +1,6 @@ name: build push dev broadcast-service -on: +#on: # push: # branches: # - dev From 95b651d730a1a84aca9ea5bd0b920b4d499a946d Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:23:19 +0200 Subject: [PATCH 08/61] fix syntax error on workflow --- .github/workflows/build_broadcast-service_push-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml index 4892a28d5..5b165dc17 100644 --- a/.github/workflows/build_broadcast-service_push-dev.yml +++ b/.github/workflows/build_broadcast-service_push-dev.yml @@ -1,7 +1,7 @@ name: build push dev broadcast-service -#on: -# push: +on: + push: # branches: # - dev # paths: From 629d185fbbf9af3f7145202e00b14ce206dd617c Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:30:26 +0200 Subject: [PATCH 09/61] always on for tag in extract metadata --- .github/workflows/build_broadcast-service_push-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml index 5b165dc17..b4dd7f681 100644 --- a/.github/workflows/build_broadcast-service_push-dev.yml +++ b/.github/workflows/build_broadcast-service_push-dev.yml @@ -37,7 +37,7 @@ jobs: images: ghcr.io/${{ github.repository }}-broadcast-service tags: | # set latest tag for default branch - type=raw,value=latest,enable={{is_default_branch}} + type=raw,value=latest,enable=true - name: Build and push untested Docker image to GHCR uses: docker/build-push-action@v5 From 8c0f5e3c43185625d2a7b88b042fbf136bc59240 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:37:57 +0200 Subject: [PATCH 10/61] reenable trigger and tag-rule in workflow for broadcast-service --- .../workflows/build_broadcast-service_push-dev.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml index b4dd7f681..8f5151c8a 100644 --- a/.github/workflows/build_broadcast-service_push-dev.yml +++ b/.github/workflows/build_broadcast-service_push-dev.yml @@ -2,11 +2,11 @@ name: build push dev broadcast-service on: push: -# branches: -# - dev -# paths: -# - 'wls-broadcast-service/**' -# - '.github/workflows/build_broadcast-service_push-dev.yml' + branches: + - dev + paths: + - 'wls-broadcast-service/**' + - '.github/workflows/build_broadcast-service_push-dev.yml' jobs: build: @@ -37,7 +37,7 @@ jobs: images: ghcr.io/${{ github.repository }}-broadcast-service tags: | # set latest tag for default branch - type=raw,value=latest,enable=true + type=raw,value=latest,enable={{is_default_branch}} - name: Build and push untested Docker image to GHCR uses: docker/build-push-action@v5 From 08dd849a06081c62fd55e4d7d1d788a7b115c847 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:56:06 +0200 Subject: [PATCH 11/61] update doc with workflow description --- docs/src/technik/get_started/index.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/src/technik/get_started/index.md b/docs/src/technik/get_started/index.md index 8bbb2bcf8..64d7f9732 100644 --- a/docs/src/technik/get_started/index.md +++ b/docs/src/technik/get_started/index.md @@ -4,4 +4,16 @@ Im Projekte verwenden wir `checkstyle` und `spotless` um für einen möglichst einheitlichen Codestyle zu sorgen. Dazu haben wir Regeln definiert. Diese Regeln und deren Hinterlegung in der jeweiligen IDE ist -[hier](https://github.com/it-at-m/itm-java-codeformat) beschrieben. \ No newline at end of file +[hier](https://github.com/it-at-m/itm-java-codeformat) beschrieben. + +## Workflows + +### Pull-Requests + +Mit der Erstellung eines Pull-Requests wird mittel Workflow geprüft das Code funktional ist: `mvn verify`. Das bedeutet +es werden die Tests ausgeführt und geprüft dass das Codestyle den Anforderungen entspricht. + +### Push auf Defaultbranch + +Unser Defaultbranch ist `dev`. Mit einem Push auf den Branch wird bei den Backendservices ein Containerimages erzeugt +das in der Github-Container-Registriy hinterlegt wird. Als Tag wird `latest` verwendet. \ No newline at end of file From fbf5f6912287eca8bcdcda01e48f98b61c68e999 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:14:44 +0200 Subject: [PATCH 12/61] components and composable for adr-status --- docs/.vitepress/components/adr/status.vue | 47 +++++++++++++ .../components/adr/status/overview.vue | 14 ++++ docs/.vitepress/composables/status.ts | 70 +++++++++++++++++++ docs/.vitepress/theme/index.ts | 15 ++++ 4 files changed, 146 insertions(+) create mode 100644 docs/.vitepress/components/adr/status.vue create mode 100644 docs/.vitepress/components/adr/status/overview.vue create mode 100644 docs/.vitepress/composables/status.ts create mode 100644 docs/.vitepress/theme/index.ts diff --git a/docs/.vitepress/components/adr/status.vue b/docs/.vitepress/components/adr/status.vue new file mode 100644 index 000000000..94c5e37ce --- /dev/null +++ b/docs/.vitepress/components/adr/status.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/docs/.vitepress/components/adr/status/overview.vue b/docs/.vitepress/components/adr/status/overview.vue new file mode 100644 index 000000000..5e5ba559f --- /dev/null +++ b/docs/.vitepress/components/adr/status/overview.vue @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/docs/.vitepress/composables/status.ts b/docs/.vitepress/composables/status.ts new file mode 100644 index 000000000..07d2e0ad1 --- /dev/null +++ b/docs/.vitepress/composables/status.ts @@ -0,0 +1,70 @@ +import { + mdiAlertOutline, + mdiProgressQuestion, + mdiThumbDownOutline, + mdiThumbUpOutline, +} from "@mdi/js"; + +export enum Status { + ACCEPTED = "accepted", + REJECTED = "rejected", + PROPOSED = "proposed", + DEPRECATED = "deprecated", +} + +const empty = ""; + +const mapStatusToColorMap = new Map([ + [Status.ACCEPTED, "green"], + [Status.REJECTED, "red"], + [Status.PROPOSED, "gray"], + [Status.DEPRECATED, "orange"], +]); + +const mapStatusToI18NText = new Map>([ + [ + "en-US", + new Map([ + [Status.ACCEPTED, "accepted"], + [Status.REJECTED, "rejected"], + [Status.PROPOSED, "proposed"], + [Status.DEPRECATED, "deprecated"], + ]), + ], + [ + "de-DE", + new Map([ + [Status.ACCEPTED, "angenommen"], + [Status.REJECTED, "abgelehnt"], + [Status.PROPOSED, "vorgeschlagen"], + [Status.DEPRECATED, "veraltet"], + ]), + ], +]); + +const mapStatusToIconPath = new Map([ + [Status.ACCEPTED, mdiThumbUpOutline], + [Status.REJECTED, mdiThumbDownOutline], + [Status.PROPOSED, mdiProgressQuestion], + [Status.DEPRECATED, mdiAlertOutline], +]); + +export const useStatus = function () { + function statusToIconPathOrEmpty(status: Status): String { + return mapStatusToIconPath.get(status) ?? empty; + } + + function statusToColorOrEmpty(status: Status): String { + return mapStatusToColorMap.get(status) ?? empty; + } + + function statusToI18NTextOrEmpty(lang: String, status: Status): String { + return mapStatusToI18NText.get(lang)?.get(status) ?? empty; + } + + return { + statusToIconPathOrEmpty, + statusToColorOrEmpty, + statusToI18NTextOrEmpty, + }; +}; diff --git a/docs/.vitepress/theme/index.ts b/docs/.vitepress/theme/index.ts new file mode 100644 index 000000000..6f30a118f --- /dev/null +++ b/docs/.vitepress/theme/index.ts @@ -0,0 +1,15 @@ +// .vitepress/theme/index.ts +import type {Theme} from "vitepress"; +import DefaultTheme from "vitepress/theme"; + +import status from "../components/adr/status.vue"; +import statusOverview from "../components/adr/status/overview.vue"; + +export default { + extends: DefaultTheme, + enhanceApp({ app }) { + // register your custom global components + app.component("adrStatus", status); + app.component("statusOverview", statusOverview); + }, +} satisfies Theme; From 7cd17e2cf622c495984bd62704b7c9c9a82e8def Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:15:26 +0200 Subject: [PATCH 13/61] set lang of doc --- docs/.vitepress/config.mts | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index b33bd7934..fa5734536 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -6,6 +6,7 @@ const PATH_TECHNIK = '/technik/'; export default defineConfig({ title: "Wahllokalsystem", description: "Datenerfassung am Wahltag", + lang: "de-DE", base: '/Wahllokalsystem/', srcDir: 'src', //markdown files are located in that directory themeConfig: { From 9f2b7621b4905b98550ed44f1418617fb986a8d3 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:16:32 +0200 Subject: [PATCH 14/61] add material design icons dependency to docs --- docs/package-lock.json | 41 +++++++++++++---------------------------- docs/package.json | 6 +++++- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index c94f76c72..2c4038102 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -4,7 +4,11 @@ "requires": true, "packages": { "": { + "dependencies": { + "@mdi/js": "^7.2.96" + }, "devDependencies": { + "@mdi/font": "^7.3.67", "vitepress": "^1.0.0-rc.45" } }, @@ -222,7 +226,6 @@ }, "node_modules/@esbuild/aix-ppc64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", "cpu": [ "ppc64" @@ -238,7 +241,6 @@ }, "node_modules/@esbuild/android-arm": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" @@ -254,7 +256,6 @@ }, "node_modules/@esbuild/android-arm64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" @@ -270,7 +271,6 @@ }, "node_modules/@esbuild/android-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" @@ -286,7 +286,6 @@ }, "node_modules/@esbuild/darwin-arm64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" @@ -302,7 +301,6 @@ }, "node_modules/@esbuild/darwin-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" @@ -318,7 +316,6 @@ }, "node_modules/@esbuild/freebsd-arm64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" @@ -334,7 +331,6 @@ }, "node_modules/@esbuild/freebsd-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" @@ -350,7 +346,6 @@ }, "node_modules/@esbuild/linux-arm": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" @@ -366,7 +361,6 @@ }, "node_modules/@esbuild/linux-arm64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" @@ -382,7 +376,6 @@ }, "node_modules/@esbuild/linux-ia32": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" @@ -398,7 +391,6 @@ }, "node_modules/@esbuild/linux-loong64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" @@ -414,7 +406,6 @@ }, "node_modules/@esbuild/linux-mips64el": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" @@ -430,7 +421,6 @@ }, "node_modules/@esbuild/linux-ppc64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" @@ -446,7 +436,6 @@ }, "node_modules/@esbuild/linux-riscv64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" @@ -462,7 +451,6 @@ }, "node_modules/@esbuild/linux-s390x": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" @@ -478,7 +466,6 @@ }, "node_modules/@esbuild/linux-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" @@ -494,7 +481,6 @@ }, "node_modules/@esbuild/netbsd-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" @@ -510,7 +496,6 @@ }, "node_modules/@esbuild/openbsd-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" @@ -526,7 +511,6 @@ }, "node_modules/@esbuild/sunos-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" @@ -542,7 +526,6 @@ }, "node_modules/@esbuild/win32-arm64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" @@ -558,7 +541,6 @@ }, "node_modules/@esbuild/win32-ia32": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" @@ -574,7 +556,6 @@ }, "node_modules/@esbuild/win32-x64": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" @@ -593,6 +574,15 @@ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true }, + "node_modules/@mdi/font": { + "version": "7.4.47", + "integrity": "sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==", + "dev": true + }, + "node_modules/@mdi/js": { + "version": "7.4.47", + "integrity": "sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==" + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.13.0", "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", @@ -1112,7 +1102,6 @@ }, "node_modules/esbuild": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, @@ -1228,7 +1217,6 @@ }, "node_modules/postcss": { "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ @@ -1311,7 +1299,6 @@ }, "node_modules/source-map-js": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, "engines": { @@ -1333,7 +1320,6 @@ }, "node_modules/vite": { "version": "5.2.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.7.tgz", "integrity": "sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==", "dev": true, "dependencies": { @@ -1388,7 +1374,6 @@ }, "node_modules/vitepress": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.2.tgz", "integrity": "sha512-bEj9yTEdWyewJFOhEREZF+mXuAgOq27etuJZT6DZSp+J3XpQstXMJc5piSVwhZBtuj8OfA0iXy+jdP1c71KMYQ==", "dev": true, "dependencies": { diff --git a/docs/package.json b/docs/package.json index e278c5493..e67f47ed6 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,7 +4,11 @@ "docs:build": "vitepress build", "docs:preview": "vitepress preview" }, + "dependencies": { + "@mdi/js": "^7.2.96" + }, "devDependencies": { - "vitepress": "^1.0.0-rc.45" + "vitepress": "^1.0.0-rc.45", + "@mdi/font": "^7.3.67" } } \ No newline at end of file From dc0f72ec62ddf07448c41e77934da46c1ad46bac Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:16:55 +0200 Subject: [PATCH 15/61] create page for adrs in docs --- docs/.vitepress/config.mts | 3 ++- docs/src/technik/adr/index.md | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 docs/src/technik/adr/index.md diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index fa5734536..a97cc269d 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -23,7 +23,8 @@ export default defineConfig({ { text: 'Tools & Frameworks', link: `${PATH_TECHNIK}` }, { text: 'Getting Started', link: `${PATH_TECHNIK}get_started/` - } + }, + { text: 'Adr', link: `${PATH_TECHNIK}adr/` } ] }, diff --git a/docs/src/technik/adr/index.md b/docs/src/technik/adr/index.md new file mode 100644 index 000000000..37bda58f0 --- /dev/null +++ b/docs/src/technik/adr/index.md @@ -0,0 +1,9 @@ +# Architecture Decision Records (ADRs) + +Architecture decision records dokumentieren funktionale und nicht-funktionale Entscheidungen. +Wir benutzen dafür folgendes Template: +[ADR template of Michael Nygard](https://github.com/joelparkerhenderson/architecture-decision-record/blob/main/templates/decision-record-template-by-michael-nygard/index.md). + +Entscheidungen können sich im Laufe der Zeit ändern. Daher befindet sich jeder der Entscheidungen in einem der folgenden Zustände: + + \ No newline at end of file From d9119e45305a1724209393f9062c719c27b6e580 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:50:07 +0200 Subject: [PATCH 16/61] update link to adr template --- docs/src/technik/adr/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/technik/adr/index.md b/docs/src/technik/adr/index.md index 37bda58f0..b11ae2205 100644 --- a/docs/src/technik/adr/index.md +++ b/docs/src/technik/adr/index.md @@ -2,7 +2,7 @@ Architecture decision records dokumentieren funktionale und nicht-funktionale Entscheidungen. Wir benutzen dafür folgendes Template: -[ADR template of Michael Nygard](https://github.com/joelparkerhenderson/architecture-decision-record/blob/main/templates/decision-record-template-by-michael-nygard/index.md). +[ADR template of Michael Nygard](https://github.com/joelparkerhenderson/architecture-decision-record/tree/main/locales/en/templates/decision-record-template-by-michael-nygard). Entscheidungen können sich im Laufe der Zeit ändern. Daher befindet sich jeder der Entscheidungen in einem der folgenden Zustände: From b8040783d82dd15fcc60efd67b2a5ba79a755c8a Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:59:50 +0200 Subject: [PATCH 17/61] update tag for latest dev image --- .github/workflows/build_broadcast-service_push-dev.yml | 2 +- docs/src/technik/get_started/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml index 8f5151c8a..b7de3171b 100644 --- a/.github/workflows/build_broadcast-service_push-dev.yml +++ b/.github/workflows/build_broadcast-service_push-dev.yml @@ -37,7 +37,7 @@ jobs: images: ghcr.io/${{ github.repository }}-broadcast-service tags: | # set latest tag for default branch - type=raw,value=latest,enable={{is_default_branch}} + type=raw,value=latest-dev,enable={{is_default_branch}} - name: Build and push untested Docker image to GHCR uses: docker/build-push-action@v5 diff --git a/docs/src/technik/get_started/index.md b/docs/src/technik/get_started/index.md index 64d7f9732..6c58894a1 100644 --- a/docs/src/technik/get_started/index.md +++ b/docs/src/technik/get_started/index.md @@ -16,4 +16,4 @@ es werden die Tests ausgeführt und geprüft dass das Codestyle den Anforderunge ### Push auf Defaultbranch Unser Defaultbranch ist `dev`. Mit einem Push auf den Branch wird bei den Backendservices ein Containerimages erzeugt -das in der Github-Container-Registriy hinterlegt wird. Als Tag wird `latest` verwendet. \ No newline at end of file +das in der Github-Container-Registriy hinterlegt wird. Als Tag wird `latest-dev` verwendet. \ No newline at end of file From 40db8faac1dbddacf41256911e8f0ad6a5ee0e48 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:31:38 +0200 Subject: [PATCH 18/61] create reusable workflow for container image --- ...callable-create-github-container-image.yml | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/callable-create-github-container-image.yml diff --git a/.github/workflows/callable-create-github-container-image.yml b/.github/workflows/callable-create-github-container-image.yml new file mode 100644 index 000000000..fefa9181d --- /dev/null +++ b/.github/workflows/callable-create-github-container-image.yml @@ -0,0 +1,74 @@ +name: callable build github container image +on: + workflow_call: + inputs: + tag: + required: false + default: '' + type: string + description: 'optional tag that is used for build; default: github.ref' + service: + required: true + type: string + description: 'name of service to use' + +env: + REGISTRY: ghcr.io + +jobs: + build-and-publish-image: + permissions: + packages: write + runs-on: ubuntu-latest + steps: + + - name: Check out Git repository + uses: actions/checkout@v4 + with: + ref: ${{ inputs.tag || github.ref}} + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + cache: 'maven' + cache-dependency-path: ${{ inputs.service }}/pom.xml + java-version: '17' + distribution: 'temurin' + + - name: build jar without tests + run: mvn -B -ntp -DskipTests package -f ${{ inputs.service }}/pom.xml + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ github.repository }}-${{ inputs.service }} + context: git + # tags: + # - Major + # - Major.Minor + # - Major.Minor.Patch + # - full semver: 1.2.3-RC2 + # - latest + tags: | + type=match,pattern=(${{ inputs.service }})/v(\d).\d.\d,group=2,enable=${{ inputs.tag != '' }} + type=match,pattern=(${{ inputs.service }})/v(\d.\d).\d,group=2,enable=${{ inputs.tag != '' }} + type=match,pattern=(${{ inputs.service }})/v(\d.\d.\d),group=2,enable=${{ inputs.tag != '' }} + type=match,pattern=(${{ inputs.service }})/v(.*),group=2,enable=${{ inputs.tag != '' }} + type=raw,value=latest,enable=${{ inputs.tag != '' }} + type=raw,value=latest-dev + + - name: Build and push image + uses: docker/build-push-action@v5 + with: + context: ./${{ inputs.service }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file From b2b8b49087c3edb72647e98710150935e1e97988 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:32:12 +0200 Subject: [PATCH 19/61] create reusable workflow for github release --- ...allable-create-github-release-from-tag.yml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/callable-create-github-release-from-tag.yml diff --git a/.github/workflows/callable-create-github-release-from-tag.yml b/.github/workflows/callable-create-github-release-from-tag.yml new file mode 100644 index 000000000..ea4e2cf88 --- /dev/null +++ b/.github/workflows/callable-create-github-release-from-tag.yml @@ -0,0 +1,49 @@ +name: callable build github release from tag +on: + workflow_call: + inputs: + tag: + required: true + type: string + description: 'tag that is used for build' + service: + required: true + type: string + description: 'name of service to use' + +env: + REGISTRY: ghcr.io + +jobs: + create-github-release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + + - name: Check out Git repository + uses: actions/checkout@v4 + with: + ref: ${{ inputs.tag }} + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + cache: 'maven' + cache-dependency-path: '${{ inputs.service }}/pom.xml' + java-version: '17' + distribution: 'temurin' + + - name: build jar without tests + run: mvn -B -ntp -DskipTests package -f ${{ inputs.service }}/pom.xml + + - name: Create GitHub Release + id: create_release + uses: softprops/action-gh-release@v2 + with: + files: | + ${{ inputs.service }}/target/*.jar + tag_name: ${{ inputs.tag }} + draft: false + prerelease: false + generate_release_notes: false \ No newline at end of file From 62a364848af9bdabbb629ce19f1cc052f6aa9869 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:32:30 +0200 Subject: [PATCH 20/61] create reusable workflow for mvn verify --- .github/workflows/callable-run-mvn-verify.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/callable-run-mvn-verify.yml diff --git a/.github/workflows/callable-run-mvn-verify.yml b/.github/workflows/callable-run-mvn-verify.yml new file mode 100644 index 000000000..6ab6d2f9a --- /dev/null +++ b/.github/workflows/callable-run-mvn-verify.yml @@ -0,0 +1,25 @@ +name: callable run mvn verify + +on: + workflow_call: + inputs: + pom-dir: + required: true + type: string + +jobs: + checkout-and-verify: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: 'maven' + cache-dependency-path: '${{ inputs.pom-dir }}/pom.xml' + + - name: Build with Maven + run: mvn -f ${{ inputs.pom-dir }}/pom.xml verify \ No newline at end of file From b214992c4067fa082dad7c612d52d21137cb593b Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:35:29 +0200 Subject: [PATCH 21/61] create workflow to trigger mvn release --- .github/workflows/dispatch-mvn-release.yml | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 .github/workflows/dispatch-mvn-release.yml diff --git a/.github/workflows/dispatch-mvn-release.yml b/.github/workflows/dispatch-mvn-release.yml new file mode 100644 index 000000000..97c23a9b3 --- /dev/null +++ b/.github/workflows/dispatch-mvn-release.yml @@ -0,0 +1,64 @@ +name: dispatch maven release + +on: + workflow_dispatch: + inputs: + release-version: + required: true + description: release version to build + development-version: + required: true + description: next development version to set + service: + required: true + description: service/directory to build (wls-broadcast-service, ...) + +env: + gitTag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} + +jobs: + run-mvn-release-prepare: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Setup git user + uses: fregante/setup-git-user@v2 + - name: Install Java and Maven + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: "temurin" + cache: 'maven' + cache-dependency-path: '${{ github.event.inputs.service }}/pom.xml' + - name: Perform maven release + run: > + mvn -B -ntp release:prepare -f backend/pom.xml + -DreleaseVersion=${{ github.event.inputs.release-version }} + -DdevelopmentVersion=${{ github.event.inputs.development-version }} + -Dtag=${{ env.gitTag }} + -Darguments="-DskipTests -B -ntp" + + build-github-release: + permissions: + contents: write + needs: + - run-mvn-release-prepare + uses: + ./.github/workflows/callable-create-github-release-from-tag.yml + with: + tag: ${{ env.gitTag }} + service: ${{ github.event.inputs.service }} + + build-github-container-image: + permissions: + packages: write + needs: + - run-mvn-release-prepare + uses: + ./.github/workflows/callable-create-github-container-image.yml + with: + tag: ${{ env.gitTag }} + service: ${{ github.event.inputs.service }} \ No newline at end of file From 3ee5e8c993a3a82f09f4f4d155fc29e9a5362b19 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:36:07 +0200 Subject: [PATCH 22/61] use reuseable workflows instead of own definition --- .../build_broadcast-service_pull-request.yml | 22 --------- .../build_broadcast-service_push-dev.yml | 48 ------------------- .../build_wls-common_pull-request.yaml | 21 -------- .../wls-broadcast-service_pull-request.yml | 14 ++++++ .../wls-broadcast-service_push-dev.yml | 20 ++++++++ .../workflows/wls-common_pull-request.yaml | 13 +++++ 6 files changed, 47 insertions(+), 91 deletions(-) delete mode 100644 .github/workflows/build_broadcast-service_pull-request.yml delete mode 100644 .github/workflows/build_broadcast-service_push-dev.yml delete mode 100644 .github/workflows/build_wls-common_pull-request.yaml create mode 100644 .github/workflows/wls-broadcast-service_pull-request.yml create mode 100644 .github/workflows/wls-broadcast-service_push-dev.yml create mode 100644 .github/workflows/wls-common_pull-request.yaml diff --git a/.github/workflows/build_broadcast-service_pull-request.yml b/.github/workflows/build_broadcast-service_pull-request.yml deleted file mode 100644 index b9be42b10..000000000 --- a/.github/workflows/build_broadcast-service_pull-request.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: verify pull request broadcast-service - -on: - pull_request: - paths: - - 'wls-broadcast-service/**' - - '.github/workflows/build_broadcast-service_pull-request.yml' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Build with Maven - run: mvn -f wls-broadcast-service/pom.xml verify \ No newline at end of file diff --git a/.github/workflows/build_broadcast-service_push-dev.yml b/.github/workflows/build_broadcast-service_push-dev.yml deleted file mode 100644 index b7de3171b..000000000 --- a/.github/workflows/build_broadcast-service_push-dev.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: build push dev broadcast-service - -on: - push: - branches: - - dev - paths: - - 'wls-broadcast-service/**' - - '.github/workflows/build_broadcast-service_push-dev.yml' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Build with Maven - run: mvn -f wls-broadcast-service/pom.xml package - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/${{ github.repository }}-broadcast-service - tags: | - # set latest tag for default branch - type=raw,value=latest-dev,enable={{is_default_branch}} - - - name: Build and push untested Docker image to GHCR - uses: docker/build-push-action@v5 - with: - context: ./wls-broadcast-service - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/build_wls-common_pull-request.yaml b/.github/workflows/build_wls-common_pull-request.yaml deleted file mode 100644 index ed0780cad..000000000 --- a/.github/workflows/build_wls-common_pull-request.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: verify pull request wls-common - -on: - pull_request: - paths: - - 'wls-common/**' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Build with Maven - run: mvn -f wls-common/pom.xml verify \ No newline at end of file diff --git a/.github/workflows/wls-broadcast-service_pull-request.yml b/.github/workflows/wls-broadcast-service_pull-request.yml new file mode 100644 index 000000000..5df1a619b --- /dev/null +++ b/.github/workflows/wls-broadcast-service_pull-request.yml @@ -0,0 +1,14 @@ +name: verify pull request broadcast-service + +on: + pull_request: + paths: + - 'wls-broadcast-service/**' + - '.github/workflows/wls-broadcast-service_pull-request.yml' + +jobs: + verify-pull-request: + uses: + ./.github/workflows/callable-run-mvn-verify.yml + with: + pom-dir: 'wls-broadcast-service' \ No newline at end of file diff --git a/.github/workflows/wls-broadcast-service_push-dev.yml b/.github/workflows/wls-broadcast-service_push-dev.yml new file mode 100644 index 000000000..3f7e6f368 --- /dev/null +++ b/.github/workflows/wls-broadcast-service_push-dev.yml @@ -0,0 +1,20 @@ +name: build push dev broadcast-service + +on: + push: + branches: + - dev + paths: + - 'wls-broadcast-service/**' + - '.github/workflows/wls-broadcast-service_push-dev.yml' + +jobs: + build-github-container-image: + permissions: + packages: write + needs: + - prepare-release + uses: + ./.github/workflows/callable-create-github-container-image.yml + with: + service: 'wls-broadcast-service' \ No newline at end of file diff --git a/.github/workflows/wls-common_pull-request.yaml b/.github/workflows/wls-common_pull-request.yaml new file mode 100644 index 000000000..6a8936e55 --- /dev/null +++ b/.github/workflows/wls-common_pull-request.yaml @@ -0,0 +1,13 @@ +name: verify pull request wls-common + +on: + pull_request: + paths: + - 'wls-common/**' + +jobs: + verify-pull-request: + uses: + ./.github/workflows/callable-run-mvn-verify.yml + with: + pom-dir: 'wls-common' \ No newline at end of file From e220eec024f0e37ac4dedad3546feeb20c893da0 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:36:58 +0200 Subject: [PATCH 23/61] streamline workflow filenames and names --- .github/workflows/{build.yaml => check-policy.yaml} | 0 .github/workflows/{build-doc.yaml => doc_pull-request.yaml} | 4 ++-- .github/workflows/{release-doc.yaml => doc_push-dev.yaml} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{build.yaml => check-policy.yaml} (100%) rename .github/workflows/{build-doc.yaml => doc_pull-request.yaml} (89%) rename .github/workflows/{release-doc.yaml => doc_push-dev.yaml} (86%) diff --git a/.github/workflows/build.yaml b/.github/workflows/check-policy.yaml similarity index 100% rename from .github/workflows/build.yaml rename to .github/workflows/check-policy.yaml diff --git a/.github/workflows/build-doc.yaml b/.github/workflows/doc_pull-request.yaml similarity index 89% rename from .github/workflows/build-doc.yaml rename to .github/workflows/doc_pull-request.yaml index eebb0223a..89c9c17fc 100644 --- a/.github/workflows/build-doc.yaml +++ b/.github/workflows/doc_pull-request.yaml @@ -1,4 +1,4 @@ -name: build docs +name: verify pull request docs on: pull_request: @@ -6,7 +6,7 @@ on: - 'docs/**' jobs: - build: + run-docs-build: runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/release-doc.yaml b/.github/workflows/doc_push-dev.yaml similarity index 86% rename from .github/workflows/release-doc.yaml rename to .github/workflows/doc_push-dev.yaml index e4cd62306..8bfbc3f4f 100644 --- a/.github/workflows/release-doc.yaml +++ b/.github/workflows/doc_push-dev.yaml @@ -1,4 +1,4 @@ -name: release docs +name: build push dev docs on: push: @@ -6,10 +6,10 @@ on: - dev paths: - 'docs/**' - - '.github/workflows/release-doc.yaml' + - '.github/workflows/doc_push-dev.yaml' jobs: - build: + build-and-publish: runs-on: ubuntu-latest defaults: run: From 5ac7d02876457d589e880f1af53500690cfb9485 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:52:17 +0200 Subject: [PATCH 24/61] update name of workflow --- ...ch-mvn-release.yml => dispatch-microservice-mvn-release.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{dispatch-mvn-release.yml => dispatch-microservice-mvn-release.yml} (97%) diff --git a/.github/workflows/dispatch-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml similarity index 97% rename from .github/workflows/dispatch-mvn-release.yml rename to .github/workflows/dispatch-microservice-mvn-release.yml index 97c23a9b3..526880451 100644 --- a/.github/workflows/dispatch-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -1,4 +1,4 @@ -name: dispatch maven release +name: dispatch microserivce maven release on: workflow_dispatch: From c4a9ea55560add727bc0cd4afe698b47a3541a38 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:57:35 +0200 Subject: [PATCH 25/61] make maven less talking --- .github/workflows/callable-run-mvn-verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/callable-run-mvn-verify.yml b/.github/workflows/callable-run-mvn-verify.yml index 6ab6d2f9a..40789a70a 100644 --- a/.github/workflows/callable-run-mvn-verify.yml +++ b/.github/workflows/callable-run-mvn-verify.yml @@ -22,4 +22,4 @@ jobs: cache-dependency-path: '${{ inputs.pom-dir }}/pom.xml' - name: Build with Maven - run: mvn -f ${{ inputs.pom-dir }}/pom.xml verify \ No newline at end of file + run: mvn -B -ntp -f ${{ inputs.pom-dir }}/pom.xml verify \ No newline at end of file From 1e0febd73fbeb0dbc69a6bb46ec9c146404f093a Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:31:50 +0200 Subject: [PATCH 26/61] workflow naming conventions documented --- docs/src/technik/get_started/index.md | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/src/technik/get_started/index.md b/docs/src/technik/get_started/index.md index 6c58894a1..2a4fe26ff 100644 --- a/docs/src/technik/get_started/index.md +++ b/docs/src/technik/get_started/index.md @@ -16,4 +16,29 @@ es werden die Tests ausgeführt und geprüft dass das Codestyle den Anforderunge ### Push auf Defaultbranch Unser Defaultbranch ist `dev`. Mit einem Push auf den Branch wird bei den Backendservices ein Containerimages erzeugt -das in der Github-Container-Registriy hinterlegt wird. Als Tag wird `latest-dev` verwendet. \ No newline at end of file +das in der Github-Container-Registriy hinterlegt wird. Als Tag wird `latest-dev` verwendet. + +### Namenskonventionen + +❗ Ist zu beachten dass alle Workflows im Ordner `workflows` liegen müssen. Sie dürfen nicht auf unterordner aufgeteilt werden. +Zur besseren Strukturierung in dem Ordner soll daher auf eine einheitliche Namenskonvention geachtet werden. + +- `callable-.yml` ... [wiederverenbare Workflows](https://docs.github.com/de/actions/using-workflows/reusing-workflows) +- `dispatch-.yml` ... [manuell ausführbare workflows](https://docs.github.com/de/actions/using-workflows/manually-running-a-workflow) +- `_.yml` ... Workflows zu Jobs die durch ein bestimmtes Ereignis getriggert werden. + +#### Beispiele + +##### `callable-.yml` + +`callable-create-github-container-image.yml` beinhaltet einen wiedervenbaren Workflow der ein Containerimage für Github erstellt. + +##### `dispatch-.yml` + +`dispatch-microservice-mvn-release.yml` ist ein Workflow der manuell getriggert wird ein Maven-Release eines Mikroservices durchzuführen. + +##### `_.yml` + +`wls-broadcast-service_push-dev-yml` ist der Workflow zum `wls-broadcast-service` der bei einem `push` auf `dev` ausgeführt wird. + +`doc_pull-request.yml` ist der Workflow zur Dokumentation, der bei einem `pull request` ausgeführt wird. \ No newline at end of file From da5d99b9c67cf716a7646d0919a3a53a51345728 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:13:36 +0200 Subject: [PATCH 27/61] add org.projectlombok:lombok as ignored dependency --- renovate.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/renovate.json b/renovate.json index c4e2f3b47..af687de00 100644 --- a/renovate.json +++ b/renovate.json @@ -5,5 +5,8 @@ ], "addLabels": [ "renovate" + ], + "ignoreDeps": [ + "org.projectlombok:lombok" ] } From 4aa1a28f9f75479e1bb72c817afc214b032b4cc8 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:45:44 +0200 Subject: [PATCH 28/61] create adr for ignoring lombok from renovate --- .../adr/adr001-renovate-ignore-lombok.md | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 docs/src/technik/adr/adr001-renovate-ignore-lombok.md diff --git a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md new file mode 100644 index 000000000..768c444b4 --- /dev/null +++ b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md @@ -0,0 +1,102 @@ +# Kein Update von org.projectlombok:lombok durch renovate + +## Status + + + +## Kontext + +Wir verwenden [Renovate](https://docs.renovatebot.com) um unsere Dependencies auf den aktuellen Stand zu halten. Renovate +erzeugt automatisch Pull-Requests mit Vorschlägen zu Anpassungen. Wir reviewen diese Vorschläge und nehmen diese entsprechend an. +Das Dashboard mit einer Übersicht was alles verwaltet wird ist in einem [Issue](https://github.com/it-at-m/Wahllokalsystem/issues/1). + +In unseren Services verwenden wir `lombok`. Die Dependency dafür kommt von Spring als managed dependency: + +```xml + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + +``` + +```xml + + + org.projectlombok + lombok + provided + + +``` + +Zur korrekten Funktionsweise muss auch ein Annotation-Processor [eingerichtet](https://projectlombok.org/setup/maven) werden. + +Die Version des Annotation-Processors muss in unserem maven projekt definiert werden: + +```xml + + 1.18.30 + +``` + +```xml + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${java.version} + ${java.version} + + + org.projectlombok + lombok + ${org.projectlombok.lombok.version} + + + org.projectlombok + lombok-mapstruct-binding + ${org.projectlombok.mapstructbinding.version} + + + + +``` + +Die Versionen der Dependency und vom Processor sollten gleich sein. Die Wahrscheindlichkeit für Probleme wird mit dem Unterschied der Version (Major, Minor, Patch) zusammenhängen. +Da die Versionen aber an unterschiedlicher Stelle gepflegt werden kann dies aktuell nicht +technisch sichergestellt werden. Daher wurde ein Kommentar in der `pom.xml` in den `properties` eingefügt: +```xml + + + 1.18.30 + +``` + +Renovate kann diesen Kommentar natürlich nicht beachten und erstellt bei entsprechenden möglichen Updates Pull-Requests. +Diese werden wir aktuell schließen. Da das Wahllokalsystem aus knapp ca. 15 Services am Ende bestehen wird, würden so regelmäßig +zahlreiche PRs entstehen, die wir schließen müssten. + +Updates von `lombok` machen wir bei Updates von `spring` mit. + +## Entscheidung + +Wir lassen `renovate` `org.projectlombok:lombok` ignorieren. Update von `lombok` erfolgen wie gehabt manuell. + +## Konsequenzen + +### positiv + +Weniger Pull-Requests die gehandhabt werden müssen. + +### negativ + +Steigerung der Komplexität durch eine zusätzliche Konfiguration für eine Dependency. Ein Verweis in der Konfiguratio auf diesen ADR ist nicht möglich. \ No newline at end of file From cf56dce2940dda3f8c4deb7020bc593ada0acbd0 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:46:12 +0200 Subject: [PATCH 29/61] linke adr001 in sidebar --- docs/.vitepress/config.mts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index a97cc269d..332009bc0 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -24,7 +24,9 @@ export default defineConfig({ { text: 'Getting Started', link: `${PATH_TECHNIK}get_started/` }, - { text: 'Adr', link: `${PATH_TECHNIK}adr/` } + { text: 'Adr', link: `${PATH_TECHNIK}adr/`, collapsed: true, items: [ + { text: 'Renovate - ignoriere lombok', link: `${PATH_TECHNIK}adr/adr001-renovate-ignore-lombok` } + ] } ] }, From 6e0fc29e101e430465e15f74e064591cc60e66a5 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:12:31 +0200 Subject: [PATCH 30/61] add checked alternative --- .../technik/adr/adr001-renovate-ignore-lombok.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md index 768c444b4..753f3955b 100644 --- a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md +++ b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md @@ -91,6 +91,19 @@ Updates von `lombok` machen wir bei Updates von `spring` mit. Wir lassen `renovate` `org.projectlombok:lombok` ignorieren. Update von `lombok` erfolgen wie gehabt manuell. +### betrachtete Alternative + +Es wäre möglich die Pflege der Version im `annotationProcessorPaths` weg zu bekommen. Dazu müsste man an Stelle von +`annotationProcessorPaths` [`annotationProcessors` pflegen](https://projectlombok.org/contributing/lombok-execution-path) und dort die expliziten Klassen referenzieren. Kommt Mapstruct, +hinzu muss `org.mapstruct:mapstruct-processor` als Dependency vorhanden sein. + +Aus meiner Sicht spricht gegen dieses Vorgehen, dass die Processors manuell gepflegt werden müssen, was Aufgrund der Kleinheiligkeit +mühsamer sein dürfte als mit `annotationProcessorPaths` zu arbeiten. Bei Hebungen der +Version müssten wir prüfen, ob sich etwas an der Architektur geändert hat, z.B. ob es jetzt eine weitere Klasse gibt, die man +verwenden müssten. Klassen die gelöscht werden sorgen für Fehler und somit für schnelles Feedback. + +Beide Konfigurationsmöglichkeiten können nicht zur selben Zeit verwendet werden. + ## Konsequenzen ### positiv From 9551338ea6f86009efc8211554f080a3873553b4 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:12:55 +0200 Subject: [PATCH 31/61] add ignorable negative consequence --- docs/src/technik/adr/adr001-renovate-ignore-lombok.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md index 753f3955b..b749da0b7 100644 --- a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md +++ b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md @@ -112,4 +112,6 @@ Weniger Pull-Requests die gehandhabt werden müssen. ### negativ -Steigerung der Komplexität durch eine zusätzliche Konfiguration für eine Dependency. Ein Verweis in der Konfiguratio auf diesen ADR ist nicht möglich. \ No newline at end of file +Steigerung der Komplexität durch eine zusätzliche Konfiguration für eine Dependency. Ein Verweis in der Konfiguration auf diesen ADR ist nicht möglich. + +`lombok` wird in keinem Projekt mehr durch `renovate` gepflegt. Das halte ich für vertrebar da wir `lombok` immer im Kontext von `spring` verwenden. \ No newline at end of file From 6946fd510735c7ef194ba59878af8414273392ca Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:35:12 +0200 Subject: [PATCH 32/61] add missing release plugin --- wls-common/pom.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/wls-common/pom.xml b/wls-common/pom.xml index 83949269a..c8b0ddf1d 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -140,8 +141,8 @@ itm-java-codeformat/java_codestyle_formatter.xml - - + + @@ -225,6 +226,19 @@ + + + org.apache.maven.plugins + maven-release-plugin + + true + false + release + deploy + @{project.version} + + + From e1f3d04cc908b1aec86e03b5ec8e066b80547853 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:39:08 +0000 Subject: [PATCH 33/61] [maven-release-plugin] prepare release wls-common/1.0.0-RC01 --- wls-common/exception/pom.xml | 4 ++-- wls-common/monitoring/pom.xml | 4 ++-- wls-common/pom.xml | 11 +++++------ wls-common/security/pom.xml | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wls-common/exception/pom.xml b/wls-common/exception/pom.xml index 38554caef..bfff630c2 100644 --- a/wls-common/exception/pom.xml +++ b/wls-common/exception/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 exception - 1.0.0-SNAPSHOT + 1.0.0-RC01 Übergreifende Exception Aspekte diff --git a/wls-common/monitoring/pom.xml b/wls-common/monitoring/pom.xml index 2e2f8be52..72e9ddf28 100644 --- a/wls-common/monitoring/pom.xml +++ b/wls-common/monitoring/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 monitoring - 1.0.0-SNAPSHOT + 1.0.0-RC01 Übergreifende Monitoring Aspekte diff --git a/wls-common/pom.xml b/wls-common/pom.xml index c8b0ddf1d..c22ee7e84 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 wls-common pom Serviceübergreifende Aspekte @@ -70,7 +69,7 @@ https://github.com/it-at-m/Wahllokalsystem scm:git:https://github.com/it-at-m/Wahllokalsystem.git scm:git:https://github.com/it-at-m/Wahllokalsystem.git - HEAD + wls-common/1.0.0-RC01 @@ -141,8 +140,8 @@ itm-java-codeformat/java_codestyle_formatter.xml - - + + diff --git a/wls-common/security/pom.xml b/wls-common/security/pom.xml index 461719107..d6d1f8be3 100644 --- a/wls-common/security/pom.xml +++ b/wls-common/security/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 security - 1.0.0-SNAPSHOT + 1.0.0-RC01 Uebergreifende Security Aspekte From db085c1f77f487ab030f5f8396001b77df676cf8 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:39:09 +0000 Subject: [PATCH 34/61] [maven-release-plugin] prepare for next development iteration --- wls-common/exception/pom.xml | 4 ++-- wls-common/monitoring/pom.xml | 4 ++-- wls-common/pom.xml | 4 ++-- wls-common/security/pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wls-common/exception/pom.xml b/wls-common/exception/pom.xml index bfff630c2..38554caef 100644 --- a/wls-common/exception/pom.xml +++ b/wls-common/exception/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT exception - 1.0.0-RC01 + 1.0.0-SNAPSHOT Übergreifende Exception Aspekte diff --git a/wls-common/monitoring/pom.xml b/wls-common/monitoring/pom.xml index 72e9ddf28..2e2f8be52 100644 --- a/wls-common/monitoring/pom.xml +++ b/wls-common/monitoring/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT monitoring - 1.0.0-RC01 + 1.0.0-SNAPSHOT Übergreifende Monitoring Aspekte diff --git a/wls-common/pom.xml b/wls-common/pom.xml index c22ee7e84..d63d9e1fa 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -5,7 +5,7 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT wls-common pom Serviceübergreifende Aspekte @@ -69,7 +69,7 @@ https://github.com/it-at-m/Wahllokalsystem scm:git:https://github.com/it-at-m/Wahllokalsystem.git scm:git:https://github.com/it-at-m/Wahllokalsystem.git - wls-common/1.0.0-RC01 + HEAD diff --git a/wls-common/security/pom.xml b/wls-common/security/pom.xml index d6d1f8be3..461719107 100644 --- a/wls-common/security/pom.xml +++ b/wls-common/security/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT security - 1.0.0-RC01 + 1.0.0-SNAPSHOT Uebergreifende Security Aspekte From 603c60ecd71efbcf7574aa59b77fcdd60327094a Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:15:30 +0200 Subject: [PATCH 35/61] add plugins to generate sources and javadoc artifacts --- wls-common/pom.xml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/wls-common/pom.xml b/wls-common/pom.xml index c8b0ddf1d..c5ec4140e 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -239,6 +239,40 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + + attach-javadocs + + jar + + + + + none + + **/*.java + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + From d1e0260591ec55ee4528c2c26a6ef4880558e327 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:16:31 +0200 Subject: [PATCH 36/61] use same sonatype deployment as other de.muenchen projects --- wls-common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wls-common/pom.xml b/wls-common/pom.xml index c5ec4140e..1792a51d4 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -86,7 +86,7 @@ true true - ${project.groupId}:${project.artifactId}:${project.version} + ${project.groupId}:${project.version} From 893e0560eda7e208354654f07f95bf78fdc4d289 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:50:36 +0200 Subject: [PATCH 37/61] exclude unfinished modules from deploying during release --- wls-common/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wls-common/pom.xml b/wls-common/pom.xml index 826207108..2fff62d38 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -86,6 +86,10 @@ true true ${project.groupId}:${project.version} + + monitoring + security + From 15b484fdcf789feac0605e272a4ba79d50626565 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:52:22 +0000 Subject: [PATCH 38/61] [maven-release-plugin] prepare release wls-common/1.0.0-RC01 --- wls-common/exception/pom.xml | 4 ++-- wls-common/monitoring/pom.xml | 4 ++-- wls-common/pom.xml | 4 ++-- wls-common/security/pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wls-common/exception/pom.xml b/wls-common/exception/pom.xml index 38554caef..bfff630c2 100644 --- a/wls-common/exception/pom.xml +++ b/wls-common/exception/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 exception - 1.0.0-SNAPSHOT + 1.0.0-RC01 Übergreifende Exception Aspekte diff --git a/wls-common/monitoring/pom.xml b/wls-common/monitoring/pom.xml index 2e2f8be52..72e9ddf28 100644 --- a/wls-common/monitoring/pom.xml +++ b/wls-common/monitoring/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 monitoring - 1.0.0-SNAPSHOT + 1.0.0-RC01 Übergreifende Monitoring Aspekte diff --git a/wls-common/pom.xml b/wls-common/pom.xml index 2fff62d38..5cf077021 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -5,7 +5,7 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 wls-common pom Serviceübergreifende Aspekte @@ -69,7 +69,7 @@ https://github.com/it-at-m/Wahllokalsystem scm:git:https://github.com/it-at-m/Wahllokalsystem.git scm:git:https://github.com/it-at-m/Wahllokalsystem.git - HEAD + wls-common/1.0.0-RC01 diff --git a/wls-common/security/pom.xml b/wls-common/security/pom.xml index 461719107..d6d1f8be3 100644 --- a/wls-common/security/pom.xml +++ b/wls-common/security/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-SNAPSHOT + 1.0.0-RC01 security - 1.0.0-SNAPSHOT + 1.0.0-RC01 Uebergreifende Security Aspekte From f9518101ef74b018f6f089dd114e61f2431388da Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:52:23 +0000 Subject: [PATCH 39/61] [maven-release-plugin] prepare for next development iteration --- wls-common/exception/pom.xml | 4 ++-- wls-common/monitoring/pom.xml | 4 ++-- wls-common/pom.xml | 4 ++-- wls-common/security/pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wls-common/exception/pom.xml b/wls-common/exception/pom.xml index bfff630c2..38554caef 100644 --- a/wls-common/exception/pom.xml +++ b/wls-common/exception/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT exception - 1.0.0-RC01 + 1.0.0-SNAPSHOT Übergreifende Exception Aspekte diff --git a/wls-common/monitoring/pom.xml b/wls-common/monitoring/pom.xml index 72e9ddf28..2e2f8be52 100644 --- a/wls-common/monitoring/pom.xml +++ b/wls-common/monitoring/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT monitoring - 1.0.0-RC01 + 1.0.0-SNAPSHOT Übergreifende Monitoring Aspekte diff --git a/wls-common/pom.xml b/wls-common/pom.xml index 5cf077021..2fff62d38 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -5,7 +5,7 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT wls-common pom Serviceübergreifende Aspekte @@ -69,7 +69,7 @@ https://github.com/it-at-m/Wahllokalsystem scm:git:https://github.com/it-at-m/Wahllokalsystem.git scm:git:https://github.com/it-at-m/Wahllokalsystem.git - wls-common/1.0.0-RC01 + HEAD diff --git a/wls-common/security/pom.xml b/wls-common/security/pom.xml index d6d1f8be3..461719107 100644 --- a/wls-common/security/pom.xml +++ b/wls-common/security/pom.xml @@ -5,11 +5,11 @@ de.muenchen.oss.wahllokalsystem.wls-common parent - 1.0.0-RC01 + 1.0.0-SNAPSHOT security - 1.0.0-RC01 + 1.0.0-SNAPSHOT Uebergreifende Security Aspekte From ab98721d1627b008d3f36bce5bb42bd4fca6b62d Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:01:07 +0200 Subject: [PATCH 40/61] Apply suggestions from code review - fix typos Co-authored-by: Nic12345678 <162564162+Nic12345678@users.noreply.github.com> --- docs/src/technik/adr/adr001-renovate-ignore-lombok.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md index b749da0b7..2d2932b3c 100644 --- a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md +++ b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md @@ -71,7 +71,7 @@ Die Version des Annotation-Processors muss in unserem maven projekt definiert we ``` -Die Versionen der Dependency und vom Processor sollten gleich sein. Die Wahrscheindlichkeit für Probleme wird mit dem Unterschied der Version (Major, Minor, Patch) zusammenhängen. +Die Versionen der Dependency und vom Processor sollten gleich sein. Die Wahrscheinlichkeit für Probleme wird mit dem Unterschied der Version (Major, Minor, Patch) zusammenhängen. Da die Versionen aber an unterschiedlicher Stelle gepflegt werden kann dies aktuell nicht technisch sichergestellt werden. Daher wurde ein Kommentar in der `pom.xml` in den `properties` eingefügt: ```xml @@ -100,7 +100,7 @@ hinzu muss `org.mapstruct:mapstruct-processor` als Dependency vorhanden sein. Aus meiner Sicht spricht gegen dieses Vorgehen, dass die Processors manuell gepflegt werden müssen, was Aufgrund der Kleinheiligkeit mühsamer sein dürfte als mit `annotationProcessorPaths` zu arbeiten. Bei Hebungen der Version müssten wir prüfen, ob sich etwas an der Architektur geändert hat, z.B. ob es jetzt eine weitere Klasse gibt, die man -verwenden müssten. Klassen die gelöscht werden sorgen für Fehler und somit für schnelles Feedback. +verwenden müsste. Klassen die gelöscht werden sorgen für Fehler und somit für schnelles Feedback. Beide Konfigurationsmöglichkeiten können nicht zur selben Zeit verwendet werden. From 652151c80ca46c6943c3daf7dddba1a169451759 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:08:26 +0200 Subject: [PATCH 41/61] fix typo --- docs/src/technik/get_started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/technik/get_started/index.md b/docs/src/technik/get_started/index.md index 2a4fe26ff..99bcc82ce 100644 --- a/docs/src/technik/get_started/index.md +++ b/docs/src/technik/get_started/index.md @@ -10,7 +10,7 @@ Dazu haben wir Regeln definiert. Diese Regeln und deren Hinterlegung in der jewe ### Pull-Requests -Mit der Erstellung eines Pull-Requests wird mittel Workflow geprüft das Code funktional ist: `mvn verify`. Das bedeutet +Mit der Erstellung eines Pull-Requests wird mittels Workflow geprüft das der Code funktional ist: `mvn verify`. Das bedeutet es werden die Tests ausgeführt und geprüft dass das Codestyle den Anforderungen entspricht. ### Push auf Defaultbranch From 9cb209036be3ac1f038d4566f4f1be48bf90c258 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:18:42 +0200 Subject: [PATCH 42/61] fix typos --- docs/src/about/index.md | 6 +++--- docs/src/technik/get_started/index.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/about/index.md b/docs/src/about/index.md index 5f0903e10..621ceba51 100644 --- a/docs/src/about/index.md +++ b/docs/src/about/index.md @@ -10,8 +10,8 @@ Am Ende soll die Anwendung für Interessierte vollständig zur Verfügung stehen ## Was kann die Software Der Hauptfokus der Software liegt auf den Handlungen am Wahltag. Sie unterstützt bei der Eröffnung des Wahllokals, indem man z.B. anhand einer Checkliste -prüfen kann, dass alle notwendigen Materialien für die Durchführung vorhanden sind. Während der Zeit der Stimmabgabe wird übermittelt -wie viele Wähler\*Innen bereits im Wahllokal waren. Des Weiteren werden über die Software wahlrelevante Vorkommnisse dokumentiert. +prüfen kann, dass alle notwendigen Materialien für die Durchführung vorhanden sind. Während der Zeit der Stimmabgabe wird übermittelt, +wie viele Wähler\*innen bereits im Wahllokal waren. Des Weiteren werden über die Software wahlrelevante Vorkommnisse dokumentiert. Außerdem wird zu definierten Zeitpunkten abgefragt, welche Mitglieder des Wahlvorstandes im Wahllokal anwesend sind. So wird sichergestellt, dass das Gremium zu jederzeit ausreichend besetzt ist. @@ -21,4 +21,4 @@ Dazu gibt es zahlreiche Regeln und Konsistenzprüfungen, die dem Wahlvorstand Fe Das Wahlamt kann über das System den Wahlbezirken wichtige Informationen zukommen lassen. -🚧 Eine detaillierte Beschreibungen aller [Funktionen](/features/) folgt im Laufe der Veröffentlichung. \ No newline at end of file +🚧 Eine detaillierte Beschreibung aller [Funktionen](/features/) folgt im Laufe der Veröffentlichung. \ No newline at end of file diff --git a/docs/src/technik/get_started/index.md b/docs/src/technik/get_started/index.md index 8bbb2bcf8..67dd74a66 100644 --- a/docs/src/technik/get_started/index.md +++ b/docs/src/technik/get_started/index.md @@ -2,6 +2,6 @@ ## Formatter einrichten -Im Projekte verwenden wir `checkstyle` und `spotless` um für einen möglichst einheitlichen Codestyle zu sorgen. +Im Projekt verwenden wir `checkstyle` und `spotless` um für einen möglichst einheitlichen Codestyle zu sorgen. Dazu haben wir Regeln definiert. Diese Regeln und deren Hinterlegung in der jeweiligen IDE ist [hier](https://github.com/it-at-m/itm-java-codeformat) beschrieben. \ No newline at end of file From 386e220bb486d8d7d9e7fc1a405636332de41cfe Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:19:57 +0200 Subject: [PATCH 43/61] Apply suggestions from code review - fix typos Co-authored-by: Robert Jasny --- docs/src/technik/adr/adr001-renovate-ignore-lombok.md | 4 ++-- docs/src/technik/adr/index.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md index 2d2932b3c..ebb5da06c 100644 --- a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md +++ b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md @@ -89,7 +89,7 @@ Updates von `lombok` machen wir bei Updates von `spring` mit. ## Entscheidung -Wir lassen `renovate` `org.projectlombok:lombok` ignorieren. Update von `lombok` erfolgen wie gehabt manuell. +Wir lassen `renovate` `org.projectlombok:lombok` ignorieren. Updates von `lombok` erfolgen wie gehabt manuell. ### betrachtete Alternative @@ -97,7 +97,7 @@ Es wäre möglich die Pflege der Version im `annotationProcessorPaths` weg zu be `annotationProcessorPaths` [`annotationProcessors` pflegen](https://projectlombok.org/contributing/lombok-execution-path) und dort die expliziten Klassen referenzieren. Kommt Mapstruct, hinzu muss `org.mapstruct:mapstruct-processor` als Dependency vorhanden sein. -Aus meiner Sicht spricht gegen dieses Vorgehen, dass die Processors manuell gepflegt werden müssen, was Aufgrund der Kleinheiligkeit +Aus meiner Sicht spricht gegen dieses Vorgehen, dass die Processors manuell gepflegt werden müssen, was Aufgrund der Kleinteiligkeit mühsamer sein dürfte als mit `annotationProcessorPaths` zu arbeiten. Bei Hebungen der Version müssten wir prüfen, ob sich etwas an der Architektur geändert hat, z.B. ob es jetzt eine weitere Klasse gibt, die man verwenden müsste. Klassen die gelöscht werden sorgen für Fehler und somit für schnelles Feedback. diff --git a/docs/src/technik/adr/index.md b/docs/src/technik/adr/index.md index b11ae2205..4f504e40c 100644 --- a/docs/src/technik/adr/index.md +++ b/docs/src/technik/adr/index.md @@ -4,6 +4,6 @@ Architecture decision records dokumentieren funktionale und nicht-funktionale En Wir benutzen dafür folgendes Template: [ADR template of Michael Nygard](https://github.com/joelparkerhenderson/architecture-decision-record/tree/main/locales/en/templates/decision-record-template-by-michael-nygard). -Entscheidungen können sich im Laufe der Zeit ändern. Daher befindet sich jeder der Entscheidungen in einem der folgenden Zustände: +Entscheidungen können sich im Laufe der Zeit ändern. Daher befindet sich jede der Entscheidungen in einem der folgenden Zustände: \ No newline at end of file From bd4b0796899abb28878ec33ff4a7ba644904a87a Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:41:11 +0200 Subject: [PATCH 44/61] update adr001 state to accepted --- docs/src/technik/adr/adr001-renovate-ignore-lombok.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md index ebb5da06c..e0157f5a1 100644 --- a/docs/src/technik/adr/adr001-renovate-ignore-lombok.md +++ b/docs/src/technik/adr/adr001-renovate-ignore-lombok.md @@ -2,7 +2,7 @@ ## Status - + ## Kontext From d2c474c73b733718ce4dde937392ea8fc4e21139 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:32:42 +0000 Subject: [PATCH 45/61] Update quay.io/keycloak/keycloak Docker tag to v20.0.5 --- stack/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/docker-compose.yml b/stack/docker-compose.yml index 7afe152aa..8277e5253 100644 --- a/stack/docker-compose.yml +++ b/stack/docker-compose.yml @@ -4,7 +4,7 @@ services: ## Keycloak wls-keycloak: container_name: wls-keycloak - image: quay.io/keycloak/keycloak:20.0.3 + image: quay.io/keycloak/keycloak:20.0.5 command: - start-dev --http-relative-path /auth depends_on: From 991a5d3599493fb3f951132a6fd322ff59582e5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:38:49 +0000 Subject: [PATCH 46/61] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 --- wls-broadcast-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index aab520883..05a869406 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -31,7 +31,7 @@ 1.10.0 3.1.2 - 3.11.0 + 3.13.0 3.3.1 1.18.30 From 110db392cc57b2a969d29c8f1bbd5ed1218b6994 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:13:44 +0200 Subject: [PATCH 47/61] remove wrong job dependency --- .github/workflows/wls-broadcast-service_push-dev.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/wls-broadcast-service_push-dev.yml b/.github/workflows/wls-broadcast-service_push-dev.yml index 3f7e6f368..65c3498c8 100644 --- a/.github/workflows/wls-broadcast-service_push-dev.yml +++ b/.github/workflows/wls-broadcast-service_push-dev.yml @@ -12,8 +12,6 @@ jobs: build-github-container-image: permissions: packages: write - needs: - - prepare-release uses: ./.github/workflows/callable-create-github-container-image.yml with: From e1749f7a535a4fef99bc8939ff733049feacfbe3 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:24:05 +0200 Subject: [PATCH 48/61] using concated env var on root level failed --- .github/workflows/dispatch-microservice-mvn-release.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml index 526880451..560bb4043 100644 --- a/.github/workflows/dispatch-microservice-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -13,9 +13,6 @@ on: required: true description: service/directory to build (wls-broadcast-service, ...) -env: - gitTag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} - jobs: run-mvn-release-prepare: runs-on: ubuntu-latest @@ -38,7 +35,7 @@ jobs: mvn -B -ntp release:prepare -f backend/pom.xml -DreleaseVersion=${{ github.event.inputs.release-version }} -DdevelopmentVersion=${{ github.event.inputs.development-version }} - -Dtag=${{ env.gitTag }} + -Dtag=${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} -Darguments="-DskipTests -B -ntp" build-github-release: @@ -49,7 +46,7 @@ jobs: uses: ./.github/workflows/callable-create-github-release-from-tag.yml with: - tag: ${{ env.gitTag }} + tag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} service: ${{ github.event.inputs.service }} build-github-container-image: @@ -60,5 +57,5 @@ jobs: uses: ./.github/workflows/callable-create-github-container-image.yml with: - tag: ${{ env.gitTag }} + tag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} service: ${{ github.event.inputs.service }} \ No newline at end of file From 12f0af0948cd2f5e076f2d87510f4df0ae114f36 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:26:06 +0200 Subject: [PATCH 49/61] fixing missing service var in job --- .github/workflows/dispatch-microservice-mvn-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml index 560bb4043..3632c2a47 100644 --- a/.github/workflows/dispatch-microservice-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -32,7 +32,7 @@ jobs: cache-dependency-path: '${{ github.event.inputs.service }}/pom.xml' - name: Perform maven release run: > - mvn -B -ntp release:prepare -f backend/pom.xml + mvn -B -ntp release:prepare -f ${{ github.event.inputs.service }}/pom.xml -DreleaseVersion=${{ github.event.inputs.release-version }} -DdevelopmentVersion=${{ github.event.inputs.development-version }} -Dtag=${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} From afe11c11ad24e9212fd6e61ef1485d63e20fc330 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:30:38 +0200 Subject: [PATCH 50/61] remove Unrecognized option: -ntp --- .github/workflows/dispatch-microservice-mvn-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml index 3632c2a47..5aaf6fdba 100644 --- a/.github/workflows/dispatch-microservice-mvn-release.yml +++ b/.github/workflows/dispatch-microservice-mvn-release.yml @@ -36,7 +36,7 @@ jobs: -DreleaseVersion=${{ github.event.inputs.release-version }} -DdevelopmentVersion=${{ github.event.inputs.development-version }} -Dtag=${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }} - -Darguments="-DskipTests -B -ntp" + -Darguments="-DskipTests" build-github-release: permissions: From 714ee058ce73f5e4f9ee9b2d92de175bc0061451 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:32:50 +0000 Subject: [PATCH 51/61] [maven-release-plugin] prepare release wls-broadcast-service/v0.0.1-ALPHA1 --- wls-broadcast-service/pom.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index aab520883..ff68b044a 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 de.muenchen.oss.wahllokalsystem wls-broadcast-service - 0.0.1-SNAPSHOT + 0.0.1-ALPHA1 wls_broadcast_service @@ -255,7 +253,7 @@ https://github.com/it-at-m/Wahllokalsystem scm:git:https://github.com/it-at-m/Wahllokalsystem.git scm:git:https://github.com/it-at-m/Wahllokalsystem.git - HEAD + wls-broadcast-service/v0.0.1-ALPHA1 @@ -378,8 +376,8 @@ itm-java-codeformat/java_codestyle_formatter.xml - - + + From ea2cae1330d1a9620f17c0bf3a75a261a2d6e04f Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:32:52 +0000 Subject: [PATCH 52/61] [maven-release-plugin] prepare for next development iteration --- wls-broadcast-service/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index ff68b044a..8b18430e6 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -4,7 +4,7 @@ de.muenchen.oss.wahllokalsystem wls-broadcast-service - 0.0.1-ALPHA1 + 0.0.1-SNAPSHOT wls_broadcast_service @@ -253,7 +253,7 @@ https://github.com/it-at-m/Wahllokalsystem scm:git:https://github.com/it-at-m/Wahllokalsystem.git scm:git:https://github.com/it-at-m/Wahllokalsystem.git - wls-broadcast-service/v0.0.1-ALPHA1 + HEAD From f86e100d08a52e05125e139cc16dee84fdc6a201 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 07:11:07 +0000 Subject: [PATCH 53/61] Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 --- wls-common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wls-common/pom.xml b/wls-common/pom.xml index 2fff62d38..44f239f08 100644 --- a/wls-common/pom.xml +++ b/wls-common/pom.xml @@ -265,7 +265,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From c09e7acb84d7c9dfa5273f8118faa9e6ab352a06 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:56:34 +0200 Subject: [PATCH 54/61] remove spring-data-rest-hal-explorer --- wls-broadcast-service/pom.xml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index 96d12e369..20938d9ca 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 de.muenchen.oss.wahllokalsystem @@ -197,10 +198,6 @@ - - org.springframework.data - spring-data-rest-hal-explorer - org.projectlombok lombok @@ -319,7 +316,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - ${surefireArgLine} -Dfile.encoding=${project.build.sourceEncoding} + ${surefireArgLine} -Dfile.encoding=${project.build.sourceEncoding} @@ -339,10 +336,10 @@ prepare-agent - true - ${sonar.jacoco.reportPath} - - surefireArgLine + true + ${sonar.jacoco.reportPath} + + surefireArgLine @@ -376,8 +373,8 @@ itm-java-codeformat/java_codestyle_formatter.xml - - + + From 87086284cb3e487e5d334bf1fb228f4bd4a627fa Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:00:00 +0200 Subject: [PATCH 55/61] remove spring-data-rest config class and annotations --- .../SpringRestConfiguration.java | 51 ------------------- .../rest/TheEntityRepository.java | 15 +++--- 2 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/configuration/SpringRestConfiguration.java diff --git a/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/configuration/SpringRestConfiguration.java b/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/configuration/SpringRestConfiguration.java deleted file mode 100644 index 1b0681ba5..000000000 --- a/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/configuration/SpringRestConfiguration.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c): it@M - Dienstleister für Informations- und Telekommunikationstechnik - * der Landeshauptstadt München, 2024 - */ -package de.muenchen.oss.wahllokalsystem.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.rest.core.config.RepositoryRestConfiguration; -import org.springframework.data.rest.core.event.ValidatingRepositoryEventListener; -import org.springframework.data.rest.core.mapping.RepositoryDetectionStrategy.RepositoryDetectionStrategies; -import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer; -import org.springframework.validation.Validator; -import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.springframework.web.servlet.config.annotation.CorsRegistry; - -@Configuration -public class SpringRestConfiguration implements RepositoryRestConfigurer { - - /** - * The method returns a {@link Validator} to get correct validation error messages. - * - * @return A {@link LocalValidatorFactoryBean} to get correct validation error messages. - */ - @Bean - public Validator validator() { - return new LocalValidatorFactoryBean(); - } - - /** - * See {@link RepositoryRestConfigurer#configureRepositoryRestConfiguration} - */ - @Override - public void configureRepositoryRestConfiguration(final RepositoryRestConfiguration config, final CorsRegistry corsRegistry) { - config.setRepositoryDetectionStrategy(RepositoryDetectionStrategies.DEFAULT); - } - - /** - * See {@link RepositoryRestConfigurer#configureValidatingRepositoryEventListener} - */ - @Override - public void configureValidatingRepositoryEventListener(final ValidatingRepositoryEventListener validatingListener) { - validatingListener.addValidator("afterCreate", validator()); - validatingListener.addValidator("beforeCreate", validator()); - validatingListener.addValidator("afterSave", validator()); - validatingListener.addValidator("beforeSave", validator()); - validatingListener.addValidator("beforeLinkSave", validator()); - validatingListener.addValidator("afterLinkSave", validator()); - } - -} diff --git a/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java b/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java index 4ce3d0b9c..c1a5c70f6 100644 --- a/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java +++ b/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java @@ -11,19 +11,16 @@ import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.repository.CrudRepository; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; import org.springframework.security.access.prepost.PreAuthorize; /** * Provides a Repository for {@link TheEntity}. This Repository is exported as a REST resource. *

- * The Repository handles CRUD Operations. Every Operation is secured and takes care of the tenancy. - * For specific Documentation on how the generated REST point behaves, please consider the Spring - * Data Rest Reference + * The Repository handles CRUD Operations. Every Operation is secured and takes care of the tenancy. For specific Documentation on how the generated REST point + * behaves, please consider the Spring Data Rest Reference * here. *

*/ -@RepositoryRestResource @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.security.AuthoritiesEnum).WLS_BROADCAST_SERVICE_READ_THEENTITY.name())") public interface TheEntityRepository extends CrudRepository { //NOSONAR @@ -45,8 +42,8 @@ public interface TheEntityRepository extends CrudRepository { / /** * Create or update a {@link TheEntity}. *

- * If the id already exists, the {@link TheEntity} will be overridden, hence update. - * If the id does not already exist, a new {@link TheEntity} will be created, hence create. + * If the id already exists, the {@link TheEntity} will be overridden, hence update. If the id does not already exist, a new {@link TheEntity} will be + * created, hence create. *

* * @param theEntity The {@link TheEntity} that will be saved. @@ -60,8 +57,8 @@ public interface TheEntityRepository extends CrudRepository { / /** * Create or update a collection of {@link TheEntity}. *

- * If the id already exists, the {@link TheEntity}s will be overridden, hence update. - * If the id does not already exist, the new {@link TheEntity}s will be created, hence create. + * If the id already exists, the {@link TheEntity}s will be overridden, hence update. If the id does not already exist, the new {@link TheEntity}s will be + * created, hence create. *

* * @param entities The {@link TheEntity} that will be saved. From f2d10d3c26b40a6381262fe5713cafc8c63cf1f2 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:04:23 +0200 Subject: [PATCH 56/61] remove yml configuration for spring data rest --- .../src/main/resources/application-dev.yml | 21 ++++++------------- .../src/main/resources/application-kon.yml | 9 -------- .../src/main/resources/application-local.yml | 9 -------- .../src/main/resources/application-prod.yml | 9 -------- .../src/main/resources/application-test.yml | 9 -------- 5 files changed, 6 insertions(+), 51 deletions(-) diff --git a/wls-broadcast-service/src/main/resources/application-dev.yml b/wls-broadcast-service/src/main/resources/application-dev.yml index e4930daa3..c3f8f19e9 100644 --- a/wls-broadcast-service/src/main/resources/application-dev.yml +++ b/wls-broadcast-service/src/main/resources/application-dev.yml @@ -1,25 +1,16 @@ spring: - # Spring data rest - data: - rest: - # Definition of page size for PagingAndSortingRepository - max-page-size: 0x7fffffff - default-page-size: 0x7fffffff - return-body-on-update: true - return-body-on-create: true - # Spring JPA h2.console.enabled: true jpa: database: H2 hibernate: - # always drop and create the db should be the best - # configuration for local (development) mode. this - # is also the default, that spring offers by convention. - # but here explicite: - ddl-auto: create-drop - naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + # always drop and create the db should be the best + # configuration for local (development) mode. this + # is also the default, that spring offers by convention. + # but here explicite: + ddl-auto: create-drop + naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation show-sql: true properties: diff --git a/wls-broadcast-service/src/main/resources/application-kon.yml b/wls-broadcast-service/src/main/resources/application-kon.yml index 71edf659b..d3432e6bc 100644 --- a/wls-broadcast-service/src/main/resources/application-kon.yml +++ b/wls-broadcast-service/src/main/resources/application-kon.yml @@ -1,14 +1,5 @@ spring: - # Spring data rest - data: - rest: - # Definition of page size for PagingAndSortingRepository - max-page-size: 0x7fffffff - default-page-size: 0x7fffffff - return-body-on-update: true - return-body-on-create: true - # Spring JPA h2.console.enabled: true jpa: diff --git a/wls-broadcast-service/src/main/resources/application-local.yml b/wls-broadcast-service/src/main/resources/application-local.yml index 382e3a29b..00195fe90 100644 --- a/wls-broadcast-service/src/main/resources/application-local.yml +++ b/wls-broadcast-service/src/main/resources/application-local.yml @@ -2,15 +2,6 @@ server: port: 39146 spring: - # Spring data rest - data: - rest: - # Definition of page size for PagingAndSortingRepository - max-page-size: 0x7fffffff - default-page-size: 0x7fffffff - return-body-on-update: true - return-body-on-create: true - # Spring JPA h2.console.enabled: true jpa: diff --git a/wls-broadcast-service/src/main/resources/application-prod.yml b/wls-broadcast-service/src/main/resources/application-prod.yml index 7307c2766..a484ba0dd 100644 --- a/wls-broadcast-service/src/main/resources/application-prod.yml +++ b/wls-broadcast-service/src/main/resources/application-prod.yml @@ -1,14 +1,5 @@ spring: - # Spring data rest - data: - rest: - # Definition of page size for PagingAndSortingRepository - max-page-size: 0x7fffffff - default-page-size: 0x7fffffff - return-body-on-update: true - return-body-on-create: true - # Spring JPA h2.console.enabled: true jpa: diff --git a/wls-broadcast-service/src/main/resources/application-test.yml b/wls-broadcast-service/src/main/resources/application-test.yml index 4ffc28065..562b25f44 100644 --- a/wls-broadcast-service/src/main/resources/application-test.yml +++ b/wls-broadcast-service/src/main/resources/application-test.yml @@ -1,14 +1,5 @@ spring: - # Spring data rest - data: - rest: - # Definition of page size for PagingAndSortingRepository - max-page-size: 0x7fffffff - default-page-size: 0x7fffffff - return-body-on-update: true - return-body-on-create: true - # Spring JPA h2.console.enabled: true jpa: From 90ec711b0e7402436717f533a1f789f798548d1a Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:08:17 +0200 Subject: [PATCH 57/61] remove yml configuration for spring data rest --- .../src/test/resources/application-test.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/wls-broadcast-service/src/test/resources/application-test.yml b/wls-broadcast-service/src/test/resources/application-test.yml index d3c91569d..5dcd8fb74 100644 --- a/wls-broadcast-service/src/test/resources/application-test.yml +++ b/wls-broadcast-service/src/test/resources/application-test.yml @@ -1,14 +1,5 @@ spring: - # Spring data rest - data: - rest: - # Definition of page size for PagingAndSortingRepository - max-page-size: 0x7fffffff - default-page-size: 0x7fffffff - return-body-on-update: true - return-body-on-create: true - # Spring JPA h2.console.enabled: true jpa: From 568ce80dd6d9fc2142a25fd6a8f5564ae979ca4f Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:13:36 +0200 Subject: [PATCH 58/61] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20unintended=20format?= =?UTF-8?q?=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wls-broadcast-service/pom.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml index 20938d9ca..238304782 100644 --- a/wls-broadcast-service/pom.xml +++ b/wls-broadcast-service/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 de.muenchen.oss.wahllokalsystem @@ -316,7 +315,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - ${surefireArgLine} -Dfile.encoding=${project.build.sourceEncoding} + ${surefireArgLine} -Dfile.encoding=${project.build.sourceEncoding} @@ -336,10 +335,10 @@ prepare-agent - true - ${sonar.jacoco.reportPath} - - surefireArgLine + true + ${sonar.jacoco.reportPath} + + surefireArgLine @@ -373,8 +372,8 @@ itm-java-codeformat/java_codestyle_formatter.xml - - + + From adb7a9b3640c8003d8f0131f270c46f0f17fac15 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 18:22:16 +0200 Subject: [PATCH 59/61] remove caching test for spring data rest endpoints --- .../CacheControlConfigurationTest.java | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/CacheControlConfigurationTest.java diff --git a/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/CacheControlConfigurationTest.java b/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/CacheControlConfigurationTest.java deleted file mode 100644 index 7fb4a66a7..000000000 --- a/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/CacheControlConfigurationTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c): it@M - Dienstleister für Informations- und Telekommunikationstechnik - * der Landeshauptstadt München, 2024 - */ -package de.muenchen.oss.wahllokalsystem.configuration; - -import de.muenchen.oss.wahllokalsystem.MicroServiceApplication; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ActiveProfiles; - -import static de.muenchen.oss.wahllokalsystem.TestConstants.SPRING_TEST_PROFILE; -import static de.muenchen.oss.wahllokalsystem.TestConstants.SPRING_NO_SECURITY_PROFILE; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -@SpringBootTest( - classes = { MicroServiceApplication.class }, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - properties = { - "spring.datasource.url=jdbc:h2:mem:testexample;DB_CLOSE_ON_EXIT=FALSE", - "refarch.gracefulshutdown.pre-wait-seconds=0" - } -) -@ActiveProfiles(profiles = { SPRING_TEST_PROFILE, SPRING_NO_SECURITY_PROFILE }) -class CacheControlConfigurationTest { - - private static final String ENTITY_ENDPOINT_URL = "/theEntities"; - - private static final String EXPECTED_CACHE_CONTROL_HEADER_VALUES = "no-cache, no-store, must-revalidate"; - - @Autowired - private TestRestTemplate testRestTemplate; - - @Test - void testForCacheControlHeadersForEntityEndpoint() { - ResponseEntity response = testRestTemplate.exchange(ENTITY_ENDPOINT_URL, HttpMethod.GET, null, String.class); - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertTrue(response.getHeaders().containsKey(HttpHeaders.CACHE_CONTROL)); - assertEquals(EXPECTED_CACHE_CONTROL_HEADER_VALUES, response.getHeaders().getCacheControl()); - } - -} From 616c5d2b41ab5667e0a3c2000b734417e0008584 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 19:44:44 +0200 Subject: [PATCH 60/61] disable old test that work with spring data rest --- .../wahllokalsystem/configuration/UnicodeConfigurationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/UnicodeConfigurationTest.java b/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/UnicodeConfigurationTest.java index e6f0c15df..8959a617c 100644 --- a/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/UnicodeConfigurationTest.java +++ b/wls-broadcast-service/src/test/java/de/muenchen/oss/wahllokalsystem/configuration/UnicodeConfigurationTest.java @@ -8,6 +8,7 @@ import de.muenchen.oss.wahllokalsystem.domain.TheEntity; import de.muenchen.oss.wahllokalsystem.rest.TheEntityRepository; import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -54,6 +55,7 @@ class UnicodeConfigurationTest { private TheEntityRepository theEntityRepository; @Test + @Disabled("rework with real controller") void testForNfcNormalization() { // Persist entity with decomposed string. final TheEntityDto theEntityDto = new TheEntityDto(); From f7babcd66ee42a0e55aea1afbb2d951db06c2196 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 15 Apr 2024 19:57:08 +0200 Subject: [PATCH 61/61] spotless:apply --- .../oss/wahllokalsystem/rest/TheEntityRepository.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java b/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java index c1a5c70f6..cab528f54 100644 --- a/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java +++ b/wls-broadcast-service/src/main/java/de/muenchen/oss/wahllokalsystem/rest/TheEntityRepository.java @@ -16,7 +16,8 @@ /** * Provides a Repository for {@link TheEntity}. This Repository is exported as a REST resource. *

- * The Repository handles CRUD Operations. Every Operation is secured and takes care of the tenancy. For specific Documentation on how the generated REST point + * The Repository handles CRUD Operations. Every Operation is secured and takes care of the tenancy. + * For specific Documentation on how the generated REST point * behaves, please consider the Spring Data Rest Reference * here. *

@@ -42,7 +43,8 @@ public interface TheEntityRepository extends CrudRepository { / /** * Create or update a {@link TheEntity}. *

- * If the id already exists, the {@link TheEntity} will be overridden, hence update. If the id does not already exist, a new {@link TheEntity} will be + * If the id already exists, the {@link TheEntity} will be overridden, hence update. If the id does + * not already exist, a new {@link TheEntity} will be * created, hence create. *

* @@ -57,7 +59,8 @@ public interface TheEntityRepository extends CrudRepository { / /** * Create or update a collection of {@link TheEntity}. *

- * If the id already exists, the {@link TheEntity}s will be overridden, hence update. If the id does not already exist, the new {@link TheEntity}s will be + * If the id already exists, the {@link TheEntity}s will be overridden, hence update. If the id does + * not already exist, the new {@link TheEntity}s will be * created, hence create. *

*