FV-111 Merge sprint nach Main

Author: boal

.github/dependabot.yml

@@ -8,38 +8,22 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Advance Security Policy as Code
-        uses: advanced-security/policy-as-code@v2.5.0
+        uses: advanced-security/policy-as-code@v2.11.0
         with:
           policy: GeekMasher/security-queries
           policy-path: $GITHUB_WORKSPACE/policies/default.yml
-
           token: ${{ secrets.ACCESS_TOKEN }}
-
           argvs: '--disable-dependabot --disable-secret-scanning --disable-code-scanning'
 
   build-maven:
     needs: compliance
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: "21"
-          distribution: "temurin"
-          cache: "maven"
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-
       - name: Build with Maven
-        run: mvn -B verify -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
+        id: maven
+        uses: it-at-m/lhm_actions/action-templates/actions/[email protected]

.github/workflows/build.yaml

@@ -0,0 +1,44 @@
+name: build maven and image
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'What should the image be tagged as?'
+        required: false
+        default: 'dev'
+
+env:
+  IMAGE_NAME: "dave-backend"
+
+jobs:
+  build-maven:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      ARTIFACT_NAME: ${{ steps.maven.outputs.artifact-name }}
+    steps:
+      - name: Build with Maven
+        id: maven
+        uses: it-at-m/lhm_actions/action-templates/actions/[email protected]
+
+  build-image:
+    runs-on: ubuntu-latest
+    needs: build-maven
+    permissions:
+      packages: write
+    steps:
+      - name: Build and push Docker image
+        uses: it-at-m/lhm_actions/action-templates/actions/[email protected]
+        with:
+          path: .
+          image-name: ${{ env.IMAGE_NAME }}
+          artifact-name: ${{ needs.build-maven.outputs.ARTIFACT_NAME }}
+          registry-username: ${{ github.actor }}
+          registry-password: ${{ secrets.GITHUB_TOKEN }}
+          image-tags: |
+            # use tag from input only if triggered by workflow_dispatch
+            type=raw,value=${{ github.event.inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
+          image-labels: |
+            maintainer=it@m, Landeshauptstadt Muenchen (LHM)

.github/workflows/build_push.yaml

@@ -4,38 +4,61 @@ on:
   workflow_dispatch:
     inputs:
       releaseVersion:
-        description: "Default version to use when preparing a release."
+        description: "Version to use when preparing a release (e.g., 1.2.3)"
         required: true
         default: "2.0.0"
       developmentVersion:
-        description: "Default version to use for new local working copy."
+        description: "Version to use for new local working copy (e.g., 1.2.4-SNAPSHOT)"
         required: true
         default: "2.0.1-SNAPSHOT"
 
+env:
+  IMAGE_NAME: "dave-backend"
+
 jobs:
   release-maven:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     outputs:
       MVN_ARTIFACT_ID: ${{ steps.maven-release-step.outputs.MVN_ARTIFACT_ID }}
       ARTIFACT_NAME: ${{ steps.maven-release-step.outputs.artifact-name }}
     env:
       TZ: Europe/Berlin # timezone
     steps:
       - id: maven-release-step
-        uses: it-at-m/.github/.github/actions/action-maven-release@main
+        uses: it-at-m/lhm_actions/action-templates/actions/action-maven-release@v1.0.20
         with:
           app-path: ""
-          releaseVersion: "${{ github.event.inputs.releaseVersion }}"
-          developmentVersion: "${{ github.event.inputs.developmentVersion }}"
-          java-version: 21
+          releaseVersion: ${{ github.event.inputs.releaseVersion }}
+          developmentVersion: ${{ github.event.inputs.developmentVersion }}
 
-  create-github-release:
+  build-image:
+    runs-on: ubuntu-latest
     needs: release-maven
+    permissions:
+      packages: write
+    steps:
+      - uses: it-at-m/lhm_actions/action-templates/actions/[email protected]
+        with:
+          path: .
+          image-name: ${{ env.IMAGE_NAME }}
+          artifact-name: ${{ needs.release-maven.outputs.ARTIFACT_NAME }}
+          registry-username: ${{ github.actor }}
+          registry-password: ${{ secrets.GITHUB_TOKEN }}
+          image-tags: |
+            type=semver,pattern={{version}},value=${{ github.event.inputs.releaseVersion }}
+          image-labels: |
+            maintainer=it@m, Landeshauptstadt Muenchen (LHM)
+
+  create-github-release:
+    needs: ["release-maven", "build-image"]
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Create GitHub Release
-        id: create_release
-        uses: it-at-m/.github/.github/actions/action-create-github-release@main
+        uses: it-at-m/lhm_actions/action-templates/actions/[email protected]
         with:
           artifact-name: ${{ needs.release-maven.outputs.ARTIFACT_NAME }}
           tag-name: ${{ needs.release-maven.outputs.MVN_ARTIFACT_ID }}-${{ github.event.inputs.releaseVersion }}

.github/workflows/build_push_feature.yaml

@@ -44,3 +44,4 @@ nbdist/
 # do not check in local application profile yml
 src/**/application-local.yml
 /.openapi-generator/
+/*_logfile

.github/workflows/build_push_stable.yaml

@@ -59,7 +59,7 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at <opensource@muenchendigital.io>.
+reported to the community leaders responsible for enforcement at <opensource@muenchen.de>.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the