WIP

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

dbrepo-analyse-service/Pipfile

@@ -21,7 +21,7 @@ numpy = "*"
 pandas = "*"
 minio = "*"
 pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.8.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.8.2rc3.tar.gz"}
 opensearch-py = "*"
 
 [dev-packages]

dbrepo-analyse-service/Pipfile.lock

 {
     "_meta": {
         "hash": {
-            "sha256": "348b4dab04b3c38faa04d0f821ac6e3fb0005b7a042a8475ec39f673027c48ce"
+            "sha256": "6aeb33bd0b0b34011a467a6acedfd84c016d1bfd7482063b6fa5b0738d223a2a"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -321,10 +321,10 @@
         },
         "dbrepo": {
             "hashes": [
-                "sha256:33555e6ea0d799cab0a67d0ce33f97bf2b890f45b997cc902ebdd835d5309094"
+                "sha256:c93f6aacbae7b03d97d8e7d7725e6c5af4ae5af085b7dce3688953f6d9659a4b"
             ],
-            "path": "./lib/dbrepo-1.8.2.tar.gz",
-            "version": "==1.8.2"
+            "path": "./lib/dbrepo-1.8.2rc3.tar.gz",
+            "version": "==1.8.2rc3"
         },
         "events": {
             "hashes": [
@@ -1164,11 +1164,11 @@
         },
         "setuptools": {
             "hashes": [
-                "sha256:9828422e7541213b0aacb6e10bbf9dd8febeaa45a48570e09b6d100e063fc9f9",
-                "sha256:b9ab3a104bedb292323f53797b00864e10e434a3ab3906813a7169e4745b912a"
+                "sha256:128ce7b8f33c3079fd1b067ecbb4051a66e8526e7b65f6cec075dfc650ddfa88",
+                "sha256:e147c0549f27767ba362f9da434eab9c5dc0045d5304feb602a0af001089fc51"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==79.0.0"
+            "version": "==79.0.1"
         },
         "six": {
             "hashes": [

dbrepo-dashboard-service/Pipfile

@@ -12,7 +12,7 @@ prometheus-flask-exporter = "*"
 python-dotenv = "~=1.0"
 jwt = "~=1.3"
 pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.8.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.8.2rc3.tar.gz"}
 gunicorn = "*"
 pydantic = "*"
 flask_httpauth = "*"

dbrepo-data-service/.gitignore

@@ -7,6 +7,9 @@ target/
 ### Environment ###
 .env
 
+### local repo ###
+lib/at/
+
 ### Generated ###
 ready
 mapping.xml

dbrepo-data-service/Dockerfile

 ###### FIRST STAGE ######
-FROM maven:3-amazoncorretto-17 AS build
+FROM --platform=$BUILDPLATFORM maven:3-amazoncorretto-17 AS build
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 COPY ./pom.xml ./
 
 RUN mvn -fn dependency:go-offline
 
+COPY ./lib ./lib
 COPY ./querystore ./querystore
 COPY ./report ./report
 COPY ./rest-service ./rest-service
 COPY ./services ./services
 
 # Make sure it compiles
-RUN mvn -fn clean package -DskipTests
+RUN mvn -q clean package -DskipTests
 
 ###### SECOND STAGE ######
-FROM amazoncorretto:17-alpine3.21 AS runtime
+FROM --platform=$BUILDPLATFORM amazoncorretto:17-alpine3.21 AS runtime
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk --no-cache add \

dbrepo-data-service/README.md

 # Data Service
 
+## Build
+
+Before testing, it is recommended to (re-)build the `MapStruct` mappers in case they were modified using the `package`
+target:
+
+```shell
+mvn clean package
+```
+
 ## Test
 
 Run all unit and integration tests and create an HTML+TXT coverage report located in the `report` module:

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml

@@ -3,10 +3,11 @@
   <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
   <artifactId>dbrepo-core</artifactId>
   <versioning>
-    <release>1.8.1</release>
+    <release>1.8.2</release>
     <versions>
       <version>1.8.1</version>
+      <version>1.8.2</version>
     </versions>
-    <lastUpdated>20250422121915</lastUpdated>
+    <lastUpdated>20250424042157</lastUpdated>
   </versioning>
 </metadata>

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5

-9c8ded18aad1ff29f91e6ea5b11e33d4
\ No newline at end of file
+535ccfe9a81ec5cacace73e5fda12e7f
\ No newline at end of file

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1

-8784dd005d25156e9599b598deabb8aa15b7a8c1
\ No newline at end of file
+4c42fa159ec7959fbfc3de77b8b0307537bff1f1
\ No newline at end of file

dbrepo-data-service/pom.xml

@@ -13,11 +13,11 @@
         <url>https://www.tuwien.ac.at</url>
     </organization>
 
-    <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
-    <artifactId>dbrepo-data-service</artifactId>
-    <name>dbrepo-data-service</name>
+    <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+    <artifactId>data-service</artifactId>
     <version>1.8.2</version>
 
+    <name>data-service</name>
     <description>Service that manages the data</description>
 
     <packaging>pom</packaging>
@@ -96,11 +96,7 @@
         <dependency>
             <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
             <artifactId>dbrepo-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.8.2</version>
         </dependency>
         <!-- Spark -->
         <dependency>
@@ -330,6 +326,16 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>dbrepo-maven-repo</id>
+            <url>file:///${project.basedir}/lib</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <licenses>
         <license>
             <name>Apache-2.0</name>

dbrepo-data-service/querystore/pom.xml

@@ -4,13 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
-        <artifactId>dbrepo-data-service</artifactId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+        <artifactId>data-service</artifactId>
         <version>1.8.2</version>
     </parent>
 
-    <artifactId>dbrepo-data-service-querystore</artifactId>
-    <name>dbrepo-data-service-querystore</name>
+    <name>querystore</name>
+    <artifactId>querystore</artifactId>
     <version>1.8.2</version>
 
     <dependencies/>

dbrepo-data-service/querystore/src/main/java/at/ac/tuwien/ac/at/ifs/dbrepo/querystore/Query.java → dbrepo-data-service/querystore/src/main/java/at/ac/tuwien/ifs/dbrepo/querystore/Query.java

-package at.ac.tuwien.ac.at.ifs.dbrepo.querystore;
+package at.ac.tuwien.ifs.dbrepo.querystore;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

dbrepo-data-service/report/pom.xml

@@ -4,29 +4,30 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
-        <artifactId>dbrepo-data-service</artifactId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+        <artifactId>data-service</artifactId>
         <version>1.8.2</version>
     </parent>
 
-    <artifactId>report</artifactId>
-    <name>dbrepo-data-service-report</name>
-    <version>1.8.2</version>
+    <name>report</name>
     <description>
         This module is only intended for the pipeline coverage report. See the detailed report in the
         respective modules
     </description>
 
+    <artifactId>report</artifactId>
+    <version>1.8.2</version>
+
     <dependencies>
         <dependency>
-            <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
+            <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
             <artifactId>rest-service</artifactId>
-            <version>${project.version}</version>
+            <version>1.8.2</version>
         </dependency>
         <dependency>
-            <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
+            <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
             <artifactId>services</artifactId>
-            <version>${project.version}</version>
+            <version>1.8.2</version>
         </dependency>
     </dependencies>
 

dbrepo-data-service/rest-service/pom.xml

@@ -4,18 +4,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
-        <artifactId>dbrepo-data-service</artifactId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+        <artifactId>data-service</artifactId>
         <version>1.8.2</version>
     </parent>
 
+    <name>rest-service</name>
     <artifactId>rest-service</artifactId>
-    <name>dbrepo-data-service-rest-service</name>
     <version>1.8.2</version>
 
     <dependencies>
         <dependency>
-            <groupId>at.ac.tuwien.ac.at.ifs.dbrepo</groupId>
+            <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
             <artifactId>services</artifactId>
             <version>1.8.2</version>
         </dependency>