diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 111ee8d..159568d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initialize minimum JDK version - name: Setup Java JDK - uses: actions/setup-java@v4.6.0 + uses: actions/setup-java@v4.7.1 with: distribution: zulu java-version: 17 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6b56756..0af1159 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -24,7 +24,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 - name: Set up OpenJDK version ... - uses: actions/setup-java@v4.6.0 + uses: actions/setup-java@v4.7.1 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -50,7 +50,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 - name: Set up OpenJDK version ... - uses: actions/setup-java@v4.6.0 + uses: actions/setup-java@v4.7.1 with: distribution: 'zulu' java-version: ${{ env.currentBuildVersion }} diff --git a/.github/workflows/publishRelease.yml b/.github/workflows/publishRelease.yml index 515489d..5a79945 100644 --- a/.github/workflows/publishRelease.yml +++ b/.github/workflows/publishRelease.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v4.6.0 + uses: actions/setup-java@v4.7.1 with: java-version: 17 distribution: zulu diff --git a/build.gradle b/build.gradle index 696bbc3..8781f38 100644 --- a/build.gradle +++ b/build.gradle @@ -14,11 +14,11 @@ * limitations under the License. */ plugins { - id "io.freefair.lombok" version "8.12" - id "io.freefair.maven-publish-java" version "8.12" + id "io.freefair.lombok" version "8.13.1" + id "io.freefair.maven-publish-java" version "8.13.1" id "io.spring.dependency-management" version "1.1.7" //id "com.github.kt3k.coveralls" version "2.8.1" - id "org.owasp.dependencycheck" version "12.0.1" + id "org.owasp.dependencycheck" version "12.1.1" id "org.asciidoctor.jvm.convert" version "4.0.4" //id "org.ajoberstar.grgit" version "2.0.1" id "java" @@ -32,9 +32,9 @@ plugins { ext { // versions of dependencies - springBootVersion = '3.4.2' - springDocVersion = '2.8.3' - javersVersion = '7.7.0' + springBootVersion = '3.4.5' + springDocVersion = '2.8.8' + javersVersion = '7.8.0' } description = "Core module for data repositories based on metadata model of datacite." @@ -69,7 +69,7 @@ if (project.hasProperty('release')) { dependencies { // Spring - implementation 'org.springframework:spring-messaging:6.2.2' + implementation 'org.springframework:spring-messaging:6.2.6' // Spring Boot implementation "org.springframework.boot:spring-boot-starter-data-rest" implementation "org.springframework.boot:spring-boot-starter-amqp" @@ -77,7 +77,7 @@ 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:5.4.2' + implementation 'org.springframework.data:spring-data-elasticsearch:5.4.5' // springdoc @@ -86,34 +86,34 @@ dependencies { implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:${springDocVersion}" // apache implementation "commons-configuration:commons-configuration:1.10" - implementation "commons-io:commons-io:2.18.0" - implementation "org.apache.commons:commons-collections4:4.4" + implementation "commons-io:commons-io:2.19.0" + implementation "org.apache.commons:commons-collections4:4.5.0" // includes commons-lang3 - implementation "org.apache.commons:commons-text:1.13.0" + implementation "org.apache.commons:commons-text:1.13.1" implementation 'org.apache.httpcomponents:httpclient:4.5.14' - implementation "org.apache.tika:tika-core:3.0.0" + implementation "org.apache.tika:tika-core:3.1.0" // javers implementation "org.javers:javers-spring-boot-starter-sql:${javersVersion}" - implementation "com.google.code.gson:gson:2.11.0" + implementation "com.google.code.gson:gson:2.13.1" // Database implementation "com.h2database:h2:2.3.232" implementation "org.postgresql:postgresql:42.7.5" // XML - implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.2" - implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.18.2" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.19.0" + implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.19.0" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.2" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.19.0" //implementation "com.monitorjbl:spring-json-view:1.0.1" - implementation "de.codecentric:spring-boot-admin-starter-client:3.4.1" + implementation "de.codecentric:spring-boot-admin-starter-client:3.4.5" // log4j core implementation "org.apache.logging.log4j:log4j-core" implementation "ch.qos.logback:logback-classic" - implementation "edu.kit.datamanager:service-base:1.3.3" + implementation "edu.kit.datamanager:service-base:1.3.4" implementation "com.github.java-json-tools:json-patch:1.13" implementation "com.github.dozermapper:dozer-core:7.0.0" @@ -155,7 +155,7 @@ test { } jacoco { - toolVersion = "0.8.12" + toolVersion = "0.8.13" } tasks.withType(Test) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell