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

Prepare for next release

Author: VolkerHartmann

.github/dependabot.yml

@@ -5,3 +5,9 @@ updates:
     target-branch: "development"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "development"
+    schedule:
+      interval: "weekly"

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    # Initialize minimum JDK version
+    - name: Setup Java JDK
+      uses: actions/setup-java@v1.4.4
+      with:
+        distribution: zulu
+        java-version: 17
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +60,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@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +74,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/gradle.yml

@@ -11,15 +11,15 @@ on:
 
 env:
     # JDK version used for building jar file
-    currentBuildVersion: 8
+    currentBuildVersion: 17
 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: [ 8, 11, 16 ]
+        jdk: [ 17, 19 ]
     steps:
     - name: Checkout repo
       uses: actions/checkout@v2

.github/workflows/publishRelease.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
       - name: Publish package
         run: ./gradlew -Prelease publishToSonatype closeAndReleaseSonatypeStagingRepository

CHANGELOG.md

@@ -18,6 +18,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [1.2.0] - 2023-06-27
+
+### Changed
+- At least JDK 17 is now required.
+- Bump some github actions from 2 to 3.
+- Bump org.springframework.boot:spring-boot-dependencies from 2.7.7 to 3.1.0.
+- Bump gradle from 7.6.1 to 8.1.1. 
+- Bump service-base from 1.1.1 to 1.2.0.
+- Bump JaVers from 6.14.0 to 7.0.0.
+
+### Added
+
+### Fixed
+- Add check for empty ACL SID.
+
+### Deprecated
+
+### Removed
+
 ## [1.1.2] - 2023-03-17
 
 ### Changed
@@ -223,7 +242,8 @@ Extracted from the 'base-repo' project.
 ### Removed
 - none
 
-[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/kit-data-manager/repo-core/compare/v1.1.2...v1.2.0
 [1.1.2]: https://github.com/kit-data-manager/repo-core/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/kit-data-manager/repo-core/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/kit-data-manager/repo-core/compare/v1.0.4...v1.1.0

README.md

@@ -15,7 +15,7 @@ and general purpose implementations, e.g. helpers and exceptions.
 
 In order to build this module you'll need:
 
-* Java SE Development Kit 11 or higher
+* Java SE Development Kit 17 or higher
 
 After obtaining the sources change to the folder where the sources are located and call:
 
@@ -39,14 +39,14 @@ Instead of using a local build you may also use the most recent version from the
 <dependency>
     <groupId>edu.kit.datamanager</groupId>
     <artifactId>repo-core</artifactId>
-    <version>1.1.2</version>
+    <version>1.2.0</version>
 </dependency>
 ~~~~
 
 ### Gradle (short)
 
 ~~~~
-    implementation "edu.kit.datamanager:repo-core:1.1.2"
+    implementation "edu.kit.datamanager:repo-core:1.2.0"
 ~~~~
 
 ## License

build.gradle

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 plugins { 
-    id "io.freefair.lombok" version "6.6.1"
-    id "io.freefair.maven-publish-java" version "6.5.1"
+    id "io.freefair.lombok" version "8.0.1"
+    id "io.freefair.maven-publish-java" version "8.0.1"
     id "io.spring.dependency-management" version "1.1.0" 
     //id "com.github.kt3k.coveralls" version "2.8.1" 
-    id "org.owasp.dependencycheck" version "7.4.1"
+    id "org.owasp.dependencycheck" version "8.3.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"
@@ -27,22 +27,22 @@ plugins {
     // plugins for release and publishing to maven repo
     id "signing"
     id "net.researchgate.release" version "3.0.2"
-    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
+    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
     id 'maven-publish'
 }
 
 ext {
     // versions of dependencies
-    springBootVersion = '2.7.7'
-    springDocVersion  = '1.6.14'
-    javersVersion     = '6.8.2'
+    springBootVersion = '3.1.0'
+    springDocVersion  = '2.1.0'
+    javersVersion     = '7.0.1'
 }
 
 description = "Core module for data repositories based on metadata model of datacite."
 group = 'edu.kit.datamanager'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.17
+targetCompatibility = 1.17
 
 jar {
     archiveBaseName = 'repo-core'
@@ -70,55 +70,57 @@ if (project.hasProperty('release')) {
 
 dependencies {
     // Spring
-    implementation 'org.springframework:spring-messaging:5.3.23'
+    implementation 'org.springframework:spring-messaging:6.0.2'
     // Spring Boot
     implementation "org.springframework.boot:spring-boot-starter-data-rest"
     implementation "org.springframework.boot:spring-boot-starter-amqp"
     implementation "org.springframework.boot:spring-boot-starter-web"
     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'
+    implementation 'org.springframework.data:spring-data-elasticsearch:5.1.0'
 
 
     // springdoc
-    implementation "org.springdoc:springdoc-openapi-ui:${springDocVersion}"
-    implementation "org.springdoc:springdoc-openapi-data-rest:${springDocVersion}"
-    implementation "org.springdoc:springdoc-openapi-webmvc-core:${springDocVersion}"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}"
+    implementation "org.springdoc:springdoc-openapi-starter-common:${springDocVersion}"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:${springDocVersion}"
     // apache
     implementation "commons-configuration:commons-configuration:1.10"
-    implementation "commons-io:commons-io:2.11.0"
+    implementation "commons-io:commons-io:2.13.0"
     implementation "org.apache.commons:commons-collections4:4.4"
     // includes commons-lang3
     implementation "org.apache.commons:commons-text:1.10.0"
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    implementation "org.apache.tika:tika-core:2.6.0"
+    implementation "org.apache.tika:tika-core:2.8.0"
     // javers
     implementation "org.javers:javers-spring-boot-starter-sql:${javersVersion}"
     implementation "com.google.code.gson:gson:2.10.1"
 
     // Database
     implementation "com.h2database:h2:2.1.214"
-    implementation "org.postgresql:postgresql:42.5.1"
+    implementation "org.postgresql:postgresql:42.6.0"
     // XML
-    implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.2"
-    implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.13.4"
+    implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2"
+    implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.15.2"
 
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4"
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.14.1"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.15.2"
 
     //implementation "com.monitorjbl:spring-json-view:1.0.1"
 
-    implementation "de.codecentric:spring-boot-admin-starter-client:2.7.10"
-
+    implementation "de.codecentric:spring-boot-admin-starter-client:3.0.4"
+    // log4j core
+    implementation "org.apache.logging.log4j:log4j-core"
+    implementation "ch.qos.logback:logback-classic"
     //Java 11 Support 
-    implementation "javax.xml.bind:jaxb-api:2.3.1"
-    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 "javax.xml.bind:jaxb-api:2.3.1"
+//    implementation "com.sun.xml.bind:jaxb-core:4.0.2"
+//    implementation "com.sun.xml.bind:jaxb-impl:4.0.2"
+//    implementation "javax.activation:activation:1.1.1"
+//    implementation "org.javassist:javassist:3.29.2-GA"
 
-    implementation "edu.kit.datamanager:service-base:1.1.1"
+    implementation "edu.kit.datamanager:service-base:1.2.0"
 
     implementation "com.github.java-json-tools:json-patch:1.13"
     implementation "com.github.dozermapper:dozer-core:6.5.2"
@@ -128,11 +130,11 @@ dependencies {
      // boot starter
     testImplementation 'org.springframework.boot:spring-boot-starter-validation'    
     testImplementation "org.springframework.boot:spring-boot-starter-test"
-    testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:2.0.6.RELEASE'
+    testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.0'
     testImplementation "org.springframework.security:spring-security-test"
 
     //Java 11 Support 
-    testImplementation "org.mockito:mockito-inline:4.8.1"
+    testImplementation "org.mockito:mockito-inline:5.2.0"
 
 //    testImplementation 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.9.2'
 //    asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor:2.0.4.RELEASE'

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -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-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists