diff --git a/build.gradle b/build.gradle index 540d704..5ef117e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.springframework.boot' version '2.7.18' - id 'io.spring.dependency-management' version '1.1.5' + id 'io.spring.dependency-management' version '1.1.6' id 'java' } @@ -43,18 +43,18 @@ dependencies { //implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.0.2' // https://mvnrepository.com/artifact/com.google.guava/guava - implementation group: 'com.google.guava', name: 'guava', version: '33.2.1-jre' + implementation group: 'com.google.guava', name: 'guava', version: '33.3.1-jre' // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0' // https://mvnrepository.com/artifact/org.apache.commons/commons-compress - implementation("org.apache.commons:commons-compress:1.26.2") { + 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-3' // 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-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 'io.minio:minio:8.5.11' + implementation 'io.minio:minio:8.5.12' // https://mvnrepository.com/artifact/com.cloudera.impala/jdbc implementation("com.cloudera.impala:jdbc:2.5.31") { @@ -77,7 +77,7 @@ dependencies { } // https://mvnrepository.com/artifact/org.apache.parquet/parquet-avro - implementation('org.apache.parquet:parquet-avro:1.14.1') + implementation('org.apache.parquet:parquet-avro:1.14.2') // https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common implementation("org.apache.hadoop:hadoop-common:$hadoopVersion") { @@ -116,7 +116,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.11.0' // https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus - runtimeOnly 'io.micrometer:micrometer-registry-prometheus:1.13.1' + runtimeOnly 'io.micrometer:micrometer-registry-prometheus:1.13.4' testImplementation 'org.springframework.security:spring-security-test' testImplementation "org.springframework.boot:spring-boot-starter-test" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..df97d72 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/eu/openaire/urls_controller/controllers/ShutdownController.java b/src/main/java/eu/openaire/urls_controller/controllers/ShutdownController.java index 13ca982..5a63f6f 100644 --- a/src/main/java/eu/openaire/urls_controller/controllers/ShutdownController.java +++ b/src/main/java/eu/openaire/urls_controller/controllers/ShutdownController.java @@ -151,7 +151,7 @@ public class ShutdownController { } if ( ! remoteAddr.equals(workerInfo.getWorkerIP()) ) { - logger.error(initMsg + " The request came from an IP different from the one this worker was registered with: " + workerInfo.getWorkerIP()); + logger.error(initMsg + " The request came from an IP different from the one, this worker was registered with: " + workerInfo.getWorkerIP()); return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } diff --git a/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java b/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java index aa09410..8654cb7 100644 --- a/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java +++ b/src/main/java/eu/openaire/urls_controller/util/ParquetFileUtils.java @@ -765,7 +765,7 @@ public class ParquetFileUtils { logger.error("Failed to drop the \"" + tableName + "_tmp\" table!", e1); // TODO - Should we shutdown the service? It is highly unlikely that anyone will observe this error live (and act immediately)..! } - return errorMsg; // We return only the initial error to the Worker, which is easily distinguished indie the "merge-queries". + return errorMsg; // We return only the initial error to the Worker, which is easily distinguished inside the "merge-queries". } // Drop the initial table.