Merge pull request #277 from VolkerHartmann/development

Prepare release version 1.2.3

CHANGELOG.md

@@ -13,6 +13,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [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)
+
+### Changed
+- Update several badges
+- Bump com.networknt:json-schema-validator from 1.0.78 to 1.0.79
+- Bump edu.kit.datamanager:repo-core from 1.1.1 to 1.1.2
+- Bump edu.kit.datamanager:service-base from 1.1.0 to 1.1.1 
+- Bump gradle from 7.6 to 7.6.1.
+- Bump io.freefair.maven-publish-java from 6.6.3 to 8.0.1 
+- Bump io.freefair.lombok from 6.6.3 to 8.0.1 
+- Bump javersVersion from 6.11.0 to 6.14.0 
+- Bump org.mockito:mockito-core from 5.1.1 to 5.3.0 
+- Bump org.owasp.dependencycheck from 8.1.0 to 8.2.1
+- Bump org.postgresql:postgresql from 42.5.4 to 42.6.0 
+- Bump org.springframework.boot from 2.7.9 to 2.7.10
+- Bump org.springframework.cloud:spring-cloud-starter-config from 3.1.5 to 3.1.6.
+- Bump org.springframework.data:spring-data-elasticsearch from 4.4.8 to 4.4.10.
+- 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)
@@ -280,7 +310,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.2.2...HEAD
+[Unreleased]: https://github.com/kit-data-manager/metastore2/compare/v1.2.3...HEAD
+[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
 [1.2.1]: https://github.com/kit-data-manager/metastore2/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/kit-data-manager/metastore2/compare/v1.1.0...v1.2.0

build.gradle

@@ -1,9 +1,9 @@
 plugins { 
-    id 'org.springframework.boot' version '2.7.9'
+    id 'org.springframework.boot' version '2.7.10'
     id 'io.spring.dependency-management' version '1.1.0'
-    id 'io.freefair.lombok' version '6.6.3'
-    id 'io.freefair.maven-publish-java' version '6.6.3'
-    id 'org.owasp.dependencycheck' version '8.1.0'
+    id 'io.freefair.lombok' version '8.0.1'
+    id 'io.freefair.maven-publish-java' version '8.0.1'
+    id 'org.owasp.dependencycheck' version '8.2.1'
     id 'org.asciidoctor.jvm.convert' version '3.3.2'
     id 'net.researchgate.release' version '3.0.2'
     id 'com.gorylenko.gradle-git-properties' version '2.4.1'
@@ -16,8 +16,8 @@ group = 'edu.kit.datamanager'
 
 ext {
     // versions of dependencies
-    springDocVersion  = '1.6.14'
-    javersVersion     = '6.11.0'
+    springDocVersion  = '1.7.0'
+    javersVersion     = '6.14.0'
     keycloakVersion   = '19.0.0'
 
     // directory for generated code snippets during tests
@@ -46,7 +46,7 @@ if (System.getProperty('profile') == 'minimal') {
 
 dependencies {
     // Spring
-    implementation 'org.springframework:spring-messaging:5.3.25'
+    implementation 'org.springframework:spring-messaging:5.3.26'
     implementation 'org.springframework.cloud:spring-cloud-gateway-mvc:3.1.6'
 
     // Spring Boot
@@ -66,7 +66,7 @@ dependencies {
 
 
     // cloud support
-    implementation "org.springframework.cloud:spring-cloud-starter-config:3.1.5"
+    implementation "org.springframework.cloud:spring-cloud-starter-config:3.1.6"
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:3.1.5"
 
     // springdoc
@@ -98,7 +98,7 @@ dependencies {
     implementation "org.javers:javers-core:${javersVersion}"
 
     // driver for postgres
-    implementation "org.postgresql:postgresql:42.5.4"
+    implementation "org.postgresql:postgresql:42.6.0"
     //driver for h2
     implementation "com.h2database:h2:2.1.214"
 
@@ -107,17 +107,17 @@ dependencies {
     implementation "org.apache.tika:tika-core:2.7.0"
 
     // JSON validator
-    implementation "com.networknt:json-schema-validator:1.0.77"
+    implementation "com.networknt:json-schema-validator:1.0.79"
 
     // XML validator // https://mvnrepository.com/artifact/xerces/xercesImpl
     implementation 'xerces:xercesImpl:2.12.2'
 
     // datamanager
-    implementation "edu.kit.datamanager:repo-core:1.1.1"
-    implementation "edu.kit.datamanager:service-base:1.1.0"
+    implementation "edu.kit.datamanager:repo-core:1.1.2"
+    implementation "edu.kit.datamanager:service-base:1.1.1"
 
     // elasticsearch (since service-base 1.1.0)
-    implementation "org.springframework.data:spring-data-elasticsearch:4.4.8"
+    implementation "org.springframework.data:spring-data-elasticsearch:4.4.10"
 
     // DOIP SDK
     implementation "net.dona.doip:doip-sdk:2.1.0"
@@ -131,8 +131,9 @@ dependencies {
     testImplementation "org.springframework.security:spring-security-test"
 
     //Java 11 Support 
-    testImplementation "org.mockito:mockito-core:5.1.1"
+    testImplementation "org.mockito:mockito-core:5.3.0"
     testImplementation "junit:junit:4.13.2"
+    testImplementation "com.github.stefanbirkner:system-lambda:1.2.1"
 }
 
 compileJava {

build.sh

@@ -87,7 +87,7 @@ testForCommands="chmod cp dirname find java javac mkdir git"
 
 for command in $testForCommands
 do 
-  if ! type $command >> /dev/null; then
+  if ! type "$command" >> /dev/null; then
     echo "Error: command '$command' is not installed!"
     exit 1
   fi
@@ -178,7 +178,7 @@ jarFile=($(ls $REPO_NAME*.jar))
   echo "################################################################################"        
   echo "# Start micro service"                                                                   
   echo "################################################################################"        
-  echo "java -cp \".:\$jarFile\" -Dloader.path=\"file://\$ACTUAL_DIR/\$jarFile,./lib/,.\" -jar \$jarFile"
+  echo "java -cp \".:\$jarFile\" -Dloader.path=\"file://\$ACTUAL_DIR/\$jarFile,./lib/,.\" -jar \$jarFile \$*"
 } > run.sh
 # make script executable
 chmod 755 run.sh

docker-compose.yml

@@ -63,10 +63,12 @@ services:
     networks:
       - dps
   metastore:
-    image: kitdm/metastore2:v1.2.2
+    image: kitdm/metastore2:v1.2.3
     container_name: metastore.docker
     environment:
       - HOSTNAMES=metastore.docker
+      - REPO_SEARCH_ENABLED=true
+      - REPO_MESSAGING_ENABLED=true
     depends_on:
       rabbitmq:
         condition: service_started

docker/buildDocker.sh

@@ -41,7 +41,7 @@ testForCommands="dirname date docker git"
 
 for command in $testForCommands
 do 
-  if ! type $command >> /dev/null; then
+  if ! type "$command" >> /dev/null; then
     echo "Error: command '$command' is not installed!"
     exit 1
   fi
@@ -55,7 +55,7 @@ ACTUAL_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 ################################################################################
 # Determine repo name 
 ################################################################################
-REPO_NAME=$($ACTUAL_DIR/../gradlew -q printProjectName)
+REPO_NAME=$("$ACTUAL_DIR"/../gradlew -q printProjectName)
 # Use only last line
 REPO_NAME=${REPO_NAME##*$'\n'}
 
@@ -80,14 +80,14 @@ else
   TAG_NAME=$LAST_TAG-$(date -u +%Y-%m-%d)
 fi
 
-cd $ACTUAL_DIR/.. || { echo "Failure changing to directory $ACTUAL_DIR/.."; exit 1; }
+cd "$ACTUAL_DIR"/.. || { echo "Failure changing to directory $ACTUAL_DIR/.."; exit 1; }
 
 ################################################################################
 # Build local docker
 ################################################################################
-printInfo Build docker container kitdm/$REPO_NAME:$TAG_NAME 
+printInfo Build docker container kitdm/"$REPO_NAME":"$TAG_NAME" 
 
-if ! docker build -t kitdm/$REPO_NAME:$TAG_NAME .; then
+if ! docker build -t kitdm/"$REPO_NAME":"$TAG_NAME" .; then
   echo .
   printInfo "ERROR while building docker container!"
   usage

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%