From f63371b23449075b11ecda756facd8f0b2eefbc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:34:20 +0200 Subject: [PATCH 01/10] Bump com.jfrog.artifactory from 4.24.20 to 4.28.2 (#131) Bumps com.jfrog.artifactory from 4.24.20 to 4.28.2. --- updated-dependencies: - dependency-name: com.jfrog.artifactory dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cb5a55f..a842069 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.jfrog.artifactory" version "4.24.20" //artifactory support + id "com.jfrog.artifactory" version "4.28.2" //artifactory support id 'groovy' // groovy support id 'java' // java support id 'application' // creates a JVM executable From 99c7b03205ca9220d388e90a1db886e724c5f4ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 09:43:18 +0000 Subject: [PATCH 02/10] Bump postgresql from 1.16.0 to 1.17.1 (#129) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a842069..583cbf8 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ dependencies { //tests testImplementation 'junit:junit:4.+' - testImplementation 'org.testcontainers:postgresql:1.16.0' + testImplementation 'org.testcontainers:postgresql:1.17.1' } From a5290691df01a1b268a2ce6e925da1a81e979c27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:53:19 +0200 Subject: [PATCH 03/10] Bump postgresql from 42.2.24 to 42.3.4 (#130) Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.24 to 42.3.4. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.24...REL42.3.4) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Feismann <98817556+danielfeismann@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 583cbf8..0f09d40 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation 'javax.activation:activation:1.1.1' //database - implementation 'org.postgresql:postgresql:42.2.24' + implementation 'org.postgresql:postgresql:42.3.4' implementation 'javax.persistence:javax.persistence-api:2.2' // logging From 3fa04282ec6c3b45ec52f8a6aebbb0191a8a5bab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:32:24 +0000 Subject: [PATCH 04/10] Bump picoliVersion from 4.6.1 to 4.6.3 (#103) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0f09d40..a3440f0 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ ext { //version (changing these should be considered thoroughly!) hibernateVersion = '5.3.3.Final' log4jVersion = '2.17.1' - picoliVersion = '4.6.1' + picoliVersion = '4.6.3' javaVersion = JavaVersion.VERSION_17 scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins From 954c9e5f47b0699f292f67a67c4350bc498ab714 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:41:07 +0000 Subject: [PATCH 05/10] Bump log4jVersion from 2.17.1 to 2.17.2 (#110) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a3440f0..d2fe5ec 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { ext { //version (changing these should be considered thoroughly!) hibernateVersion = '5.3.3.Final' - log4jVersion = '2.17.1' + log4jVersion = '2.17.2' picoliVersion = '4.6.3' javaVersion = JavaVersion.VERSION_17 From 809a076fb4dc106cd9f1110714168e1cb027b7d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:50:08 +0000 Subject: [PATCH 06/10] Bump com.diffplug.spotless from 5.17.0 to 6.5.2 (#134) --- build.gradle | 2 +- src/main/java/edu/ie3/tools/Converter.java | 12 +++++++++--- src/main/java/edu/ie3/tools/Downloader.java | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d2fe5ec..3358bc6 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined) id 'pmd' // code check, working on source code id 'com.github.spotbugs' version '4.7.8' // code check, working on byte code - id 'com.diffplug.spotless' version '5.17.0'// code format + id 'com.diffplug.spotless' version '6.5.2'// code format id 'com.simonharrer.modernizer' version '2.1.0-1' // detect deprecated APIs id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar id 'jacoco' // java code coverage plugin diff --git a/src/main/java/edu/ie3/tools/Converter.java b/src/main/java/edu/ie3/tools/Converter.java index c8545bf..9317209 100644 --- a/src/main/java/edu/ie3/tools/Converter.java +++ b/src/main/java/edu/ie3/tools/Converter.java @@ -50,7 +50,9 @@ public class Converter implements Runnable { private final ExecutorService fileEraserExecutor = Executors.newFixedThreadPool((int) Math.ceil(noOfProcessors / 3d)); - /** @return timestamp for logging output (e.g "MR 09.10.2018 18:00 - TS 01 | ") */ + /** + * @return timestamp for logging output (e.g "MR 09.10.2018 18:00 - TS 01 | ") + */ public static String getFormattedTimestep(@NotNull ZonedDateTime modelrun, int timestep) { return "MR " + MODEL_RUN_FORMATTER.format(modelrun) @@ -59,12 +61,16 @@ public static String getFormattedTimestep(@NotNull ZonedDateTime modelrun, int t + " | "; } - /** @return timestamp for logging output (e.g "MR 09.10.2018 18:00 | ") */ + /** + * @return timestamp for logging output (e.g "MR 09.10.2018 18:00 | ") + */ public static String getFormattedModelrun(@NotNull ZonedDateTime modelrun) { return "MR " + MODEL_RUN_FORMATTER.format(modelrun) + " | "; } - /** @return timestamp for logging output (e.g "MR 09.10.2018 18:00 - TS 01 | ") */ + /** + * @return timestamp for logging output (e.g "MR 09.10.2018 18:00 - TS 01 | ") + */ public static String getFormattedTimestep(@NotNull FileModel file) { return getFormattedTimestep(file.getModelrun(), file.getTimestep()); } diff --git a/src/main/java/edu/ie3/tools/Downloader.java b/src/main/java/edu/ie3/tools/Downloader.java index 9894309..5d2ec3e 100644 --- a/src/main/java/edu/ie3/tools/Downloader.java +++ b/src/main/java/edu/ie3/tools/Downloader.java @@ -43,7 +43,9 @@ public Downloader() { dbController = new DatabaseController(PERSISTENCE_UNIT_NAME, validateConnectionProperties()); } - /** @return if a connection to given url could be established */ + /** + * @return if a connection to given url could be established + */ public static boolean isUrlReachable(String url) { HttpURLConnection.setFollowRedirects(false); HttpURLConnection con; From dfa02ed5f197976275f34cdbecfa0a8116099dd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:58:05 +0000 Subject: [PATCH 07/10] Bump jackson-databind from 2.13.0 to 2.13.2.2 (#119) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3358bc6..1af4ed4 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation 'org.jetbrains:annotations:23.0.0' annotationProcessor "info.picocli:picocli-codegen:$picoliVersion" implementation "info.picocli:picocli:$picoliVersion" - implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2' //tests testImplementation 'junit:junit:4.+' From 402a3dc3e8ef585f5386e1c5485836d2b2642769 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 13:25:49 +0000 Subject: [PATCH 08/10] Bump com.github.spotbugs from 4.7.8 to 5.0.6 (#109) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1af4ed4..3ffc25c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'application' // creates a JVM executable id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined) id 'pmd' // code check, working on source code - id 'com.github.spotbugs' version '4.7.8' // code check, working on byte code + id 'com.github.spotbugs' version '5.0.6' // code check, working on byte code id 'com.diffplug.spotless' version '6.5.2'// code format id 'com.simonharrer.modernizer' version '2.1.0-1' // detect deprecated APIs id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar From dfedf954b7cd357b40f2dfa6f18150f0ea5cbf0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 May 2022 18:36:45 +0000 Subject: [PATCH 09/10] Bump com.jfrog.artifactory from 4.28.2 to 4.28.3 (#137) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3ffc25c..f4000b8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.jfrog.artifactory" version "4.28.2" //artifactory support + id "com.jfrog.artifactory" version "4.28.3" //artifactory support id 'groovy' // groovy support id 'java' // java support id 'application' // creates a JVM executable From 9c455ba14db41f708483d4eacef3c69ef1931782 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 May 2022 18:53:59 +0000 Subject: [PATCH 10/10] Bump com.diffplug.spotless from 6.5.2 to 6.6.1 (#139) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f4000b8..86cc043 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined) id 'pmd' // code check, working on source code id 'com.github.spotbugs' version '5.0.6' // code check, working on byte code - id 'com.diffplug.spotless' version '6.5.2'// code format + id 'com.diffplug.spotless' version '6.6.1'// code format id 'com.simonharrer.modernizer' version '2.1.0-1' // detect deprecated APIs id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar id 'jacoco' // java code coverage plugin