File tree 6 files changed +9
-6
lines changed
src/test/kotlin/flank/scripts/ci/releasenotes
src/main/kotlin/ftl/reports/xml 6 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ object Versions {
21
21
const val KOTLIN = " 1.4.20"
22
22
23
23
// https://github.com/Kotlin/kotlinx.coroutines/releases
24
- const val KOTLIN_COROUTINES = " 1.4.1 "
24
+ const val KOTLIN_COROUTINES = " 1.4.2 "
25
25
26
26
// https://github.com/remkop/picocli/releases
27
27
const val PICOCLI = " 4.5.2"
@@ -45,7 +45,7 @@ object Versions {
45
45
46
46
// https://github.com/FasterXML/jackson-core/releases
47
47
// https://github.com/FasterXML/jackson-dataformat-xml/releases
48
- const val JACKSON = " 2.11.3 "
48
+ const val JACKSON = " 2.12.0 "
49
49
50
50
const val JUNIT = " 4.13.1"
51
51
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change @@ -2,13 +2,14 @@ package flank.scripts.ci.releasenotes
2
2
3
3
import com.google.common.truth.Truth.assertThat
4
4
import org.junit.Test
5
+ import java.io.File
5
6
6
7
class GenerateReleaseNotesCommandTest {
7
8
8
9
@Test
9
10
fun `Should not used default file if passed other as argument` () {
10
11
// given
11
- val expected = createTempFile(" test" , " .file" ).absolutePath
12
+ val expected = File . createTempFile(" test" , " .file" ).absolutePath
12
13
13
14
// when
14
15
val command = GenerateReleaseNotesCommand ().apply {
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package ftl.reports.xml
3
3
import com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
4
4
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
5
5
import com.fasterxml.jackson.dataformat.xml.XmlMapper
6
+ import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL
6
7
import com.fasterxml.jackson.module.kotlin.KotlinModule
7
8
import ftl.reports.xml.model.JUnitTestResult
8
9
import ftl.reports.xml.model.JUnitTestSuite
@@ -15,6 +16,7 @@ import java.nio.file.Path
15
16
private val xmlModule = JacksonXmlModule ().apply { setDefaultUseWrapper(false ) }
16
17
17
18
private val xmlMapper = XmlMapper (xmlModule)
19
+ .configure(EMPTY_ELEMENT_AS_NULL , true )
18
20
.registerModules(KotlinModule ())
19
21
.configure(FAIL_ON_UNKNOWN_PROPERTIES , false )
20
22
You can’t perform that action at this time.
0 commit comments