- Update docker configuration.

- Update jar-file creation.
- Comment-out the unused "spring-boot-devtools" which may be causing class reloading.
- Update dependencies.

Dockerfile

@@ -1,6 +1,6 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:8-jre-alpine
 
-COPY build/libs/*.jar urls_controller.jar
+COPY build/libs/UrlsController-*.jar urls_controller.jar
 
 EXPOSE 1880
 

build.gradle

@@ -4,12 +4,23 @@ plugins {
     id 'java'
 }
 
+ext {
+    app_group = 'eu.openaire.urls_controller'
+    hadoopVersion = '3.4.1'
+}
+
 java {
-    group = 'eu.openaire.urls_controller'
+    group = "${app_group}"
     version = '2.8.2'
     sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
+// Disable default jar generation and create a Fat-Jar only.
+tasks.jar.enabled = false
+bootJar {
+    mainClass  = "${app_group}.UrlsControllerApplication"
+}
+
 repositories {
     mavenCentral()
     maven {
@@ -18,12 +29,8 @@ repositories {
     }
 }
 
-ext {
-    hadoopVersion = '3.4.1'
-}
-
 dependencies {
-    runtimeOnly "org.springframework.boot:spring-boot-devtools"
+    //developmentOnly "org.springframework.boot:spring-boot-devtools"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation("org.springframework.boot:spring-boot-starter-security")
@@ -52,9 +59,9 @@ dependencies {
     implementation("org.apache.commons:commons-compress:1.27.1") {
         exclude group: 'com.github.luben', module: 'zstd-jni'
     }
-    implementation 'com.github.luben:zstd-jni:1.5.6-6'  // Even though this is part of the above dependency, the Apache commons rarely updates it, while the zstd team makes improvements very often.
+    implementation 'com.github.luben:zstd-jni:1.5.6-7'  // Even though this is part of the above dependency, the Apache commons rarely updates it, while the zstd team makes improvements very often.
 
-    implementation 'io.minio:minio:8.5.12'
+    implementation 'io.minio:minio:8.5.13'
 
     // https://mvnrepository.com/artifact/com.cloudera.impala/jdbc
     implementation("com.cloudera.impala:jdbc:2.5.31") {
@@ -112,7 +119,7 @@ dependencies {
 
     // Add back some updated version of the needed dependencies.
     implementation 'org.apache.thrift:libthrift:0.17.0' // Newer versions (>=0.18.X) are not compatible with JAVA 8.
-    implementation 'com.fasterxml.woodstox:woodstox-core:7.0.0'
+    implementation 'com.fasterxml.woodstox:woodstox-core:7.1.0'
 
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     implementation 'com.google.code.gson:gson:2.11.0'

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.8'
 
 services:
 
@@ -9,19 +9,19 @@ services:
       - '1880:1880'
     volumes:
       - type: bind
-        source: $HOME/tmp/config
+        source: ../tmp/config
         target: /mnt/config
       - type: bind
-        source: $HOME/tmp
+        source: ../tmp
         target: /tmp
       - type: bind
-        source: $HOME/logs
+        source: ../logs
         target: /logs
       - type: bind
         source: /mnt/bulk_import
         target: /mnt/bulk_import
       - type: bind
-        source: $HOME/reports
+        source: ../reports
         target: /reports  # This will contain the "workerReports" and "bulkImportReports" subdirectories.
     build:
       dockerfile: ./Dockerfile

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

installAndRun.sh

@@ -26,7 +26,7 @@ if [[ justRun -eq 1 && shouldRunInDocker -eq 1 ]]; then
   justRun=0
 fi
 
-gradleVersion="8.8"
+gradleVersion="8.10.2"
 
 if [[ justRun -eq 0 ]]; then