build: Dependencies updates [2020-11-30] (#1363)

Dependencies updates
Flank · Nov 30, 2020 · 23b269b · 23b269b
1 parent b4679f6
commit 23b269b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -21,7 +21,7 @@ object Versions {
     const val KOTLIN = "1.4.20"
 
     // https://github.com/Kotlin/kotlinx.coroutines/releases
-    const val KOTLIN_COROUTINES = "1.4.1"
+    const val KOTLIN_COROUTINES = "1.4.2"
 
     // https://github.com/remkop/picocli/releases
     const val PICOCLI = "4.5.2"
@@ -45,7 +45,7 @@ object Versions {
 
     // https://github.com/FasterXML/jackson-core/releases
     // https://github.com/FasterXML/jackson-dataformat-xml/releases
-    const val JACKSON = "2.11.3"
+    const val JACKSON = "2.12.0"
 
     const val JUNIT = "4.13.1"
 

diff --git a/flank-scripts/gradle/wrapper/gradle-wrapper.properties b/flank-scripts/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...-scripts/src/test/kotlin/flank/scripts/ci/releasenotes/GenerateReleaseNotesCommandTest.kt b/...-scripts/src/test/kotlin/flank/scripts/ci/releasenotes/GenerateReleaseNotesCommandTest.kt
@@ -2,13 +2,14 @@ package flank.scripts.ci.releasenotes
 
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
+import java.io.File
 
 class GenerateReleaseNotesCommandTest {
 
     @Test
     fun `Should not used default file if passed other as argument`() {
         // given
-        val expected = createTempFile("test", ".file").absolutePath
+        val expected = File.createTempFile("test", ".file").absolutePath
 
         // when
         val command = GenerateReleaseNotesCommand().apply {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test_runner/gradle/wrapper/gradle-wrapper.properties b/test_runner/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test_runner/src/main/kotlin/ftl/reports/xml/JUnitXml.kt b/test_runner/src/main/kotlin/ftl/reports/xml/JUnitXml.kt
@@ -3,6 +3,7 @@ package ftl.reports.xml
 import com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
 import com.fasterxml.jackson.dataformat.xml.XmlMapper
+import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import ftl.reports.xml.model.JUnitTestResult
 import ftl.reports.xml.model.JUnitTestSuite
@@ -15,6 +16,7 @@ import java.nio.file.Path
 private val xmlModule = JacksonXmlModule().apply { setDefaultUseWrapper(false) }
 
 private val xmlMapper = XmlMapper(xmlModule)
+    .configure(EMPTY_ELEMENT_AS_NULL, true)
     .registerModules(KotlinModule())
     .configure(FAIL_ON_UNKNOWN_PROPERTIES, false)