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

Prepare for next version
kit-data-manager · Jun 19, 2023 · f3b7ea6 · f3b7ea6
2 parents 2fe0052 + 87dbd63
commit f3b7ea6
Show file tree

Hide file tree

Showing 99 changed files with 905 additions and 570 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,9 @@ updates:
     target-branch: "development"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "development"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,11 +38,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
+    # Initialize minimum JDK version
+    - name: Setup Java JDK
+      uses: actions/[email protected]
+      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 +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@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/gradle.yml b/.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

diff --git a/.github/workflows/publishRelease.yml b/.github/workflows/publishRelease.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu' # openjdk
       - name: Publish package
         run: ./gradlew -Prelease publishToSonatype closeAndReleaseSonatypeStagingRepository

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [1.2.0] - 2023-06-19
+
+### Added
+- Add credentials for unauthenticated users.
+
+### Changed
+- At least JDK 17 is now required.
+- Bump some github actions from 2 to 3.
+- Bump com.fasterxml.jackson.datatype:jackson-datatype-joda from 2.14.1 to 2.15.2.
+- Bump com.fasterxml.jackson.datatype:jackson-datatype-jsr310 from 2.14.1 to 2.15.2.
+- Bump com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider from 2.14.1 to 2.15.2.
+- Bump com.fasterxml.jackson.module:jackson-module-afterburner from 2.14.1 to 2.15.2.
+- Bump com.sun.xml.bind:jaxb-core from 4.0.1 to 4.0.3.
+- Bump com.sun.xml.bind:jaxb-impl from 4.0.1 to 4.0.3. 
+- Bump commons-io:commons-io from 2.11.0 to 2.13.0. 
+- Bump io.freefair.lombok from 6.6.1 to 8.0.1.
+- Bump io.freefair.maven-publish-java from 6.6.1 to 8.0.1.
+- Bump io.github.gradle-nexus.publish-plugin from 1.1.0 to 1.3.0.
+- Bump JAVA version to 17 due to Spring Boot 3. 
+- Bump org.mockito:mockito-inline from 4.11.0 to 5.2.0.
+- Bump org.owasp.dependencycheck from 7.4.4 to 8.2.1.
+- Bump org.springframework.boot:spring-boot-dependencies from 2.7.7 to 3.1.0.
+- Bump springDocVersion from 1.6.14 to 1.7.0.
+
+### Fixed
+- Fix misleading log for elasticsearch.
+
 ## [1.1.1] - 2023-03-17
 
 ### Added
@@ -204,7 +231,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.1.1...HEAD
+[Unreleased]: https://github.com/kit-data-manager/service-base/compare/v1.2.0...HEAD
+[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
 [1.0.7]: https://github.com/kit-data-manager/service-base/compare/v1.0.6...v1.0.7

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Helper module for KIT DM 2.0 services providing commonly used dependencies and g
 
 In order to build this module you'll need:
 
-* Java SE Development Kit 8 or higher
+* Java SE Development Kit 17 or higher
 
 After obtaining the sources change to the folder where the sources are located and call:
 

diff --git a/build.gradle b/build.gradle
@@ -15,30 +15,30 @@
  * limitations under the License.
  */
 plugins { 
-    id "io.freefair.lombok" version "6.6.1"
-    id "io.freefair.maven-publish-java" version "6.6.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 "org.owasp.dependencycheck" version "7.4.4"
+    id "org.owasp.dependencycheck" version "8.2.1"
     id "com.jfrog.bintray" version "1.8.5"
     id "java"
     id "jacoco"
     // 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 { 
-    springBootVersion = '2.7.7' 
-    springDocVersion  = '1.6.14'
+    springBootVersion = '3.1.0' 
+    springDocVersion  = '1.7.0'
 }
 
 description = "Base service module containing entities, interfaces and helpers."
 group = "edu.kit.datamanager"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.17
+targetCompatibility = 1.17
 
 jar {
     archivesBaseName = 'service-base'
@@ -59,22 +59,22 @@ 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.cloud:spring-cloud-gateway-mvc:3.1.4"
+    implementation "org.springframework.cloud:spring-cloud-gateway-mvc:4.0.6"
 
     implementation "org.springdoc:springdoc-openapi-ui:${springDocVersion}"
     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.14.1"
-    implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.14.1"
+    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.14.1"
-    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.github.dozermapper:dozer-core:6.5.2"
 
     //keycloak
-    implementation "com.nimbusds:nimbus-jose-jwt:9.28"
+    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"
@@ -83,7 +83,7 @@ dependencies {
 
     implementation "org.apache.commons:commons-lang3:3.12.0"
     implementation "commons-validator:commons-validator:1.7"
-    implementation "commons-io:commons-io:2.11.0"
+    implementation "commons-io:commons-io:2.13.0"
     // http client uses commons-codec
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
@@ -92,16 +92,16 @@ dependencies {
     //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 'com.sun.xml.bind:jaxb-core:4.0.3'
+    implementation 'com.sun.xml.bind:jaxb-impl:4.0.3'
 
     implementation 'javax.activation:activation:1.1.1'
     implementation 'org.javassist:javassist:3.29.2-GA'
 
     //test
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-inline:4.11.0"
+    testImplementation "org.mockito:mockito-inline:5.2.0"
 }
 
 if (project.hasProperty('release')) {

diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,7 @@
 
 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
 
-version=1.1.2-SNAPSHOT
+version=1.2.0-SNAPSHOT
 action.custom-1=install
 action.custom-1.args=--configure-on-demand -w -x check clean publishToMavenLocal
 action.custom-2=jacoco

diff --git a/src/main/java/edu/kit/datamanager/annotations/ExecutableFileURL.java b/src/main/java/edu/kit/datamanager/annotations/ExecutableFileURL.java
@@ -21,8 +21,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**
  * Test if file is available and executable.

diff --git a/src/main/java/edu/kit/datamanager/annotations/LocalFileURL.java b/src/main/java/edu/kit/datamanager/annotations/LocalFileURL.java
@@ -21,8 +21,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**
  * Test if file is locally available.

diff --git a/src/main/java/edu/kit/datamanager/annotations/LocalFolderURL.java b/src/main/java/edu/kit/datamanager/annotations/LocalFolderURL.java
@@ -21,8 +21,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**
  * Test for local folder.

diff --git a/src/main/java/edu/kit/datamanager/annotations/SearchIndex.java b/src/main/java/edu/kit/datamanager/annotations/SearchIndex.java
@@ -21,8 +21,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**Annotation for marking search index property for validation.
  *

diff --git a/src/main/java/edu/kit/datamanager/annotations/SearchIndexUrl.java b/src/main/java/edu/kit/datamanager/annotations/SearchIndexUrl.java
@@ -21,8 +21,8 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 /**
  *