chore(openchallenges): upgrade the OC image service to Gradle v8.4 (#…

…2338)

* Update to Gradlle v8.4

* Update package versions (part 1)

* Update dependencies

* Restore Spring packages version

apps/openchallenges/image-service/build.gradle

@@ -11,7 +11,7 @@ plugins {
   id 'jvm-test-suite'
   id 'org.springframework.boot' version "${springBootVersion}"
   id 'jacoco'
-  id "org.sonarqube" version "4.3.0.3225"
+  id "org.sonarqube" version "${sonarqubeVersion}"
 }
 
 repositories {
@@ -46,8 +46,8 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
   compileOnly "org.projectlombok:lombok:${lombokVersion}"
   implementation 'com.google.code.findbugs:jsr305:3.0.2'
-  implementation 'org.openapitools:jackson-databind-nullable:0.2.3'
-  implementation 'org.springdoc:springdoc-openapi-ui:1.6.14'
+  implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
+  implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
   implementation "com.fasterxml.jackson.core:jackson-databind:${fasterxmlVersion}"
   implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${fasterxmlVersion}"
   implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${fasterxmlVersion}"
@@ -58,8 +58,8 @@ dependencies {
   implementation "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"
   implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:${springCloudVersion}"
   implementation "org.springframework.data:spring-data-commons:${springDataVersion}"
-  testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
   testImplementation 'org.assertj:assertj-core:3.23.1'
+  testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
 
   // Enable distributed tracing
   implementation "org.springframework.cloud:spring-cloud-starter-sleuth:${springCloudVersion}"

apps/openchallenges/image-service/gradle.properties

@@ -1,10 +1,11 @@
-fasterxmlVersion=2.13.4
+fasterxmlVersion=2.15.3
 flywaydbVersion=9.4.0
 hibernateSearchVersion=6.1.7.Final
 keycloakVersion=19.0.3
-lombokVersion=1.18.24
+lombokVersion=1.18.30
 openchallengesVersion=0.0.1-SNAPSHOT
-spotlessVersion=6.11.0
+sonarqubeVersion=4.3.0.3225
+spotlessVersion=6.22.0
 springBootVersion=2.7.8
 springCloudVersion=3.1.4
 springDataVersion=2.7.7

apps/openchallenges/image-service/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

apps/openchallenges/image-service/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in