Skip to content

Commit 23b269b

Browse files
build: Dependencies updates [2020-11-30] (#1363)
Dependencies updates
1 parent b4679f6 commit 23b269b

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object Versions {
2121
const val KOTLIN = "1.4.20"
2222

2323
// https://github.com/Kotlin/kotlinx.coroutines/releases
24-
const val KOTLIN_COROUTINES = "1.4.1"
24+
const val KOTLIN_COROUTINES = "1.4.2"
2525

2626
// https://github.com/remkop/picocli/releases
2727
const val PICOCLI = "4.5.2"
@@ -45,7 +45,7 @@ object Versions {
4545

4646
// https://github.com/FasterXML/jackson-core/releases
4747
// https://github.com/FasterXML/jackson-dataformat-xml/releases
48-
const val JACKSON = "2.11.3"
48+
const val JACKSON = "2.12.0"
4949

5050
const val JUNIT = "4.13.1"
5151

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

flank-scripts/src/test/kotlin/flank/scripts/ci/releasenotes/GenerateReleaseNotesCommandTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package flank.scripts.ci.releasenotes
22

33
import com.google.common.truth.Truth.assertThat
44
import org.junit.Test
5+
import java.io.File
56

67
class GenerateReleaseNotesCommandTest {
78

89
@Test
910
fun `Should not used default file if passed other as argument`() {
1011
// given
11-
val expected = createTempFile("test", ".file").absolutePath
12+
val expected = File.createTempFile("test", ".file").absolutePath
1213

1314
// when
1415
val command = GenerateReleaseNotesCommand().apply {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

test_runner/src/main/kotlin/ftl/reports/xml/JUnitXml.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ftl.reports.xml
33
import com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
44
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
55
import com.fasterxml.jackson.dataformat.xml.XmlMapper
6+
import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL
67
import com.fasterxml.jackson.module.kotlin.KotlinModule
78
import ftl.reports.xml.model.JUnitTestResult
89
import ftl.reports.xml.model.JUnitTestSuite
@@ -15,6 +16,7 @@ import java.nio.file.Path
1516
private val xmlModule = JacksonXmlModule().apply { setDefaultUseWrapper(false) }
1617

1718
private val xmlMapper = XmlMapper(xmlModule)
19+
.configure(EMPTY_ELEMENT_AS_NULL, true)
1820
.registerModules(KotlinModule())
1921
.configure(FAIL_ON_UNKNOWN_PROPERTIES, false)
2022

0 commit comments

Comments
 (0)