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

PR for next release

.github/workflows/codeql-analysis.yml

@@ -38,17 +38,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initialize minimum JDK version
     - name: Setup Java JDK
-      uses: actions/setup-java@v1.4.4
+      uses: actions/setup-java@v4.2.1
       with:
         distribution: zulu
         java-version: 17
     # 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.
@@ -59,7 +59,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
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/gradle.yml

@@ -5,9 +5,9 @@ name: build with gradle
 
 on:
   push:
-    branches: [ master, main, testWorkflow ]
+    branches: [ main, development ]
   pull_request:
-    branches: [ master, main ]
+    branches: [ main, development ]
 
 env:
     # JDK version used for building jar file
@@ -22,9 +22,9 @@ jobs:
         jdk: [ 17, 19 ]
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up OpenJDK version ...
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4.2.1
       with:
         distribution: 'zulu' 
         java-version: ${{ matrix.jdk }}
@@ -48,9 +48,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up OpenJDK version ...
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4.2.1
       with:
         distribution: 'zulu' 
         java-version: ${{ env.currentBuildVersion }}
@@ -59,6 +59,6 @@ jobs:
     - name: Build with Gradle (JDK ${{ env.currentBuildVersion }})
       run: ./gradlew clean check jacocoTestReport
     - name: Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         files: ./build/reports/jacoco/test/jacocoTestReport.xml #optional

.github/workflows/publishRelease.yml

@@ -7,9 +7,9 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
           distribution: 'zulu' # openjdk

CHANGELOG.md

@@ -18,6 +18,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [1.2.1] - 2024-04-02
+
+### Changed
+* SimpleServiceClient now follows redirects (HTTP 3XX) properly
+* Enable redirections for getResource and getResources for SimpleServiceClient by @VolkerHartmann in https://github.com/kit-data-manager/service-base/pull/227
+
+### Removed
+* Removed unused (and broken) methods 'getPages' and 'getPage' from internal class ContentRange 
+
+### Fixed
+* Fixed JWT handling caused by API changes in dependencies
+* Fixed development branch build on push. by @github-actions in https://github.com/kit-data-manager/service-base/pull/225
+* Fixed Content-Range header according to RFT 7233 by @github-actions in https://github.com/kit-data-manager/service-base/pull/241
+
+### Security
+* Bump actions/checkout to 4
+* Bump github/codeql-action to 3
+* Bump codecov/codecov-action to 4
+* Bump actions/setup-java to 4.2.1
+* Bump jacoco to 0.8.11
+* Bump io.freefair.lombok to 8.6
+* Bump io.freefair.maven-publish-java to 8.6
+* Bump org.owasp.dependencycheck to 9.1.0
+* Bump io.spring.dependency-management to 1.1.4
+* Bump springDocVersion to 1.8.0
+* Bump javassist to 3.30.2-GA
+* Bump commons-validator to 1.8.0
+* Bump commons-lang3 to 3.14.0
+* Bump commons-io:commons-io 2.16.0
+* Bump jackson-jaxrs-json-provider to 2.17.0
+* Bump jackson-module-afterburner to 2.17.0
+* Bump jackson-datatype-joda to 2.17.0
+* Bump jackson-datatype-jsr310 to 2.17.0
+* Bump jackson-databind to 2.16.2
+* Bump datatype:jackson-datatype-jsr310 to 2.17.0
+* Bump jaxb-impl to 4.0.5
+* Bump jaxb-core to 4.0.5
+* Bump tika-core to 2.9.1
+* Bump nimbus-jose-jwt to 9.37.3
+* Bump jjwt-api to 0.12.5
+* Bump jjwt-impl to 0.12.5
+* Bump jjwt-jackson to 0.12.5
+* Bump dozer-core to 7.0.0
+
 ## [1.2.0] - 2023-06-19
 
 ### Added
@@ -231,7 +275,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 - none
 
-[Unreleased]: https://github.com/kit-data-manager/service-base/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/kit-data-manager/service-base/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/kit-data-manager/service-base/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/kit-data-manager/service-base/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/kit-data-manager/service-base/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/kit-data-manager/service-base/compare/v1.0.7...v1.1.0

build.gradle

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 plugins { 
-    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 "org.owasp.dependencycheck" version "8.2.1"
+    id "io.freefair.lombok" version "8.6"
+    id "io.freefair.maven-publish-java" version "8.6"
+    id "io.spring.dependency-management" version "1.1.4" 
+    id "org.owasp.dependencycheck" version "9.1.0"
     id "com.jfrog.bintray" version "1.8.5"
     id "java"
     id "jacoco"
@@ -30,15 +30,15 @@ plugins {
 }
 
 ext { 
-    springBootVersion = '3.1.0' 
-    springDocVersion  = '1.7.0'
+    springBootVersion = '3.2.3' 
+    springDocVersion  = '1.8.0'
 }
 
 description = "Base service module containing entities, interfaces and helpers."
 group = "edu.kit.datamanager"
 
-sourceCompatibility = 1.17
-targetCompatibility = 1.17
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 jar {
     archivesBaseName = 'service-base'
@@ -65,38 +65,42 @@ dependencies {
     implementation "org.springdoc:springdoc-openapi-data-rest:${springDocVersion}"
     implementation "org.springdoc:springdoc-openapi-webmvc-core:${springDocVersion}"
 
-    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.jaxrs:jackson-jaxrs-json-provider:2.17.0"
+    implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.17.0"
 
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2"
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.15.2"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.0"
 
-    implementation "com.github.dozermapper:dozer-core:6.5.2"
+    implementation "com.github.dozermapper:dozer-core:7.0.0"
 
     //keycloak
-    implementation "com.nimbusds:nimbus-jose-jwt:9.31"
-    implementation "io.jsonwebtoken:jjwt-api:0.11.5"
-    implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
-    implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
+    implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
+    implementation "io.jsonwebtoken:jjwt-api:0.12.5"
+    implementation "io.jsonwebtoken:jjwt-impl:0.12.5"
+    implementation "io.jsonwebtoken:jjwt-jackson:0.12.5"
 
     implementation "com.github.java-json-tools:json-patch:1.13"
 
-    implementation "org.apache.commons:commons-lang3:3.12.0"
-    implementation "commons-validator:commons-validator:1.7"
-    implementation "commons-io:commons-io:2.13.0"
+    implementation "org.apache.commons:commons-lang3:3.14.0"
+    implementation "commons-validator:commons-validator:1.8.0"
+    implementation "commons-io:commons-io:2.16.0"
     // http client uses commons-codec
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     implementation "org.apache.commons:commons-collections4:4.4"
+
+    // due to problems in dependencies check
+    implementation "com.fasterxml.jackson.core:jackson-core:2.17.0"
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.17.0"
 
     //Java 11 Support 
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
 
-    implementation 'com.sun.xml.bind:jaxb-core:4.0.3'
-    implementation 'com.sun.xml.bind:jaxb-impl:4.0.3'
+    implementation 'com.sun.xml.bind:jaxb-core:4.0.5'
+    implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
 
     implementation 'javax.activation:activation:1.1.1'
-    implementation 'org.javassist:javassist:3.29.2-GA'
+    implementation 'org.javassist:javassist:3.30.2-GA'
 
     //test
     testImplementation "org.springframework.boot:spring-boot-starter-test"
@@ -110,7 +114,7 @@ if (project.hasProperty('release')) {
 }
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.11"
 }
 
 tasks.withType(Test) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists