WIP

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

dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5

-dfe2abb9c96c05cbdc6467bf60537695
+082f84bc96626ba0af33b55e6371e900
\ No newline at end of file

dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1

-1d27fdc406b24d5e19e7325cc1c475e54dabdbd8
+73352b727fd328a6f6c87ebb55c5685101ef26a2
\ No newline at end of file

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

@@ -7,6 +7,6 @@
     <versions>
       <version>1.8.1</version>
     </versions>
-    <lastUpdated>20250421083957</lastUpdated>
+    <lastUpdated>20250422121933</lastUpdated>
   </versioning>
 </metadata>

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

-8a5f8a644242230dab9041ce299fd77f
+f7d3706978b0e0277aa64ce2b5538405
\ No newline at end of file

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

-102e640934487420a19e7e092eb8af3dcac9950f
+7de1d14129a4071daefae0475eea792e1a8f406c
\ No newline at end of file

dbrepo-metadata-service/oai/pom.xml

@@ -4,7 +4,7 @@
          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.tuwien</groupId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
         <artifactId>dbrepo-metadata-service</artifactId>
         <version>1.8.1</version>
     </parent>

dbrepo-metadata-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <organization>
@@ -13,7 +13,7 @@
         <url>https://www.tuwien.ac.at</url>
     </organization>
 
-    <groupId>at.tuwien</groupId>
+    <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
     <artifactId>dbrepo-metadata-service</artifactId>
     <name>dbrepo-metadata-service</name>
     <version>1.8.1</version>
@@ -178,11 +178,6 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

dbrepo-metadata-service/report/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>dbrepo-metadata-service</artifactId>
-        <groupId>at.tuwien</groupId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
         <version>1.8.1</version>
     </parent>
 
@@ -15,12 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>dbrepo-metadata-service-rest-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>at.tuwien</groupId>
+            <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
             <artifactId>dbrepo-metadata-service-services</artifactId>
             <version>${project.version}</version>
         </dependency>

dbrepo-metadata-service/repositories/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>dbrepo-metadata-service</artifactId>
-        <groupId>at.tuwien</groupId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
         <version>1.8.1</version>
     </parent>
 
@@ -16,15 +16,9 @@
     <dependencies>
         <dependency>
             <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
-            <artifactId>dbrepo-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>at.tuwien</groupId>
             <artifactId>dbrepo-metadata-service-oai</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 
 </project>

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

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>dbrepo-metadata-service</artifactId>
-        <groupId>at.tuwien</groupId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
         <version>1.8.1</version>
     </parent>
 
@@ -16,11 +16,6 @@
     <dependencies>
         <dependency>
             <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
-            <artifactId>dbrepo-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>at.tuwien</groupId>
             <artifactId>dbrepo-metadata-service-services</artifactId>
             <version>${project.version}</version>
         </dependency>

dbrepo-metadata-service/rest-service/src/main/resources/application.yml

@@ -25,6 +25,9 @@ spring:
     port: ${BROKER_PORT:5672}
   main:
     banner-mode: off
+  output:
+    ansi:
+      enabled: never
 management:
   endpoints:
     web:
@@ -42,10 +45,11 @@ management:
 server:
   port: 8080
 logging:
-  pattern.console: "%d %highlight(%-5level) %msg%n"
+  pattern:
+    console: "%d [%thread] %-5level %logger{36} - %msg%n"
   level:
     root: warn
-    at.ac.tuwien.ifs.dbrepo.: "${LOG_LEVEL:info}"
+    at.ac.tuwien.ac.at.ifs.dbrepo.: "${LOG_LEVEL:info}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 dbrepo:
   datacite:

dbrepo-metadata-service/services/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>dbrepo-metadata-service</artifactId>
-        <groupId>at.tuwien</groupId>
+        <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
         <version>1.8.1</version>
     </parent>
 
@@ -16,16 +16,11 @@
     <dependencies>
         <dependency>
             <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
-            <artifactId>dbrepo-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>at.tuwien</groupId>
             <artifactId>dbrepo-metadata-service-oai</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>at.tuwien</groupId>
+            <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
             <artifactId>dbrepo-metadata-service-repositories</artifactId>
             <version>${project.version}</version>
         </dependency>

docker-compose.yml

-x-resources-nano: &resources-nano
-  resources:
-    reservations:
-      cpus: '0.1'
-      memory: 128M
-    limits:
-      cpus: '0.15'
-      memory: 192M
-
-x-resources-micro: &resources-micro
-  resources:
-    reservations:
-      cpus: '0.25'
-      memory: 256M
-    limits:
-      cpus: '0.375'
-      memory: 384M
-
-x-resources-nano-hm: &resources-micro-hm
-  resources:
-    reservations:
-      cpus: '0.25'
-      memory: 256M
-    limits:
-      cpus: '0.375'
-      memory: 4096M
-
-x-resources-small: &resources-small
-  resources:
-    reservations:
-      cpus: '0.5'
-      memory: 512M
-    limits:
-      cpus: '0.75'
-      memory: 768M
-
-x-resources-medium: &resources-medium
-  resources:
-    reservations:
-      cpus: '0.5'
-      memory: 1024M
-    limits:
-      cpus: '0.75'
-      memory: 1536M
-
-x-resources-large: &resources-large
-  resources:
-    reservations:
-      cpus: '1'
-      memory: 2048M
-    limits:
-      cpus: '1.5'
-      memory: 3072M
-
 x-healthcheck-params: &healthcheck-params
   interval: 30s
   timeout: 10s
@@ -89,8 +35,6 @@ services:
     healthcheck:
       test: /opt/bitnami/scripts/mariadb/healthcheck.sh --connect --innodb_initialized
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro-hm
     logging:
       driver: fluentd
       options:
@@ -118,8 +62,6 @@ services:
     healthcheck:
       test: /opt/bitnami/scripts/mariadb/healthcheck.sh --connect --innodb_initialized
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro-hm
     logging:
       driver: fluentd
       options:
@@ -146,8 +88,6 @@ services:
     healthcheck:
       test: "psql -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak} -c 'select version();'"
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro
     logging:
       driver: fluentd
       options:
@@ -185,8 +125,6 @@ services:
     healthcheck:
       test: curl -fsS localhost:8080/realms/master
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-medium
     depends_on:
       dbrepo-identity-service:
         condition: service_healthy
@@ -216,8 +154,6 @@ services:
       READONLY_USERNAME: "${READONLY_USERNAME:-readonly}"
       SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
       SYSTEM_PASSWORD: ${SYSTEM_PASSWORD:-admin}
-    deploy:
-      <<: *resources-nano
     depends_on:
       dbrepo-auth-service:
         condition: service_healthy
@@ -284,8 +220,6 @@ services:
     healthcheck:
       test: curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-small
     depends_on:
       dbrepo-auth-service:
         condition: service_healthy
@@ -336,8 +270,6 @@ services:
     healthcheck:
       test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro
     logging:
       driver: fluentd
       options:
@@ -369,8 +301,6 @@ services:
     healthcheck:
       test: rabbitmq-diagnostics -q is_running | grep 'is fully booted and running'
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro
     logging:
       driver: fluentd
       options:
@@ -389,8 +319,6 @@ services:
     healthcheck:
       test: curl -sSL 127.0.0.1:9200
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-medium
     logging:
       driver: json-file
 
@@ -421,8 +349,6 @@ services:
     healthcheck:
       test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro
     logging:
       driver: fluentd
       options:
@@ -456,8 +382,6 @@ services:
     healthcheck:
       test: curl -fsSL 127.0.0.1:3000 && curl -fsSL 127.0.0.1:3000/health
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro
     depends_on:
       dbrepo-search-service:
         condition: service_healthy
@@ -483,9 +407,6 @@ services:
     healthcheck:
       test: wget -O- http://127.0.0.1:8080
       <<: *healthcheck-params
-    deploy:
-      # TODO may need less but takes forever to stop
-      <<: *resources-micro
     depends_on:
       dbrepo-analyse-service:
         condition: service_healthy
@@ -533,8 +454,6 @@ services:
     healthcheck:
       test: "ldapwhoami -H ldap://localhost:1389 -D ${IDENTITY_SERVICE_ADMIN_DN:-cn=admin,dc=dbrepo,dc=at} -w ${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin} || exit 1"
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-nano
     logging:
       driver: fluentd
       options:
@@ -558,8 +477,6 @@ services:
       OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
       SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
       SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
-    deploy:
-      <<: *resources-nano
     depends_on:
       dbrepo-search-db:
         condition: service_healthy
@@ -589,8 +506,6 @@ services:
       METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
       SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
       SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
-    deploy:
-      <<: *resources-nano
     depends_on:
       dbrepo-dashboard-ui:
         condition: service_healthy
@@ -621,8 +536,6 @@ services:
     healthcheck:
       test: echo "cluster.check" | weed shell | grep "checking master.*ok" || exit 1
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-nano
     logging:
       driver: fluentd
       options:
@@ -643,8 +556,6 @@ services:
     healthcheck:
       test: promtool check healthy
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-nano
     logging:
       driver: fluentd
       options:
@@ -665,8 +576,6 @@ services:
       S3_BUCKET: "${S3_BUCKET:-dbrepo}"
       S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}
       STORAGE_ENDPOINT: ${STORAGE_ENDPOINT:-http://storage-service:9000}
-    deploy:
-      <<: *resources-nano
     depends_on:
       dbrepo-storage-service:
         condition: service_healthy
@@ -722,8 +631,6 @@ services:
     healthcheck:
       test: curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-large
     depends_on:
       dbrepo-data-db:
         condition: service_healthy
@@ -762,8 +669,6 @@ services:
     healthcheck:
       test: curl -fsSL --head 127.0.0.1:3000
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-nano
     extra_hosts:
       - "localhost:host-gateway"
     logging:
@@ -791,8 +696,6 @@ services:
     healthcheck:
       test: curl -fsSL --head 127.0.0.1:8080/health
       <<: *healthcheck-params
-    deploy:
-      <<: *resources-micro
     depends_on:
       dbrepo-dashboard-ui:
         condition: service_healthy
@@ -814,8 +717,6 @@ services:
     volumes:
       - ./dbrepo-logging-service/default.conf:/opt/bitnami/fluent-bit/conf/fluent-bit.conf
       - ./dbrepo-logging-service/dbrepo_parser.conf:/opt/bitnami/fluent-bit/conf/dbrepo_parser.conf
-    deploy:
-      <<: *resources-micro
     healthcheck:
       test: ps -p 1 | grep "fluent-bit"
       <<: *healthcheck-params
@@ -835,8 +736,6 @@ services:
     environment:
       OPENSEARCH_DASHBOARDS_OPENSEARCH_URL: "${OPENSEARCH_HOST:-search-db}"
       OPENSEARCH_DASHBOARDS_OPENSEARCH_PORT_NUMBER: "${OPENSEARCH_PORT:-9200}"
-    deploy:
-      <<: *resources-micro
     depends_on:
       dbrepo-logging-service:
         condition: service_healthy

lib/java/dbrepo-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <organization>
@@ -38,7 +38,7 @@
         <lombok.version>1.18.36</lombok.version>
         <keycloak.version>26.0.4</keycloak.version>
         <mapstruct.version>1.6.3</mapstruct.version>
-        <spring-cloud.version>4.1.4</spring-cloud.version>
+        <spring-cloud.version>4.2.1</spring-cloud.version>
         <jackson-datatype.version>2.15.0</jackson-datatype.version>
         <springdoc-openapi.version>2.8.5</springdoc-openapi.version>
     </properties>

make/build.mk

 ##@ Build
 
 .PHONY: build-images
-build-images: build-java-lib ## Build Docker images.
-	docker compose build --parallel
+build-images: build-java-lib build-auth-event-listener ## Build Docker images.
+	docker compose build
 
 .PHONY: build-java-lib
 build-java-lib: ## Build the Java Library.
 	mvn -f ./lib/java/dbrepo-core/pom.xml clean package -DskipTests
 	mvn deploy:deploy-file -Dfile=./lib/java/dbrepo-core/target/dbrepo-core-$(APP_VERSION).jar -DgroupId=at.ac.tuwien.ifs.dbrepo -DartifactId=dbrepo-core -Dversion=$(APP_VERSION) -Dpackaging=jar -Durl=file:./dbrepo-data-service/lib/ -DrepositoryId=maven-repository -DupdateReleaseInfo=true
+	mvn -f ./dbrepo-data-service/pom.xml clean package -DskipTests
 	mvn deploy:deploy-file -Dfile=./lib/java/dbrepo-core/target/dbrepo-core-$(APP_VERSION).jar -DgroupId=at.ac.tuwien.ifs.dbrepo -DartifactId=dbrepo-core -Dversion=$(APP_VERSION) -Dpackaging=jar -Durl=file:./dbrepo-metadata-service/lib/ -DrepositoryId=maven-repository -DupdateReleaseInfo=true
+	mvn -f ./dbrepo-metadata-service/pom.xml clean package -DskipTests
 
 .PHONY: build-auth-event-listener
 build-auth-event-listener: ## Build the Auth Service Event Listener.

make/dev.mk

 ##@ Development
 
 .PHONY: start-dev
-start-dev: build-images build-auth-event-listener ## Start the development deployment.
+start-dev: build-images ## Start the development deployment.
 	docker container stop dbrepo-gateway-service || true
 	docker container rm dbrepo-gateway-service || true
 	docker compose up -d

mkdocs.yml

@@ -20,6 +20,7 @@ nav:
     - Data Versioning: concepts/data-versioning.md
     - Dashboards: concepts/dashboards.md
     - Data Visibility: concepts/data-visibility.md
+    - Logging: concepts/logging.md
     - Messaging: concepts/messaging.md
     - Monitoring: concepts/monitoring.md
     - Persistent Identifier: concepts/pid.md