From 447699a76276654c8ac1c8bcf9576b3afd46d2dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 12:10:07 +0000 Subject: [PATCH 1/3] Bump flexmark-all from 0.35.10 to 0.62.2 Bumps [flexmark-all](https://github.com/vsch/flexmark-java) from 0.35.10 to 0.62.2. - [Release notes](https://github.com/vsch/flexmark-java/releases) - [Commits](https://github.com/vsch/flexmark-java/compare/0.35.10...0.62.2) --- updated-dependencies: - dependency-name: com.vladsch.flexmark:flexmark-all dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index adda2915..b83a5d15 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ dependencies { // TEST Scala // testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.0" - testImplementation 'com.vladsch.flexmark:flexmark-all:0.35.10' + testImplementation 'com.vladsch.flexmark:flexmark-all:0.62.2' testImplementation "org.pegdown:pegdown:1.6.0" // HTML report for scalatest implementation 'org.mockito:mockito-core:3.11.2' // mocking framework From a75e21b682f01f817bf77cd14de4a5ccd04b74e2 Mon Sep 17 00:00:00 2001 From: "Kittl, Chris" Date: Wed, 8 Dec 2021 09:16:40 +0100 Subject: [PATCH 2/3] Update scalatest and flexmark at the same time --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b83a5d15..ca57d068 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ dependencies { implementation 'org.scala-lang.modules:scala-parallel-collections_2.13:1.0.3' // TEST Scala // - testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.0" + testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.10" testImplementation 'com.vladsch.flexmark:flexmark-all:0.62.2' testImplementation "org.pegdown:pegdown:1.6.0" // HTML report for scalatest implementation 'org.mockito:mockito-core:3.11.2' // mocking framework From caddc6e09d35208a05c05c6091b41309f7b490b2 Mon Sep 17 00:00:00 2001 From: "Kittl, Chris" Date: Wed, 8 Dec 2021 09:26:52 +0100 Subject: [PATCH 3/3] Add missing dependencies --- build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ca57d068..ae7c5ade 100644 --- a/build.gradle +++ b/build.gradle @@ -48,20 +48,22 @@ dependencies { /* PowerSystemDataModel */ implementation ('com.github.ie3-institute:PowerSystemDataModel:2.1-SNAPSHOT') { /* Exclude nested logging and ie3 related dependencies */ - exclude group: 'org.slf4j', module: 'slf4j-api' + exclude group: 'org.slf4j' exclude group: 'com.github.ie3-institute' } /* util functions */ implementation ('com.github.ie3-institute:PowerSystemUtils:1.6-SNAPSHOT') { /* Exclude nested logging and ie3 related dependencies */ - exclude group: 'org.slf4j', module: 'slf4j-api' + exclude group: 'org.slf4j' exclude group: 'com.github.ie3-institute' } implementation 'org.codehaus.groovy:groovy:3.0.8' implementation 'tech.units:indriya:2.1.2' + implementation 'org.locationtech.jts:jts-core:1.18.2' + implementation 'commons-io:commons-io:2.11.0' // logging implementation 'org.apache.logging.log4j:log4j-api:+' // log4j