From 4f669bf719d02e398ba6ed572bf8f61861e66919 Mon Sep 17 00:00:00 2001
From: LSmyrnaios <lsmyrnaios@gmail.com>
Date: Thu, 4 Jul 2024 00:36:50 +0300
Subject: [PATCH] Update dependencies.

---
 build.gradle                                       | 14 +++++++++-----
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 installAndRun.sh                                   |  2 +-
 .../services/StatsServiceImpl.java                 |  3 +++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9098d41..01cebff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'org.springframework.boot' version '2.7.18'
-    id 'io.spring.dependency-management' version '1.1.4'
+    id 'io.spring.dependency-management' version '1.1.5'
 }
 
 java {
@@ -18,6 +18,10 @@ repositories {
     }
 }
 
+ext {
+    hadoopVersion = '3.4.0'
+}
+
 dependencies {
     runtimeOnly "org.springframework.boot:spring-boot-devtools"
 
@@ -54,7 +58,7 @@ dependencies {
     }
 
     // https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common
-    implementation('org.apache.hadoop:hadoop-common:3.3.6') {
+    implementation("org.apache.hadoop:hadoop-common:$hadoopVersion") {
         exclude group: 'org.apache.parquet', module: 'parquet-avro'
         exclude group: 'org.apache.avro', module: 'avro'
         exclude group: 'org.slf4j', module: 'slf4j-api'
@@ -70,7 +74,7 @@ dependencies {
     }
 
     // https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-mapreduce-client-core
-    implementation('org.apache.hadoop:hadoop-mapreduce-client-core:3.3.6') {
+    implementation("org.apache.hadoop:hadoop-mapreduce-client-core:$hadoopVersion") {
         exclude group: 'org.apache.parquet', module: 'parquet-avro'
         exclude group: 'org.apache.avro', module: 'avro'
         exclude group: 'org.slf4j', module: 'slf4j-api'
@@ -84,10 +88,10 @@ dependencies {
 
     // Add back some updated versions 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:6.6.1'
+    implementation 'com.fasterxml.woodstox:woodstox-core:7.0.0'
 
     // https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus
-    runtimeOnly 'io.micrometer:micrometer-registry-prometheus:1.12.4'
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus:1.13.1'
 
     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 a80b22c..a441313 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/installAndRun.sh b/installAndRun.sh
index a7215f0..9b0b346 100755
--- a/installAndRun.sh
+++ b/installAndRun.sh
@@ -26,7 +26,7 @@ if [[ justInstall -eq 1 && shouldRunInDocker -eq 1 ]]; then
   justInstall=0
 fi
 
-gradleVersion="8.6"
+gradleVersion="8.8"
 
 if [[ justInstall -eq 0 ]]; then
 
diff --git a/src/main/java/eu/openaire/pdf_aggregation_statistics/services/StatsServiceImpl.java b/src/main/java/eu/openaire/pdf_aggregation_statistics/services/StatsServiceImpl.java
index ed5fb2d..38426aa 100644
--- a/src/main/java/eu/openaire/pdf_aggregation_statistics/services/StatsServiceImpl.java
+++ b/src/main/java/eu/openaire/pdf_aggregation_statistics/services/StatsServiceImpl.java
@@ -52,6 +52,9 @@ public class StatsServiceImpl implements StatsService {
         final int[] countUpdatedDatasources = {0};
         final int[] countNewDatasources = {0};
         final int[] countAddedPayloads = {0};
+
+        // TODO - Add the "countAddedPayloads" metric as a Prometheus GAUGE to check the changes in collection-speed of the service.
+
         try {
             jdbcTemplate.query(getNumberOfPayloadsPerDatasourceQuery, rs -> {
                 try {   // For each of the 4 columns returned, do the following. The column-indexing starts from  1