Merge pull request #617 from kit-data-manager/development

Prepare release 2.0.0
kit-data-manager · Nov 29, 2024 · aaa377a · aaa377a
2 parents a51ef58 + 780f6cb
commit aaa377a
Show file tree

Hide file tree

Showing 158 changed files with 24,812 additions and 2,643 deletions.
diff --git a/.env b/.env
@@ -12,9 +12,9 @@ RABBIT_MQ_PASSWORD=rabbitpasswd
 # Only edit the following lines if you 
 # want to update service versions.
 ########################################
-METASTORE_VERSION=v1.4.4
+METASTORE_VERSION=v2.0.0
 FRONTEND_COLLECTION_VERSION=metastore-v1.0.1
-INDEXING_SERVICE_VERSION=v1.0.1
+INDEXING_SERVICE_VERSION=v1.0.3
 ELASTICSEARCH_VERSION=8.11.1
 ########################################
 # Don't edit following lines

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -5,21 +5,21 @@ name: build with gradle
 
 on:
   push:
-    branches: [ master, main, testWorkflow, NEP ]
+    branches: [ main, testWorkflow, NEP ]
   pull_request:
-    branches: [ master, main, development, NEP ]
+    branches: [ main, development, NEP ]
 
 env:
     # JDK version used for building jar file
-    currentBuildVersion: 17
+    currentBuildVersion: 21
 jobs:
   build:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
         operating-system: [ubuntu-latest, macOS-latest, windows-latest]
         # Use both LTS releases and latest one for tests
-        jdk: [ 17, 19 ]
+        jdk: [ 21, 23 ]
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4
@@ -59,6 +59,6 @@ jobs:
     - name: Build with Gradle (JDK ${{ env.currentBuildVersion }})
       run: ./gradlew clean check jacocoTestReport
     - name: Codecov
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         files: ./build/reports/jacoco/test/jacocoTestReport.xml #optional
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-## [1.4.4]  2024-08-20
+## [2.0.0] - 2024-11-29
+
+### Added
+- REST API V2
+
+### Changed
+- DataCite is now supported as administrative metadata (API V2)
+- Update to Java 21
+- Update dependency gradle to v8.11.1
+- Update rabbitmq Docker tag to v4
+- Update eclipse-temurin Docker tag to v23
+
+### Libs
+- Update dependency ajv to v8.17.1
+- Update dependency com.google.errorprone:error_prone_core to v2.36.0
+- Update dependency com.networknt:json-schema-validator to v1.5.4
+- Update dependency commons-io:commons-io to v2.18.0
+- Update dependency edu.kit.datamanager:repo-core to v1.2.3
+- Update dependency edu.kit.datamanager:service-base to v1.3.2
+- Update plugin io.freefair.lombok to v8.11
+- Update plugin io.freefair.maven-publish-java to v8.11
+- Update dependency jacoco to v0.8.12
+- Update dependency org.javers:javers-core to v7.7.0
+- Update plugin net.ltgt.errorprone to v4.1.0
+- Update dependency org.apache.tika:tika-core to v3
+- Update plugin org.owasp.dependencycheck to v11
+- Update dependency org.mockito:mockito-core to v5.14.2
+- Bump org.postgresql:postgresql from 42.7.3 to 42.7.4
+- Update plugin org.springframework.boot to v3.3.6
+- Update dependency org.springframework.data:spring-data-elasticsearch to v5.4.0
+- Update dependency org.springframework.restdocs:spring-restdocs-mockmvc to v3.0.3
+- Update dependency org.springframework:spring-messaging to v6.2.0
+- Update dependency org.springframework.cloud:spring-cloud-gateway-mvc to v4.1.6
+- Update dependency org.springframework.cloud:spring-cloud-starter-config to v4.1.3
+- Update dependency org.springframework.cloud:spring-cloud-starter-netflix-eureka-client to v4.1.4
+- Bump org.springframework.data:spring-data-elasticsearch from 5.3.3 to 5.3.4.
+
+### Deprecated
+- API V1
+
+## [1.4.4] - 2024-08-20
 
 ### Changed
 - Bump gradle from 8.7 to 8.8. 
@@ -92,7 +132,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Switch to GitHub Packages.
-- Loge for SCC (Scientific Computing Centre)
+- Logo for SCC (Scientific Computing Centre)
 
 ### Libs
 - Bump com.google.errorprone:error_prone_core from 2.24.0 to 2.24.1
@@ -487,7 +527,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Registry for XSD files and support for XML metadata
 
-[Unreleased]: https://github.com/kit-data-manager/metastore2/compare/v1.4.4...HEAD
+[Unreleased]: https://github.com/kit-data-manager/metastore2/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/kit-data-manager/metastore2/compare/v1.4.4...v2.0.0
 [1.4.4]: https://github.com/kit-data-manager/metastore2/compare/v1.4.3...v1.4.4
 [1.4.3]: https://github.com/kit-data-manager/metastore2/compare/v1.4.2...v1.4.3
 [1.4.2]: https://github.com/kit-data-manager/metastore2/compare/v1.4.1...v1.4.2

diff --git a/CITATION.cff b/CITATION.cff
@@ -19,8 +19,8 @@ authors:
 title: "MetaStore"
 type: software
 abstract: MetaStore is a research data repository software for storing metadata documents and schemas. Quality and consistency are ensured by associating and validating each document against a schema. It supports JSON and XML.
-version: 1.4.4
-date-released: 2024-08-20
+version: 2.0.0
+date-released: 2024-11-29
 doi: 10.5281/zenodo.7685007
 url: "https://github.com/kit-data-manager/metastore2"
 repository-code:  "https://github.com/kit-data-manager/metastore2"

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ARG SERVICE_ROOT_DIRECTORY_DEFAULT=/spring/
 ####################################################
 # Building environment (java & git)
 ####################################################
-FROM eclipse-temurin:17 AS build-env-java
+FROM eclipse-temurin:23 AS build-env-java
 LABEL maintainer=webmaster@datamanager.kit.edu
 LABEL stage=build-env
 
@@ -48,7 +48,7 @@ RUN bash ./build.sh $SERVICE_DIRECTORY
 ####################################################
 # Runtime environment 4 metastore2
 ####################################################
-FROM eclipse-temurin:17 AS run-service-metastore2
+FROM eclipse-temurin:23 AS run-service-metastore2
 LABEL maintainer=webmaster@datamanager.kit.edu
 LABEL stage=run
 

diff --git a/README.md b/README.md
@@ -186,20 +186,20 @@ To stop and start all services do the following:
 ```
 user@localhost:/home/user/metastore2$ docker compose stop
 [+] Running 6/6
- ⠿ Container dockercompose-my-apache-1  Stopped                            1.5s
- ⠿ Container indexing4metastore         Stopped                           13.2s
- ⠿ Container dockercompose-dps-1        Stopped                            0.3s
+ ⠿ Container frontend.docker            Stopped                            1.5s
  ⠿ Container metastore.docker           St...                             13.1s
- ⠿ Container rabbitmq4indexing          S...                               6.5s
- ⠿ Container elastic4indexing           St...                              0.8s
+ ⠿ Container indexing.docker            Stopped                            0.3s
+ ⠿ Container metastore2-dps-1           Stopped                           13.2s
+ ⠿ Container rabbitmq.docker            S...                               6.5s
+ ⠿ Container elastic.docker             St...                              0.8s
 user@localhost:/home/user/metastore2$ docker compose start
 [+] Running 6/6
- ⠿ Container dockercompose-dps-1        Started                            0.4s
- ⠿ Container dockercompose-my-apache-1  Started                            0.6s
- ⠿ Container elastic4indexing           He...                             10.9s
- ⠿ Container rabbitmq4indexing          S...                               0.3s
- ⠿ Container metastore.docker           St...                              0.5s
- ⠿ Container indexing4metastore         Started                            0.5s
+ ⠿ Container frontend.docker     Started                                                                                                                                 0.3s
+ ⠿ Container metastore2-dps-1    Started                                                                                                                                10.5s
+ ⠿ Container elastic.docker      Started                                                                                                                                 0.2s
+ ⠿ Container rabbitmq.docker     Started                                                                                                                                 0.2s
+ ⠿ Container metastore.docker    Started                                                                                                                                 0.2s
+ ⠿ Container indexing.docker     Started                                                                                                                                 0.2s
 user@localhost:/home/user/metastore2$
 ```
 
@@ -236,7 +236,8 @@ user@localhost:/home/user/metastore2$bash /PATH/TO/EMPTY/INSTALLATION/DIRECTORY/
 ## More Information
 
 * [Information about KIT Data Manager 2](https://github.com/kit-data-manager/base-repo)
-* [REST Documentation MetaStore2](restDocu.md) 
+* [REST Documentation MetaStore2 API V1](restDocu.md) 
+* [REST Documentation MetaStore2 API V2](restDocuV2.md) 
 
 ## License
 

diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 plugins { 
-    id 'org.springframework.boot' version '3.3.2'
+    id 'org.springframework.boot' version '3.3.6'
     id 'io.spring.dependency-management' version '1.1.6'
-    id 'io.freefair.lombok' version '8.10'
-    id 'io.freefair.maven-publish-java' version '8.10'
-    id 'org.owasp.dependencycheck' version '10.0.3'
+    id 'io.freefair.lombok' version '8.11'
+    id 'io.freefair.maven-publish-java' version '8.11'
+    id 'org.owasp.dependencycheck' version '11.1.0'
     id 'org.asciidoctor.jvm.convert' version '4.0.3'
-    id 'net.ltgt.errorprone' version '4.0.1'
+    id 'net.ltgt.errorprone' version '4.1.0'
     id 'net.researchgate.release' version '3.0.2'
     id 'com.gorylenko.gradle-git-properties' version '2.4.2'
     id 'java'
@@ -18,9 +18,9 @@ group = 'edu.kit.datamanager'
 ext {
     // versions of dependencies
     springDocVersion  = '2.6.0'
-    javersVersion     = '7.6.1'
+    javersVersion     = '7.7.0'
     keycloakVersion   = '19.0.0'
-    errorproneVersion = '2.30.0'
+    errorproneVersion = '2.36.0'
     // directory for generated code snippets during tests
     snippetsDir = file("build/generated-snippets")
 }
@@ -49,8 +49,8 @@ if (System.getProperty('profile') == 'minimal') {
 
 dependencies {
     // Spring
-    implementation 'org.springframework:spring-messaging:6.1.1'
-    implementation 'org.springframework.cloud:spring-cloud-gateway-mvc:4.1.5'
+    implementation 'org.springframework:spring-messaging:6.2.0'
+    implementation 'org.springframework.cloud:spring-cloud-gateway-mvc:4.1.6'
 
     // Spring Boot
     implementation "org.springframework.boot:spring-boot-starter-data-rest"
@@ -65,12 +65,12 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-mail"
 
     // JSON Parser for Metadata Editor
-    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
+    implementation "com.googlecode.json-simple:json-simple:1.1.1"
 
 
     // cloud support
-    implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.2"
-    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.2"
+    implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.4"
+    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.4"
 
     // springdoc
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}"
@@ -94,40 +94,41 @@ dependencies {
     implementation "org.javers:javers-core:${javersVersion}"
 
     // driver for postgres
-    implementation "org.postgresql:postgresql:42.7.3"
+    implementation "org.postgresql:postgresql:42.7.4"
     //driver for h2
     implementation "com.h2database:h2:2.3.232"
 
     // apache
-    implementation "commons-io:commons-io:2.16.1"
-    implementation "org.apache.tika:tika-core:2.9.2"
+    implementation "commons-io:commons-io:2.18.0"
+    implementation "org.apache.tika:tika-core:3.0.0"
 
     // JSON validator
-    implementation "com.networknt:json-schema-validator:1.5.1"
+    implementation "com.networknt:json-schema-validator:1.5.4"
 
     // XML validator // https://mvnrepository.com/artifact/xerces/xercesImpl
-    implementation 'xerces:xercesImpl:2.12.2'
+    implementation "xerces:xercesImpl:2.12.2"
 
     // datamanager
-    implementation "edu.kit.datamanager:repo-core:1.2.2"
-    implementation "edu.kit.datamanager:service-base:1.3.1"
+    implementation "edu.kit.datamanager:repo-core:1.2.3"
+    implementation "edu.kit.datamanager:service-base:1.3.2"
 
     // elasticsearch (since service-base 1.1.0)
-    implementation "org.springframework.data:spring-data-elasticsearch:5.3.3"
+    implementation "org.springframework.data:spring-data-elasticsearch:5.4.0"
 
     // DOIP SDK
     implementation "net.dona.doip:doip-sdk:2.2.0"
 
     runtimeOnly    "org.apache.httpcomponents:httpclient:4.5.14"
 
     // Additional libraries for tests
-    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.0"
+    testImplementation "com.google.guava:guava:33.3.1-jre"
+    testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.3"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.springframework:spring-test"
     testImplementation "org.springframework.security:spring-security-test"
 
     //Java 11 Support 
-    testImplementation "org.mockito:mockito-core:5.12.0"
+    testImplementation "org.mockito:mockito-core:5.14.2"
     testImplementation "junit:junit:4.13.2"
     testImplementation "com.github.stefanbirkner:system-lambda:1.2.1"
 
@@ -165,7 +166,7 @@ tasks.withType(Test) {
 }
 
 jacoco {
-    toolVersion = "0.8.10"
+    toolVersion = "0.8.12"
 }
 
 import java.text.SimpleDateFormat

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,14 +13,16 @@ services:
         ipv4_address: 172.0.0.10
   my-apache:
     image: ${PREFIX4DOCKER}/frontend-collection-metastore:${FRONTEND_COLLECTION_VERSION}
-    container_name: my_apache
+    container_name: frontend.docker
+    hostname: frontend.docker
     ports:
      - "80:80"
     networks:
       - dps
   elasticsearch:
     image: elasticsearch:${ELASTICSEARCH_VERSION}
-    container_name: elastic4indexing
+    container_name: elastic.docker
+    hostname: elastic.docker
     environment:
       - discovery.type=single-node
       - xpack.security.enabled=false
@@ -38,10 +40,11 @@ services:
     networks:
       - dps
   rabbitmq:
-    image: rabbitmq:3-management
+    image: rabbitmq:4-management
     depends_on:
       - elasticsearch
-    container_name: rabbitmq4indexing
+    container_name: rabbitmq.docker
+    hostname: rabbitmq.docker
     environment:
       - HOSTNAMES=rabbitmq.docker
       - RABBITMQ_DEFAULT_USER=${RABBIT_MQ_USER}
@@ -53,7 +56,8 @@ services:
       - dps
   indexing-service:
     image: ${PREFIX4DOCKER}/indexing-service:${INDEXING_SERVICE_VERSION}
-    container_name: indexing4metastore
+    container_name: indexing.docker
+    hostname: indexing.docker
     environment:
       - REPO_MESSAGING_USERNAME=${RABBIT_MQ_USER}
       - REPO_MESSAGING_PASSWORD=${RABBIT_MQ_PASSWORD}
@@ -72,6 +76,7 @@ services:
   metastore:
     image: ${PREFIX4DOCKER}/metastore2:${METASTORE_VERSION}
     container_name: metastore.docker
+    hostname: metastore.docker
     environment:
       - HOSTNAMES=metastore.docker
       - REPO_SEARCH_ENABLED=true