Merge branch 'main' into fix/sync-updated-since-date-update

sven1103 · web-flow · commit 7ec0248a6b9e · 2026-03-13T13:32:15.000+01:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, master, development, release/*, hotfix/* ]
+    branches: [ main, master, development, release/*, hotfix/*, fix/* ]
   pull_request:
     types:
       - opened
diff --git a/application-commons/pom.xml b/application-commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</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>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>broadcasting</artifactId>
diff --git a/datamanager-app/pom.xml b/datamanager-app/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
 
   <repositories>
diff --git a/datamanager-app/src/main/resources/application.properties b/datamanager-app/src/main/resources/application.properties
@@ -224,3 +224,11 @@ spring.messages.basename=messages.error-messages, messages.toast-notifications,
 # you always have to escape single quotes by another single quote ' -> ''
 # https://www.mscharhag.com/java/resource-bundle-single-quote-escaping for reference
 spring.messages.always-use-message-format=true
+###############################################################################
+################### Raw Data Sync #############################################
+# Batch size for each remote sync query iteration.
+# Reduce (e.g. to 200) during large backlog re-syncs to lower database lock contention.
+qbic.sync.raw-data.batch-size=${SYNC_RAW_DATA_BATCH_SIZE:1000}
+# Maximum wall-clock duration in milliseconds for a single scheduled sync job execution.
+# Must remain smaller than the ShedLock lockAtMostFor value (currently PT40S = 40000ms).
+qbic.sync.raw-data.max-duration-ms=${SYNC_RAW_DATA_MAX_DURATION_MS:10000}
diff --git a/datamanager-bom/pom.xml b/datamanager-bom/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>life.qbic.datamanager</groupId>
   <artifactId>datamanager-bom</artifactId>
-  <version>1.12.6</version>
+  <version>1.12.7</version>
   <packaging>pom</packaging>
   <name>DataManager BOM</name>
   <description>Bill of Materials for DataManager artifacts</description>
diff --git a/domain-concept/pom.xml b/domain-concept/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</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.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
 
   <artifactId>email-service-provider</artifactId>
diff --git a/finances-api/pom.xml b/finances-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
 
   <artifactId>finances-api</artifactId>
diff --git a/finances-infrastructure/pom.xml b/finances-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
 
   <artifactId>finances-infrastructure</artifactId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>finances</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/finances/pom.xml b/finances/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>finances</artifactId>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>finances-api</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</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.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
 
   <artifactId>identity-api</artifactId>
diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
   <artifactId>identity-infrastructure</artifactId>
   <dependencies>
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</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.datamanager</groupId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -52,25 +52,25 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>broadcasting</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>application-commons</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>logging</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>domain-concept</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>identity-api</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</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.datamanager</groupId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>logging</artifactId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>life.qbic.datamanager</groupId>
       <artifactId>subscription-api</artifactId>
-      <version>1.12.6</version>
+      <version>1.12.7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>life.qbic.datamanager</groupId>
   <artifactId>datamanager</artifactId>
   <name>Data Manager</name>
-  <version>1.12.6</version>
+  <version>1.12.7</version>
   <licenses>
     <license>
       <name>AGPL-3.0-or-later</name>
@@ -148,7 +148,7 @@
       <dependency>
         <groupId>life.qbic.datamanager</groupId>
         <artifactId>datamanager-bom</artifactId>
-        <version>1.12.6</version>
+        <version>1.12.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/project-management-infrastructure/pom.xml b/project-management-infrastructure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>life.qbic.datamanager</groupId>
     <artifactId>datamanager</artifactId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
 
   <artifactId>project-management-infrastructure</artifactId>
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sync/WatermarkRepoImpl.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sync/WatermarkRepoImpl.java
@@ -1,10 +1,10 @@
 package life.qbic.projectmanagement.infrastructure.sync;
 
-import java.util.Date;
 import java.util.Objects;
 import java.util.Optional;
 import life.qbic.projectmanagement.application.sync.WatermarkRepo;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <b>Watermark Repo Impl</b>
@@ -33,6 +33,7 @@ private Optional<WatermarkEntry> findById(String id) {
   }
 
   @Override
+  @Transactional
   public void save(Watermark latestWatermark) {
     WatermarkEntry entryForUpdate = findById(latestWatermark.jobName()).orElse(
         WatermarkEntry.create(latestWatermark.jobName(), latestWatermark.syncOffset(),
diff --git a/project-management/pom.xml b/project-management/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>datamanager</artifactId>
     <groupId>life.qbic.datamanager</groupId>
-    <version>1.12.6</version>
+    <version>1.12.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>project-management</artifactId>
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/sync/RawDataSyncService.java b/project-management/src/main/java/life/qbic/projectmanagement/application/sync/RawDataSyncService.java
diff --git a/subscription-api/pom.xml b/subscription-api/pom.xml
diff --git a/subscription-provider/pom.xml b/subscription-provider/pom.xml
