Version 2.1.0

.github/workflows/close_issue.yaml

@@ -28,7 +28,7 @@ jobs:
             const body = pr.body;
             const lines = body.split('\n').map((l)=>l.trim());
             const closers = new RegExp(
-              /(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)/i);
+              /^(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved) .*#/i);
             const issues = lines.filter((l)=>l.match(closers));
             const issue_nbrs = issues.map((i) => i.replace(/.*#/, ''));
             issue_nbrs.forEach((i) => {

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,82 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ develop, master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ develop ]
+  schedule:
+    - cron: '38 20 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11.0.7
+        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+        settings-path: ${{ github.workspace }} # location for the settings.xml file: :  
+    - name: 'Create settings.xml'
+      uses: whelk-io/maven-settings-xml-action@v4
+      with:
+        servers: '[{"id": "github", "username": "${{ github.actor }}", "password": "${{ github.token}}"}, {"id": "github-annotation", "username": "${{ github.actor }}", "password": "${{ github.token }}"}]'
+        repositories: '[{"id" : "github", "url" : "https://maven.pkg.github.com/Ubique-OSS/springboot-swagger3"}, {"id" : "github-annotation", "url" : "https://maven.pkg.github.com/Ubique-OSS/springboot-swagger3-annotations"}]'
+    - name: Build with Maven
+      run: |
+        mvn install --file dpppt-backend-sdk/pom.xml; 
+        mvn springboot-swagger-3:springboot-swagger-3 -f dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+        TESTCONTAINERS_RYUK_DISABLED: true
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/maven.yml

@@ -1,13 +1,12 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Build, test and analyze
 
 on:
   push:
     branches: [ develop, master ]
   pull_request:
-    branches: [ develop, master ]
 
 jobs:
   build:
@@ -29,29 +28,39 @@ jobs:
       with:
         servers: '[{"id": "github", "username": "${{ github.actor }}", "password": "${{ github.token}}"}, {"id": "github-annotation", "username": "${{ github.actor }}", "password": "${{ github.token }}"}]'
         repositories: '[{"id" : "github", "url" : "https://maven.pkg.github.com/Ubique-OSS/springboot-swagger3"}, {"id" : "github-annotation", "url" : "https://maven.pkg.github.com/Ubique-OSS/springboot-swagger3-annotations"}]'
-    - name: Build with Maven
+
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.sonar/cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+
+    - name: Build and run tests
       run: |
-        mvn install --file dpppt-backend-sdk/pom.xml; 
+        mvn clean install --file dpppt-backend-sdk/pom.xml; 
         mvn springboot-swagger-3:springboot-swagger-3 -f dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml
       env:
         GITHUB_TOKEN: ${{ github.token }}
         TESTCONTAINERS_RYUK_DISABLED: true
-    - name: SonarCloud Scan (develop)
-      run: mvn verify -B sonar:sonar --file dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml
-      if: github.ref == 'refs/heads/develop'
-      env:
-        SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        GITHUB_TOKEN: ${{ github.token }}
-        TESTCONTAINERS_RYUK_DISABLED: true
-    - name: SonarCloud Scan (PR)
-      run: mvn verify -B sonar:sonar -Dsonar.pullrequest.base=develop -Dsonar.pullrequest.key=$(echo "$GITHUB_REF" | awk -F / '{print $3}') --file dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml
-      if: github.ref != 'refs/heads/develop'
+
+    - name: Analyze (sonar)
+      run: mvn sonar:sonar --file dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml
       env:
         SONAR_ORGANIZATION: ${{ secrets.SONAR_ORGANIZATION }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         GITHUB_TOKEN: ${{ github.token }}
+        GITHUB_PULL_REQUEST_KEY: ${{ github.event.number }}
         TESTCONTAINERS_RYUK_DISABLED: true
+
     - name: Publish to GitHub Packages Apache Maven
       if: github.ref == 'refs/heads/develop'
       run: mvn deploy -Dmaven.test.skip=true --file dpppt-backend-sdk/pom.xml -s $GITHUB_WORKSPACE/settings.xml

.github/workflows/tagged_release.yaml

@@ -31,9 +31,12 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ github.token }}
         TESTCONTAINERS_RYUK_DISABLED: true
-    - name: shasum
+    - name: "Calculate shasum for SDK WS"
       run: shasum -a 256 dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.jar > dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.sha256
       shell: bash
+    - name: "Calculate shasum for SDK Interops"
+      run: shasum -a 256 dpppt-backend-sdk/dpppt-backend-sdk-interops/target/dpppt-backend-sdk-interops.jar > dpppt-backend-sdk/dpppt-backend-sdk-interops/target/dpppt-backend-sdk-interops.sha256
+      shell: bash
     - name: "Create new release"
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
@@ -43,4 +46,6 @@ jobs:
           dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.jar
           dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.sha256
           dpppt-backend-sdk/dpppt-backend-sdk-ws/generated/swagger/swagger.yaml
-
+          dpppt-backend-sdk/dpppt-backend-sdk-interops/target/dpppt-backend-sdk-interops.jar
+          dpppt-backend-sdk/dpppt-backend-sdk-interops/target/dpppt-backend-sdk-interops.sha256          
+

docker-compose/stack.yml

@@ -0,0 +1,17 @@
+version: '3.1'
+
+services:
+
+  dpppt_db:
+    image: postgres:11
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: dpppt
+      POSTGRES_DB: dpppt
+      POSTGRES_USER: dpppt
+    ports:
+      - "5432:5432"
+    volumes:
+      - dpppt_db_data:/var/lib/postgresql/data
+volumes:
+  dpppt_db_data: