From 89ddd5d9635c47c251d49630a439a396b58a754f Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Wed, 26 Jul 2023 17:35:21 +0300 Subject: [PATCH] - Add the "shutdownService.sh" script. - Update dependencies. --- build.gradle | 18 ++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 3 ++- installAndRun.sh | 2 +- shutdownService.sh | 2 ++ .../PdfAggregationStatisticsApplication.java | 1 - 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100755 shutdownService.sh diff --git a/build.gradle b/build.gradle index 6dd4be7..02e72ae 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,14 @@ plugins { id 'java' - id 'org.springframework.boot' version '2.7.12' - id 'io.spring.dependency-management' version '1.1.0' + id 'org.springframework.boot' version '2.7.14' + id 'io.spring.dependency-management' version '1.1.2' } -group = 'eu.openaire.pdf_aggregation_statistics' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' +java { + group = 'eu.openaire.pdf_aggregation_statistics' + version = '0.0.1-SNAPSHOT' + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() @@ -56,7 +58,7 @@ dependencies { } // https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common - implementation('org.apache.hadoop:hadoop-common:3.3.5') { + implementation('org.apache.hadoop:hadoop-common:3.3.6') { exclude group: 'org.apache.parquet', module: 'parquet-avro' exclude group: 'org.apache.avro', module: 'avro' exclude group: 'org.slf4j', module: 'slf4j-api' @@ -72,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.5') { + implementation('org.apache.hadoop:hadoop-mapreduce-client-core:3.3.6') { exclude group: 'org.apache.parquet', module: 'parquet-avro' exclude group: 'org.apache.avro', module: 'avro' exclude group: 'org.slf4j', module: 'slf4j-api' @@ -89,7 +91,7 @@ dependencies { implementation 'com.fasterxml.woodstox:woodstox-core:6.5.1' // https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus - runtimeOnly 'io.micrometer:micrometer-registry-prometheus:1.11.1' + runtimeOnly 'io.micrometer:micrometer-registry-prometheus:1.11.2' 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 37aef8d..20f76b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +validateDistributionUrl=true networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/installAndRun.sh b/installAndRun.sh index 608b595..0cedee5 100755 --- a/installAndRun.sh +++ b/installAndRun.sh @@ -26,7 +26,7 @@ if [[ justInstall -eq 1 && shouldRunInDocker -eq 1 ]]; then justInstall=0 fi -gradleVersion="8.1.1" +gradleVersion="8.2.1" if [[ justInstall -eq 0 ]]; then diff --git a/shutdownService.sh b/shutdownService.sh new file mode 100755 index 0000000..c5204df --- /dev/null +++ b/shutdownService.sh @@ -0,0 +1,2 @@ +echo "Running compose down.." +sudo docker compose down diff --git a/src/main/java/eu/openaire/pdf_aggregation_statistics/PdfAggregationStatisticsApplication.java b/src/main/java/eu/openaire/pdf_aggregation_statistics/PdfAggregationStatisticsApplication.java index 4b6c51d..045178b 100644 --- a/src/main/java/eu/openaire/pdf_aggregation_statistics/PdfAggregationStatisticsApplication.java +++ b/src/main/java/eu/openaire/pdf_aggregation_statistics/PdfAggregationStatisticsApplication.java @@ -1,6 +1,5 @@ package eu.openaire.pdf_aggregation_statistics; -import eu.openaire.pdf_aggregation_statistics.components.SchedulingTasks; import eu.openaire.pdf_aggregation_statistics.util.UriBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory;