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

Prepare next release
kit-data-manager · Dec 19, 2023 · de64e1b · de64e1b
2 parents 6dfe4b3 + 2fd6fe6
commit de64e1b
Show file tree

Hide file tree

Showing 65 changed files with 3,319 additions and 1,061 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,3 @@
+RABBIT_MQ_USER=rabbituser
+RABBIT_MQ_PASSWORD=rabbitpasswd
+
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -5,14 +5,16 @@ on:
   push:
     # Publish `master` as Docker `latest` image.
     branches:
-      - master, main
+      - main
 
     # Publish `v1.2.3` tags as releases.
     tags:
       - v*
 
-  # Run tests for any PRs.
+  # Run tests for PRs on main branch only.
   pull_request:
+    branches:
+      - main
 
 env:
   # TODO: Change variable to your image's name.
@@ -25,10 +27,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up OpenJDK version ...
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu' 
           java-version: 17
@@ -46,7 +48,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build image
         run: |
@@ -71,29 +73,29 @@ jobs:
           docker push $IMAGE_ID:$VERSION
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v4
+        uses: crazy-max/ghaction-docker-meta@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
             kitdm/metastore2
           # add git short SHA as Docker tag
           tag-sha: true    
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}  
 
       - name: Push to Docker Hub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -22,9 +22,9 @@ jobs:
         jdk: [ 17, 19 ]
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up OpenJDK version ...
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu' 
         java-version: ${{ matrix.jdk }}
@@ -48,9 +48,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up OpenJDK version ...
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu' 
         java-version: ${{ env.currentBuildVersion }}

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,7 @@ nbproject
 build
 config
 nbproject
+
+# Ignore VS Code
+bin/
+.vscode/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,13 +13,71 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [1.4.0] - 2023-12-19
+### Security
+
+### Added
+- Add internal landing page
+- Add configuration for redirecting landing page also to external site.
+- Enable authentication for RabbitMQ (#430)
+- 
+### Fixed
+- Filter for rescourceId AND schemaId instead of OR (#401)
+
+### Changed
+- Use softlink to jar file in start script.
+- Refine return messages (#309, #402, #403)
+- Check usage of schema before deleting (#
+- Metadata schema identifiers support lowercase only
+#### Github Actions
+- Bump actions/checkout from 3 to 4
+- Bump actions/setup-java from 3 to 4
+- Bump crazy-max/ghaction-docker-meta from 4 to 5
+- Bump docker/build-push-action from 4 to 5
+- Bump docker/login-action from 2 to 3
+- Bump docker/setup-buildx-action from 2 to 3
+- Bump docker/setup-qemu-action from 2 to 3
+- Bump github/codeql-acion from 2 o 3
+- Bump gradle from 7.6.1 to 8.2.1
+- Bump org.mockito:mockito-core from 5.4.0 to 5.7.0
+#### Plugins
+- Bump io.freefair.lombok from 8.1.0 to 8.4
+- Bump io.freefair.maven-publish-java from 8.1.0 to 8.4 
+- Bump org.owasp.dependencycheck from 8.3.1 to 9.0.7
+- Bump io.spring.dependency-management from 1.1.0 to 1.1.4
+#### Libs
+- Bump edu.kit.datamanager:indexing-service from 0.9.0 to 1.0.0
+- Bump com.networknt:json-schema-validator from 1.0.88 to 1.1.0
+- Bump com.networknt:json-schema-validator from 1.0.87 to 1.0.88
+- Bump com.google.errorprone:error_prone_core from 2.20.0 to 2.23.0
+- Bump com.h2database:h2 from 2.1.214 to 2.2.224
+- Bump com.networknt:json-schema-validator from 1.0.85 to 1.1.0
+- Bump commons-io:commons-io from 2.13.0 to 2.15.1
+- Bump org.apache.tika:tika-core from 2.8.0 to 2.9.1
+- Bump org.javers:javers-core from 7.0.0 to 7.3.6
+- Bump org.javers:javers-spring-boot-starter-sql from 7.0.0 to 7.3.6
+- Bump org.postgresql:postgresql from 42.6.0 to 42.7.1
+- Bump org.springdoc:springdoc-openapi-starter-common from 2.1.0 to 2.3.0
+- Bump org.springdoc:springdoc-openapi-starter-webmvc-api from 2.1.0 to 2.3.0
+- Bump org.springdoc:springdoc-openapi-starter-webmvc-ui from 2.1.0 to 2.3.0
+- Bump org.springframework:spring-messaging from 6.0.2 to 6.1.1
+- Bump org.springframework:spring-cloud-gateway-mvc from 4.0.6 to 4.1.0
+- Bump org.springframework:spring-cloud-starter-config from 4.0.3 to 4.1.0
+- Bump org.springframework:spring-cloud-starter-netflix-eureka-client from 4.0.2 to 4.1.0
+- Bump org.springframework.boot from 3.1.0 to 3.2.0 
+- Bump org.springframework.data:spring-data-elasticsearch from 5.1.0 to 5.2.1 
+- Bump org.apache.commons:commons-text from 1.10.0 to 1.11.0
+
 ## [1.3.0] - 2023-07-07
 ### Security
 
 ### Added
 - Add context path 'metastore' as default. 
 - Add support for JSON schema 2020-12.
 
+### Fixed
+- Fixed: allowing empty SID in ACLs.
+
 ### Changed
 - Bump JDK from 8 to 17.
 - Bump actions/setup-java from 2 to 3
@@ -39,15 +97,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump org.springframework.restdocs:spring-restdocs-mockmvc from 2.0.7.RELEASE to 3.0.0
 - Bump springDocVersion from 1.7.0 to 2.1.0
 
-### Fixed
-- Fixed: allowing empty SID in ACLs.
-
 ## [1.2.3] - 2023-04-13
 ### Added
 - Add CITATION.cff
 - Allow cli arguments for start script.
 - Enable configuration to organize internal storage of metadata documents (https://github.com/kit-data-manager/metastore2/issues/241)
 
+### Fixed
+- Providing (invalid) version number while updating schema document may break old versions. (https://github.com/kit-data-manager/metastore2/issues/245)
+- Trace log may slow down service. (https://github.com/kit-data-manager/metastore2/issues/233)
+- Calling REST-Endpoint for UI fails if no page information is provided. (https://github.com/kit-data-manager/metastore2/issues/264)
+- Problem running MetaStore standalone in a docker container. (https://github.com/kit-data-manager/metastore2/issues/270)
+
 ### Changed
 - Update several badges
 - Bump com.networknt:json-schema-validator from 1.0.78 to 1.0.79
@@ -65,12 +126,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump org.springframework:spring-messaging from 5.3.25 to 5.3.26
 - Bump springDocVersion from 1.6.14 to 1.7.0
 
-### Fixed
-- Providing (invalid) version number while updating schema document may break old versions. (https://github.com/kit-data-manager/metastore2/issues/245)
-- Trace log may slow down service. (https://github.com/kit-data-manager/metastore2/issues/233)
-- Calling REST-Endpoint for UI fails if no page information is provided. (https://github.com/kit-data-manager/metastore2/issues/264)
-- Problem running MetaStore standalone in a docker container. (https://github.com/kit-data-manager/metastore2/issues/270)
-
 ## [1.2.2] - 2023-02-28
 ### Fixed
 - Add configuration to use the service behind a proxy. (https://github.com/kit-data-manager/metastore2/issues/218)
@@ -112,6 +167,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add actuator endpoints for info and health (https://github.com/kit-data-manager/metastore2/issues/184)
 - Add spring-data-elasticsearch 4.4.7
 
+### Fixed
+- Invalid input for resource identifier causes NPE (https://github.com/kit-data-manager/metastore2/issues/198)
+- Hibernate validation was not enabled by default. (https://github.com/kit-data-manager/metastore2/issues/191)
+- Check metadata directory for valid entry during startup (https://github.com/kit-data-manager/metastore2/issues/185)
+
 ### Changed
 - Bump commons-text from 1.9 to 1.10.0
 - Bump gradle from 7.5.1 to 7.6
@@ -138,11 +198,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump tika-core from 1.2.7 to 2.6.0 
 - Bump xercesImpl from 2.12.1 to 2.12.2 
 
-### Fixed
-- Invalid input for resource identifier causes NPE (https://github.com/kit-data-manager/metastore2/issues/198)
-- Hibernate validation was not enabled by default. (https://github.com/kit-data-manager/metastore2/issues/191)
-- Check metadata directory for valid entry during startup (https://github.com/kit-data-manager/metastore2/issues/185)
-
 ## [1.1.0] - 2022-10-17
 ### Security
 - Switch to 'eclipse-temurin' for docker due to end of support for 'openjdk'.
@@ -177,10 +232,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Please migrate your database if you want to update MetaStore while using h2!
     See: https://h2database.com/html/migration-to-v2.html 
 
-### Changed
-- Update to service-base 1.0.3
-- Changed some labels in GUI
-
 ### Fixed
 - Docker: Add support for M1 chip architecture (https://github.com/kit-data-manager/metastore2/issues/107)
 - Access public documents of other users is broken.(https://github.com/kit-data-manager/metastore2/issues/100)
@@ -189,20 +240,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix bugs using Swagger UI for REST calls.
 - Fix typos in documentation.
 
+### Changed
+- Update to service-base 1.0.3
+- Changed some labels in GUI
+
 ## [1.0.0] - 2022-03-29
 ### Added
 - Finalized version of MetaStoreGui
   - Fix https://github.com/kit-data-manager/metastore2/issues/69
 - Allow also IDs for metadata documents (https://github.com/kit-data-manager/metastore2/issues/76)
 - Access filter for monitoring.
 
-### Changed
-- Update to repo-core 1.0.2
-- Update to service-base 1.0.1
-- Update to postgresql 42.2.25
-- Downgrade library due to some issues regarding validation
-  - json-schema-validator 1.0.64. -> 1.0.59 (https://github.com/kit-data-manager/metastore2/issues/77)
-
 ### Fixed
 - Fix bug listing resources without proper authorization (https://github.com/kit-data-manager/metastore2/issues/71)
 - Fix bug listing all metadata documents related to a specific schema
@@ -212,6 +260,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Check ACLs while creating/updating records (https://github.com/kit-data-manager/metastore2/issues/39)
 - Added missing spaces to swagger-ui.
 
+### Changed
+- Update to repo-core 1.0.2
+- Update to service-base 1.0.1
+- Update to postgresql 42.2.25
+- Downgrade library due to some issues regarding validation
+  - json-schema-validator 1.0.64. -> 1.0.59 (https://github.com/kit-data-manager/metastore2/issues/77)
+
 ## [0.3.7] - 2022-01-11
 ### Added
 - First version of GUI for MetaStore.
@@ -273,15 +328,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Metadata (schema) records now also versioned.
 - OAI PMH protocol added (https://github.com/kit-data-manager/metastore2/issues/6)
 - Customization is enabled even if framework will be started via docker (https://github.com/kit-data-manager/metastore2/issues/41)
-### Changed
-- Metadata are now linked to specific version of a schema. (https://github.com/kit-data-manager/metastore2/issues/30)
-- Attribute 'locked' from MetadataSchemaRecord changed to 'doNotSync' (https://github.com/kit-data-manager/metastore2/issues/37)
-- Change in related schema and data (add identifier type to identifier)
-- Store all identifiers as global identifiers (type INTERNAL -> type URL)
-- For registering a schema mimetype is no longer mandatory.
-- Switch to gradle version 7.2
-- Update to Spring Boot 2.4.10
-- Update to service-base version 0.3.0
+
 ### Fixed
 - Filtering metadata documents by resourceId, schemaId
 - Filtering schema documents by mimetype
@@ -292,6 +339,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add hash of schema documents to record. (https://github.com/kit-data-manager/metastore2/issues/38)
 - Drop tables at startup (default).
 
+### Changed
+- Metadata are now linked to specific version of a schema. (https://github.com/kit-data-manager/metastore2/issues/30)
+- Attribute 'locked' from MetadataSchemaRecord changed to 'doNotSync' (https://github.com/kit-data-manager/metastore2/issues/37)
+- Change in related schema and data (add identifier type to identifier)
+- Store all identifiers as global identifiers (type INTERNAL -> type URL)
+- For registering a schema mimetype is no longer mandatory.
+- Switch to gradle version 7.2
+- Update to Spring Boot 2.4.10
+- Update to service-base version 0.3.0
+
 ## [0.2.4] - date 2020-12-16
 ### Added
 - Support for messaging
@@ -338,7 +395,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.3.0...HEAD
+[Unreleased]: https://github.com/kit-data-manager/metastore2/compare/v1.4.0...HEAD
+[1.4.0]: https://github.com/kit-data-manager/metastore2/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/kit-data-manager/metastore2/compare/v1.2.3...v1.3.0
 [1.2.3]: https://github.com/kit-data-manager/metastore2/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/kit-data-manager/metastore2/compare/v1.2.1...v1.2.2