[pull] develop from datengaertnerei:develop

.github/workflows/dev-build.yml

@@ -16,30 +16,30 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@9ff9d14760a73102d9fa2f47131624137f50ead8
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
       with:
         disable-sudo: true
         egress-policy: audit #sonarcloud aws generic hostname unfortunately subject to change
 
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
+    - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
       with:
         fetch-depth: '0'
 
-    - name: Set up JDK 17
-      uses: actions/setup-java@a1c6c9c8677803c9f4bd31e0f15ac0844258f955
+    - name: Set up JDK 21
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
     - name: Cache Maven packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
@@ -48,20 +48,17 @@ jobs:
     # Next step will start build & deploy maven site with additional artifacts for the Maven site
     - name: Build and analyze dev
       run: |
-        chmod u+x ./mvnw
         git config --global user.email "[email protected]"
         git config --global user.name "datengaertnerei"
         export OSM_IMPORT_FILE=https://github.com/datengaertnerei/test-data-service/raw/develop/data/osm-small.pbf
         touch ./mvn-build.log
         tail -f ./mvn-build.log &
-        ./mvnw -B --log-file ./mvn-build.log deploy site org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dorg.slf4j.simpleLogger.defaultLogLevel=warn 
+        ./mvnw -B --log-file ./mvn-build.log deploy site org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -Djdk.instrument.traceUsage
         cp ./mvn-build.log target/site/mvn-build.log.txt
-        npm install --global @cyclonedx/cyclonedx-npm
-        cyclonedx-npm --output-file target/site/frontend-sbom.json --ignore-npm-errors src/app/package.json
         mkdir ~/site-tmp
         cp -r target/site/* ~/site-tmp
         cp -r target/test-data-service-oas.json ~/site-tmp
-        cp -r target/test-data-service-bom.* ~/site-tmp
+        cp -r target/classes/META-INF/sbom/application.cdx.json ~/site-tmp/test-data-service-bom.json
         git stash
         git checkout gh_pages
         cp -r ~/site-tmp/* docs
@@ -74,4 +71,4 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
-    - uses: codecov/codecov-action@fd624e50e79ee493cc04fa548dbb550c038281da
+    - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a

.github/workflows/docker.yml

@@ -1,9 +1,10 @@
 name: docker
 
 on: 
-  schedule:
+  workflow_call:
+#  schedule:
     # * is a special character in YAML so you have to quote this string
-    - cron:  '0 5 15 * *'
+#    - cron:  '0 5 15 * *'
 
 jobs:
   docker:
@@ -12,20 +13,20 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@9ff9d14760a73102d9fa2f47131624137f50ead8
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
       with:
         disable-sudo: true
         egress-policy: audit #outbound hosts constantly subject to change by action providers
 
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
+    - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
       with:
         fetch-depth: '0'
         ref: master
 
-    - name: Set up JDK 17
-      uses: actions/setup-java@a1c6c9c8677803c9f4bd31e0f15ac0844258f955
+    - name: Set up JDK 21
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
     - name: Download Maven release
@@ -35,7 +36,7 @@ jobs:
         git config --global user.name "datengaertnerei"
         mkdir -p target
         export MVNVER=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//')
-        mvn dependency:copy \
+        ./mvnw dependency:copy \
             -Dartifact=com.datengaertnerei.test:data-service:${MVNVER} \
             -DoutputDirectory=target \
             --global-settings .github/settings.xml
@@ -57,7 +58,7 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .      
         push: true

.github/workflows/main-build.yml

@@ -6,9 +6,10 @@ name: maven-main-build
 concurrency: build
 
 on: 
-  schedule:
+  workflow_call:
+#  schedule:
     # * is a special character in YAML so you have to quote this string
-    - cron:  '0 5 15 * *'
+#    - cron:  '0 5 15 * *'
 
 jobs:
   build:
@@ -17,30 +18,30 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@9ff9d14760a73102d9fa2f47131624137f50ead8
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
       with:
         egress-policy: audit #outbound hosts constantly subject to change by action providers
 
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
+    - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
       with:
         fetch-depth: '0'
         ref: master
 
-    - name: Set up JDK 17
-      uses: actions/setup-java@a1c6c9c8677803c9f4bd31e0f15ac0844258f955
+    - name: Set up JDK 21
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
     - name: Cache Maven packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
@@ -49,10 +50,9 @@ jobs:
     - name: Build and analyze main
       run: |
         export OSM_IMPORT_FILE=https://github.com/datengaertnerei/test-data-service/raw/develop/data/osm-small.pbf
-        chmod u+x ./mvnw
         ./mvnw -B clean package org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}        
 
-    - uses: codecov/codecov-action@fd624e50e79ee493cc04fa548dbb550c038281da
+    - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a

.github/workflows/manual-docker.yml

@@ -0,0 +1,9 @@
+name: manual-docker
+
+on:
+  workflow_dispatch:
+
+jobs:
+  start-release:
+    uses: datengaertnerei/test-data-service/.github/workflows/docker.yml@develop
+    secrets: inherit

.github/workflows/manual-main-build.yml

@@ -0,0 +1,9 @@
+name: manual-main-build
+
+on:
+  workflow_dispatch:
+
+jobs:
+  start-release:
+    uses: datengaertnerei/test-data-service/.github/workflows/docker.yml@develop
+    secrets: inherit

.github/workflows/manual-release.yml

@@ -0,0 +1,9 @@
+name: manual-release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  start-release:
+    uses: datengaertnerei/test-data-service/.github/workflows/release.yml@develop
+    secrets: inherit

.github/workflows/merge.yml

@@ -20,31 +20,30 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@9ff9d14760a73102d9fa2f47131624137f50ead8
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
       with:
         disable-sudo: true
         egress-policy: audit #outbound hosts constantly subject to change by action providers
 
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
-    - name: Set up JDK 17
-      uses: actions/setup-java@a1c6c9c8677803c9f4bd31e0f15ac0844258f955
+    - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
+    - name: Set up JDK 21
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
       # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@7fd4900b29c9865d61ace089788ac5c913cb730b
+      uses: github/codeql-action/init@9222a972b5a84ae07022994d63e7f670309f0c6b
       with:
         languages: javascript, python, java        
 
     - name: Build with Maven
       run: |
         export OSM_IMPORT_FILE=https://github.com/datengaertnerei/test-data-service/raw/develop/data/osm-small.pbf
-        chmod u+x ./mvnw
         ./mvnw -B test --file pom.xml
       env:        
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@7fd4900b29c9865d61ace089788ac5c913cb730b
+      uses: github/codeql-action/analyze@9222a972b5a84ae07022994d63e7f670309f0c6b