Replace univocity-parsers with FastCSV

NOTICE.md

@@ -4,5 +4,5 @@ Open Source Licenses
 This product may include a number of subcomponents with separate
 copyright notices and license terms. Your use of the source code for
 these subcomponents is subject to the terms and conditions of the
-subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+subcomponent's license, as noted in the `LICENSE-<subcomponent>[.md]`
 files.

documentation/documentation.gradle.kts

@@ -446,11 +446,11 @@ tasks {
 					).asPath
 				}
 			}))
-			addStringOption("-add-modules", "info.picocli,org.opentest4j.reporting.events")
+			addStringOption("-add-modules", "info.picocli,org.opentest4j.reporting.events,de.siegmar.fastcsv")
 			addOption(ModuleSpecificJavadocFileOption("-add-reads", mapOf(
 					"org.junit.platform.console" to provider { "info.picocli" },
 					"org.junit.platform.reporting" to provider { "org.opentest4j.reporting.events" },
-					"org.junit.jupiter.params" to provider { "univocity.parsers" }
+					"org.junit.jupiter.params" to provider { "de.siegmar.fastcsv" }
 			)))
 		}
 

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc

@@ -115,6 +115,18 @@ repository on GitHub.
 * The contracts for the `Executable` parameters of Kotlin-specific `assertTimeout`
   functions were changed from `callsInPlace(executable, EXACTLY_ONCE)` to
   `callsInPlace(executable, AT_MOST_ONCE)` which might result in compilation errors.
+* As a result of migrating from
+  https://github.com/uniVocity/univocity-parsers[univocity-parsers] to
+  https://fastcsv.org/[FastCSV] for `@CsvSource` and `@CsvFileSource`, root causes and
+  messages  of exceptions thrown for malformed CSV input may differ in some cases. While
+  the overall parsing behavior remains consistent, this may affect custom error handling
+  that relies on specific exception types or messages.
+* The `CsvFileSource.lineSeparator()` parameter has been removed. The line separator is
+  now automatically detected, meaning that any of `\r`, `\n`, or `\r\n` is treated as a
+  line separator.
+* Parameters such as `ignoreLeadingAndTrailingWhitespace()`, `nullValues()`, and others in
+  `@CsvSource` and `@CsvFileSource` now apply to header fields as well  as to regular
+  fields.
 * The `junit-jupiter-migrationsupport` artifact and its contained classes are now
   deprecated and will be removed in the next major version.
 * The type bounds of the following methods have been changed to be more flexible and allow
@@ -129,6 +141,11 @@ repository on GitHub.
 * Kotlin's `suspend` modifier may now be applied to test and lifecycle methods.
 * The `Arguments` interface for parameterized tests is now officially a
   `@FunctionalInterface`.
+* The implementation of `@CsvSource` and `@CsvFileSource` was migrated from the no longer
+  maintained https://github.com/uniVocity/univocity-parsers[univocity-parsers] to
+  https://fastcsv.org/[FastCSV].
+  This improves the consistency of CSV input handling, including for malformed entries,
+  and provides better error reporting and overall performance.
 
 
 [[release-notes-6.0.0-M1-junit-vintage]]

gradle/base/dsl-extensions/src/main/kotlin/junitbuild/extensions/TaskExtensions.kt

@@ -1,7 +1,21 @@
 package junitbuild.extensions
 
 import org.gradle.api.Task
+import org.gradle.api.file.ArchiveOperations
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.kotlin.dsl.newInstance
+import javax.inject.Inject
 
 fun Task.trackOperationSystemAsInput() =
     inputs.property("os", OperatingSystem.current().familyName)
+
+fun <T> Task.withArchiveOperations(action: (ArchiveOperations) -> T): T =
+    archiveOperations.run { action(this) }
+
+private val Task.archiveOperations: ArchiveOperations
+    get() = project.objects.newInstance(DummyObject::class).archiveOperations
+
+private abstract class DummyObject {
+    @get:Inject
+    abstract val archiveOperations: ArchiveOperations
+}

gradle/libs.versions.toml

@@ -36,6 +36,7 @@ checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checks
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.179" }
 commons-io = { module = "commons-io:commons-io", version = "2.19.0" }
 errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.38.0" }
+fastcsv = { module = "de.siegmar:fastcsv", version = "4.0.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.27" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "3.0" }
@@ -71,7 +72,6 @@ slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.17" }
 snapshotTests-junit5 = { module = "de.skuzzle.test:snapshot-tests-junit5", version.ref = "snapshotTests" }
 snapshotTests-xml = { module = "de.skuzzle.test:snapshot-tests-xml", version.ref = "snapshotTests" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
-univocity-parsers = { module = "com.sonofab1rd:univocity-parsers", version = "2.10.2" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
 xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
 testingAnnotations = { module = "com.gradle:develocity-testing-annotations", version = "2.0.1" }
@@ -99,7 +99,6 @@ buildParameters = { id = "org.gradlex.build-parameters", version = "1.4.4" }
 commonCustomUserData = { id = "com.gradle.common-custom-user-data-gradle-plugin", version = "2.3" }
 develocity = { id = "com.gradle.develocity", version = "4.0.2" }
 errorProne = { id = "net.ltgt.errorprone", version = "4.2.0" }
-extraJavaModuleInfo = { id = "org.gradlex.extra-java-module-info", version = "1.12" }
 foojayResolver = { id = "org.gradle.toolchains.foojay-resolver", version = "1.0.0" }
 gitPublish = { id = "org.ajoberstar.git-publish", version = "5.1.1" }
 jmh = { id = "me.champeau.jmh", version = "0.7.3" }

junit-jupiter-params/junit-jupiter-params.gradle.kts

@@ -8,7 +8,6 @@ plugins {
 	id("junitbuild.shadow-conventions")
 	id("junitbuild.jmh-conventions")
 	`java-test-fixtures`
-	alias(libs.plugins.extraJavaModuleInfo)
 }
 
 description = "JUnit Jupiter Params"
@@ -20,19 +19,14 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 	compileOnly(libs.jspecify)
 
-	shadowed(libs.univocity.parsers)
+	shadowed(libs.fastcsv)
 
 	compileOnly(kotlin("stdlib"))
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
 }
 
-extraJavaModuleInfo {
-	automaticModule(libs.univocity.parsers, "univocity.parsers")
-	failOnMissingModuleInfo = false
-}
-
 tasks {
 	jar {
 		bundle {
@@ -45,17 +39,22 @@ tasks {
 			""")
 		}
 	}
-	shadowJar {
-		relocate("com.univocity", "org.junit.jupiter.params.shadow.com.univocity")
-		from(projectDir) {
-			include("LICENSE-univocity-parsers.md")
-			into("META-INF")
+	val extractFastCSVLicense by registering(Sync::class) {
+		from(zipTree(configurations.shadowedClasspath.flatMap { it.elements }.map { it.single { file -> file.asFile.name.contains("fastcsv") } })) {
+			include("META-INF/LICENSE")
+			rename { "LICENSE-fastcsv" }
 		}
+		into(layout.buildDirectory.dir("fastcsv"))
+	}
+	shadowJar {
+		relocate("de.siegmar.fastcsv", "org.junit.jupiter.params.shadow.de.siegmar.fastcsv")
+		exclude("META-INF/LICENSE")
+		from(extractFastCSVLicense)
 	}
 	compileJava {
 		options.compilerArgs.addAll(listOf(
-			"--add-modules", "univocity.parsers",
-			"--add-reads", "${javaModuleName}=univocity.parsers"
+			"--add-modules", "de.siegmar.fastcsv",
+			"--add-reads", "${javaModuleName}=de.siegmar.fastcsv"
 		))
 	}
 	compileJmhJava {
@@ -68,8 +67,8 @@ tasks {
 	}
 	javadoc {
 		(options as StandardJavadocDocletOptions).apply {
-			addStringOption("-add-modules", "univocity.parsers")
-			addStringOption("-add-reads", "${javaModuleName}=univocity.parsers")
+			addStringOption("-add-modules", "de.siegmar.fastcsv")
+			addStringOption("-add-reads", "${javaModuleName}=de.siegmar.fastcsv")
 		}
 	}
 }