Merge branch 'refs/heads/main' into development

# Conflicts: # user-interface/frontend/themes/datamanager/components/main.css
qbicsoftware · Jul 8, 2024 · f3fb2e9 · f3fb2e9
2 parents 0ff53f6 + 6b20130
commit f3fb2e9
Show file tree

Hide file tree

Showing 22 changed files with 94 additions and 63 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
 
   <groupId>life.qbic.infrastructure</groupId>
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
 
   <artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>finances</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
 
   <groupId>life.qbic.datamanager</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
   <artifactId>identity-infrastructure</artifactId>
   <dependencies>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>identity</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -45,25 +45,25 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>broadcasting</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>logging</artifactId>
@@ -20,7 +20,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>2.0.9</version>
+        <version>2.0.13</version>
       </dependency>
       <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
       <dependency>
@@ -31,7 +31,7 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.4.14</version>
+        <version>1.5.6</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>life.qbic.logging</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+  <version>1.1.3</version>
   <modules>
     <module>user-interface</module>
     <module>identity</module>
@@ -35,13 +35,13 @@
     <maven.compiler.target>17</maven.compiler.target>
     <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jackson.version>2.15.0</jackson.version>
+    <jackson.version>2.17.1</jackson.version>
   </properties>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.3</version>
+    <version>3.3.1</version>
   </parent>
 
   <repositories>
@@ -131,13 +131,13 @@
       <dependency>
         <groupId>org.spockframework</groupId>
         <artifactId>spock-core</artifactId>
-        <version>2.4-M1-groovy-4.0</version>
+        <version>2.4-M4-groovy-4.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.spockframework</groupId>
         <artifactId>spock-spring</artifactId>
-        <version>2.4-M1-groovy-4.0</version>
+        <version>2.4-M4-groovy-4.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -178,7 +178,7 @@
       <dependency>
         <groupId>org.yaml</groupId>
         <artifactId>snakeyaml</artifactId>
-        <version>2.0</version>
+        <version>2.2</version>
       </dependency>
     </dependencies>
 

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.0.5</version>
+    <version>1.1.3</version>
   </parent>
 
   <groupId>life.qbic.identity</groupId>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>project-management</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>project-management</artifactId>
@@ -37,25 +37,24 @@
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>logging</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>6.1.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -78,13 +77,13 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.finances</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.3</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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+    <version>1.1.3</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.0.5</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/user-interface/frontend/themes/datamanager/components/main.css b/user-interface/frontend/themes/datamanager/components/main.css
@@ -15,7 +15,7 @@
 #landing-page-layout .landing-page-content {
   /*Static resources have to be loaded in css form the Meta-INF directory see vaadin cheatsheet
   https://vaadin.com/vaadin-reference-card#static-content */
-  /*background-image: url("../images/")*/;
+  /*background-image: url("../images/");*/
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;