Merge branch 'main' into feature/adapt-to-new-nanopore-structure

Author: Steffengreiner

.github/workflows/build_package.yml

@@ -21,7 +21,7 @@ jobs:
           distribution: 'zulu'
           java-version: '8'
       - name: Load local Maven repository cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/codeql-analysis.yml

@@ -46,7 +46,7 @@ jobs:
           settings-path: ${{ github.workspace }}
 
       - name: Load local Maven repository cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/create-release.yml

@@ -21,7 +21,7 @@ jobs:
           settings-path: ${{ github.workspace }}
 
       - name: Load local Maven repository cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/label-pull-requests.yml

@@ -12,6 +12,6 @@ jobs:
   Assign-Label-To-Pull-Request:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v5.0.0-alpha.1
+      - uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/nexus-publish-snapshots.yml

@@ -25,7 +25,7 @@ jobs:
           settings-path: ${{ github.workspace }}
 
       - name: Load local Maven repository cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/run_tests.yml

@@ -23,7 +23,7 @@ jobs:
           settings-path: ${{ github.workspace }}
 
       - name: Load local Maven repository cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>life.qbic</groupId>
   <artifactId>data-model-lib</artifactId>
-  <version>2.29.1</version>
+  <version>2.30</version>
   <name>data-model-lib</name>
   <url>http://github.com/qbicsoftware/data-model-lib</url>
   <description>Data models. A collection of QBiC's central data models and DTOs. </description>

src/main/groovy/life/qbic/datamodel/dtos/business/services/ProductUnit.groovy

@@ -23,7 +23,8 @@ enum ProductUnit {
   PER_COMPARISON("Comparison"),
   PER_FLOW_CELL("Flow cell"),
   PER_BATCH("Batch"),
-  PER_VIAL("Vial")
+  PER_VIAL("Vial"),
+  PER_KIT("Kit")
 
   /**
    Holds the String value of the enum