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

PR for v1.1.0

Author: ThomasJejkal

CHANGELOG.md

@@ -18,6 +18,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [1.1.0] - 2023-01-11
+
+### Security
+
+### Changed
+- Listing resources now keeps ACL information in resources, on which the caller has ADMINISTRATE permissions
+- Bump commons-text from 1.9 to 1.10.0 
+- Bump service-base from 1.0.5 to 1.1.0
+- Bump jaxb-core from 4.0.0 to 4.0.1 
+- Bump io.spring.dependency-management from 1.0.13.RELEASE to 1.0.14.RELEASE.
+- Bump spring-boot-admin-starter-client from 2.7.5 to 2.7.10
+- Bump io.spring.dependency-management from 1.0.14.RELEASE to 1.1.0
+- Bump org.owasp.dependencycheck from 7.2.1 to 7.4.1 
+- Bump springDocVersion from 1.6.11 to 1.6.14
+- Bump javers-spring-boot-starter-sql from 6.7.1 to 6.8.2
+- Bump jackson-jaxrs-json-provider from 2.13.4 to 2.14.0 
+- Bump jackson-datatype-joda from 2.13.4 to 2.14.0
+- Bump tika-core from 2.5.0 to 2.6.0 
+- Bump spring-boot-dependencies from 2.7.4 to 2.7.7
+- Bump gson from 2.9.1 to 2.10 
+- Bump postgresql from 42.5.0 to 42.5.1
+- Bump jackson-datatype-joda from 2.14.0 to 2.14.1 
+- Bump jackson-jaxrs-json-provider from 2.14.0 to 2.14.1
+- Update gradle from 7.2 to 7.6
+
+### Added
+
+### Fixed
+
+### Deprecated
+
+### Removed
+
 ## [1.0.4] - 2022-10-13
 
 ### Changed
@@ -141,7 +174,8 @@ Extracted from the 'base-repo' project.
 ### Removed
 - none
 
-[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.0.4...HEAD
+[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/kit-data-manager/repo-core/compare/v1.0.4...v1.1.0
 [1.0.4]: https://github.com/kit-data-manager/repo-core/compare/v1.0.3...v1.0.4
 [1.0.3]: https://github.com/kit-data-manager/repo-core/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/kit-data-manager/repo-core/compare/v1.0.1...v1.0.2

build.gradle

@@ -16,9 +16,9 @@
 plugins { 
     id "io.freefair.lombok" version "6.5.1"
     id "io.freefair.maven-publish-java" version "6.5.1"
-    id "io.spring.dependency-management" version "1.0.13.RELEASE" 
+    id "io.spring.dependency-management" version "1.1.0" 
     //id "com.github.kt3k.coveralls" version "2.8.1" 
-    id "org.owasp.dependencycheck" version "7.2.1"
+    id "org.owasp.dependencycheck" version "7.4.1"
     id "org.asciidoctor.jvm.convert" version "3.3.2"
     //id "org.ajoberstar.grgit" version "2.0.1"
     id "com.jfrog.bintray" version "1.8.5"
@@ -30,10 +30,12 @@ plugins {
     id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
     id 'maven-publish'
 }
-ext { 
-    springBootVersion = '2.7.4' 
-    springDocVersion  = '1.6.11'
-    javersVersion     = '6.7.1'
+
+ext {
+    // versions of dependencies
+    springBootVersion = '2.7.7'
+    springDocVersion  = '1.6.14'
+    javersVersion     = '6.8.2'
 }
 
 description = "Core module for data repositories based on metadata model of datacite."
@@ -50,6 +52,7 @@ jar {
 println "Building ${name} version: ${version}"
 println "Running gradle version: $gradle.gradleVersion"
 println "JDK version: ${JavaVersion.current()}"
+println "Spring Boot version: ${springBootVersion}"
 
 repositories {
     mavenLocal() 
@@ -75,6 +78,8 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
+    implementation 'org.springframework.data:spring-data-elasticsearch:4.4.6'
+
 
     // springdoc
     implementation "org.springdoc:springdoc-openapi-ui:${springDocVersion}"
@@ -85,44 +90,40 @@ dependencies {
     implementation "commons-io:commons-io:2.11.0"
     implementation "org.apache.commons:commons-collections4:4.4"
     // includes commons-lang3
-    implementation "org.apache.commons:commons-text:1.9"
+    implementation "org.apache.commons:commons-text:1.10.0"
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    implementation "org.apache.tika:tika-core:2.5.0"
+    implementation "org.apache.tika:tika-core:2.6.0"
     // javers
     implementation "org.javers:javers-spring-boot-starter-sql:${javersVersion}"
-    implementation "com.google.code.gson:gson:2.9.1"
+    implementation "com.google.code.gson:gson:2.10"
 
     // Database
     implementation "com.h2database:h2:2.1.214"
-    implementation "org.postgresql:postgresql:42.5.0"
+    implementation "org.postgresql:postgresql:42.5.1"
     // XML
-    implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.4"
+    implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.1"
     implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.13.4"
 
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4"
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.13.4"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.14.1"
 
     //implementation "com.monitorjbl:spring-json-view:1.0.1"
 
-    implementation "de.codecentric:spring-boot-admin-starter-client:2.7.5"
+    implementation "de.codecentric:spring-boot-admin-starter-client:2.7.10"
 
     //Java 11 Support 
     implementation "javax.xml.bind:jaxb-api:2.3.1"
-    implementation "com.sun.xml.bind:jaxb-core:4.0.0"
+    implementation "com.sun.xml.bind:jaxb-core:4.0.1"
     implementation "com.sun.xml.bind:jaxb-impl:4.0.1"
     implementation "javax.activation:activation:1.1.1"
     implementation "org.javassist:javassist:3.29.2-GA"
 
-    implementation "edu.kit.datamanager:service-base:1.0.5"
+    implementation "edu.kit.datamanager:service-base:1.1.0"
     //implementation "edu.kit.datamanager:generic-message-consumer:0.2.0"
 
     implementation "com.github.java-json-tools:json-patch:1.13"
     implementation "com.github.dozermapper:dozer-core:6.5.2"
 
-    // Logging
-    implementation "org.slf4j:slf4j-api:1.7.36"
-    implementation "ch.qos.logback:logback-classic:1.2.11"
-
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.springframework:spring-test"
      // boot starter
@@ -132,9 +133,7 @@ dependencies {
     testImplementation "org.springframework.security:spring-security-test"
 
     //Java 11 Support 
-    testImplementation "org.mockito:mockito-core:3.12.0"
-    testImplementation "org.powermock:powermock-module-junit4:2.0.9"
-    testImplementation "org.powermock:powermock-api-mockito2:2.0.9"
+    testImplementation "org.mockito:mockito-inline:4.8.1"
 
 //    testImplementation 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.9.2'
 //    asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor:2.0.4.RELEASE'

gradle.properties

@@ -1,6 +1,10 @@
 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
 
+//-----------------------------
+// Properties for build.gradle
+//-----------------------------
 version=1.0.5-SNAPSHOT
+
 action.custom-1=install
 action.custom-1.args=--configure-on-demand -w -x check publishToMavenLocal
 action.custom-2=jacoco

gradle/wrapper/gradle-wrapper.jar

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