Merge branch 'main' into release/set-version-to-0.5.1

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"

README.md

@@ -265,7 +265,7 @@ evaluation.working.dir=${EVALUATION_DIR}
 # Example multiple target dir:
 #   evaluation.target.dirs=/my/example/target/dir1,/my/example/target/dir2,/my/example/target/dir3
 evaluation.target.dirs=${OPENBIS_ETL_DIRS}
-evaluation.measurement-id.pattern=^(MS|NGS)Q[A-Z0-9]{4}[0-9]{3}[A-Z0-9]{2}-[0-9]*
+evaluation.measurement-id.pattern=${MEASUREMENT_ID_PATTERN:^(MS|NGS)Q[A-Z0-9]{4}[0-9]{3}[A-Z0-9]{2}-[0-9]*}
 ```
 
 > [!NOTE]

src/main/resources/application.properties

@@ -13,7 +13,7 @@ users.error.directory.name=error
 # Needs to be present in the users' home folders
 # e.g. /home/<user1>/registration
 users.registration.directory.name=registration
-qbic.measurement-id.pattern=${MEASUREMENT_ID_PATTERN:^(MS|NGS)Q[A-Z0-9]{4}[0-9]{3}[A-Z0-9]{2}-[0-9]*}
+qbic.measurement-id.pattern=${MEASUREMENT_ID_PATTERN:^(MS|NGS)Q2?[A-Z0-9]{4}[0-9]{3}[A-Z0-9]{2}-[0-9]*}
 
 #--------------------------------------
 # Settings for the data scanning thread