Merge branch 'main' into development

qbicsoftware · Aug 27, 2024 · ab7208f · ab7208f
2 parents cc75918 + cdaeca7
commit ab7208f
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@ that enables FAIR-compliant data access.
 
 ## Overview:
 
+- [Style Guide](#style-guide)
 - [How to Run](#how-to-run)
     * [Configuration](#configuration)
         * [Java Version](#java-version)
@@ -34,6 +35,10 @@ that enables FAIR-compliant data access.
         * [Additional Information](#additional-information)
 - [License](#license)
 
+## Style Guide
+
+Please find the [styleguide](https://github.com/qbicsoftware/data-manager-app-design-system) in its own repository.
+
 ## How to Run
 
 This application is based on maven and can be run after setting the

diff --git a/application-commons/pom.xml b/application-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>application-commons</artifactId>

diff --git a/broadcasting/pom.xml b/broadcasting/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>broadcasting</artifactId>

diff --git a/domain-concept/pom.xml b/domain-concept/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
 
   <artifactId>domain-concept</artifactId>

diff --git a/email-service-provider/pom.xml b/email-service-provider/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>life.qbic.infrastructure</groupId>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances-api/pom.xml b/finances-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>life.qbic.finances</groupId>

diff --git a/finances-infrastructure/pom.xml b/finances-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
 
   <artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>finances</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/finances/pom.xml b/finances/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>finances</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-api/pom.xml b/identity-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>life.qbic.datamanager</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <artifactId>identity-infrastructure</artifactId>
   <dependencies>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/identity/pom.xml b/identity/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>broadcasting</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>life.qbic</groupId>
   <artifactId>datamanager</artifactId>
   <name>Data Manager</name>
-  <version>1.2.4</version>
+  <version>1.3.1</version>
   <modules>
     <module>user-interface</module>
     <module>identity</module>
@@ -30,7 +30,7 @@
 
   <properties>
     <java.version>17</java.version>
-    <vaadin.version>24.3.12</vaadin.version>
+    <vaadin.version>24.4.8</vaadin.version>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <jakarta.persistence.version>3.1.0</jakarta.persistence.version>

diff --git a/project-management-infrastructure/pom.xml b/project-management-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>life.qbic.identity</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/project-management/pom.xml b/project-management/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>project-management</artifactId>
@@ -37,13 +37,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -77,13 +77,13 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/subscription-api/pom.xml b/subscription-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>life.qbic.logging</groupId>

diff --git a/subscription-provider/pom.xml b/subscription-provider/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic</groupId>
-    <version>1.2.4</version>
+    <version>1.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>life.qbic.logging</groupId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.2.4</version>
+      <version>1.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>