diff --git a/README.md b/README.md index 67c32129..81fa3a4e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ built using the [Apache Maven](https://maven.apache.org/) build tool: 1. For use in other Java/Scala Applications, build by executing `mvn clean install`. 2. For the Command Line Interface or Swing GUI, build by executing `mvn clean package`. -3. For the Docker image (`nationalarchives/csv-validator:latest`), build by executing `mvn clean package -Pdocker`. Maven Artifacts @@ -42,7 +41,7 @@ If you wish to use the CSV Validator from your own Java project, we provide a na uk.gov.nationalarchives csv-validator-java-api - 1.2-RC4 + 1.3.0 ``` @@ -81,7 +80,7 @@ Likewise, if you wish to use the CSV Validator from your own Scala project, the uk.gov.nationalarchives csv-validator-core - 1.2-RC4 + 1.3.0 ``` @@ -91,18 +90,6 @@ An example of using the Scala API can be found in the class `uk.gov.nationalarch `csv-validator-java-api` module. The Scala API at present gives much more control over the individual Schema Parsing and Validation Processor than the Java API. -Docker Container (of CSV Validator Command Line Tool) -===================================================== -To see the options run: -```bash -docker run nationalarchives/csv-validator -``` - -Then for example, to validate `/tmp/my-data.csv` with `/tmp/my-schema.csvs` you would run: -```bash -docker run nationalarchives/csv-validator /tmp/my-data.csv /tmp/my-schema.csvs -``` - Schema Examples =============== Examples of CSV Schema can be found in the test cases of the `csv-validator-core` module. See the `*.csvs` files in [acceptance/](https://github.com/digital-preservation/csv-validator/tree/master/csv-validator-core/src/test/resources/uk/gov/nationalarchives/csv/validator/acceptance). Schemas used by the Digital Preservation department at The National Archives are also available in the `example-schemas` folder of the [csv-schema](https://github.com/digital-preservation/csv-schema) repository. @@ -110,7 +97,7 @@ Examples of CSV Schema can be found in the test cases of the `csv-validator-core Current Limitations of the CSV Validator Tool ============================================= -The CSV Validator implements almost all of `CSV Schema 1.1` language, current limitations and missing functionality are: +The CSV Validator implements almost all of `CSV Schema 1.2 (Draft)` language, current limitations and missing functionality are: * `DateExpr` is not yet fully implemented (may raise Schema check error). diff --git a/csv-validator-cmd/pom.xml b/csv-validator-cmd/pom.xml index 3e4dced2..48c880dc 100644 --- a/csv-validator-cmd/pom.xml +++ b/csv-validator-cmd/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT ../csv-validator-parent diff --git a/csv-validator-core/pom.xml b/csv-validator-core/pom.xml index 2ec1e5d4..595dc854 100644 --- a/csv-validator-core/pom.xml +++ b/csv-validator-core/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT ../csv-validator-parent diff --git a/csv-validator-distribution/assembly-windows-with-jre.xml b/csv-validator-distribution/assembly-windows-with-jre.xml index f1b2ca49..4aba769d 100644 --- a/csv-validator-distribution/assembly-windows-with-jre.xml +++ b/csv-validator-distribution/assembly-windows-with-jre.xml @@ -11,7 +11,7 @@ - bin-win32-with-jre + bin-win64-with-jre zip diff --git a/csv-validator-distribution/pom.xml b/csv-validator-distribution/pom.xml index 8b786e9d..2296dad6 100644 --- a/csv-validator-distribution/pom.xml +++ b/csv-validator-distribution/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT ../csv-validator-parent csv-validator-distribution @@ -24,7 +23,7 @@ wget - https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.21_9.zip + https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.21_9.zip false ${project.build.directory} @@ -44,7 +43,7 @@ - + diff --git a/csv-validator-java-api/pom.xml b/csv-validator-java-api/pom.xml index 3634f15a..432bed99 100644 --- a/csv-validator-java-api/pom.xml +++ b/csv-validator-java-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT ../csv-validator-parent diff --git a/csv-validator-parent/pom.xml b/csv-validator-parent/pom.xml index f82c34e9..4b711293 100644 --- a/csv-validator-parent/pom.xml +++ b/csv-validator-parent/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT pom csv-validator-parent @@ -81,14 +81,34 @@ - - - + + + - default-release-repo + release-sign-artifacts - true + + performRelease + true + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + sonatype-nexus-snapshot-staging diff --git a/csv-validator-ui/pom.xml b/csv-validator-ui/pom.xml index c7db54f6..dc2f4e4e 100644 --- a/csv-validator-ui/pom.xml +++ b/csv-validator-ui/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT ../csv-validator-parent diff --git a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala index 17019da3..0129b5a6 100644 --- a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala +++ b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala @@ -152,7 +152,7 @@ object CsvValidatorUi extends SimpleSwingApplication { case _ => } - CsvValidatorCmdApp.validate( + val cliResult = CsvValidatorCmdApp.validate( TextFile(Paths.get(csvFilePath), csvEncoding, validateEncoding), TextFile(Paths.get(csvSchemaFilePath), csvSchemaEncoding), failOnFirstError, @@ -161,12 +161,12 @@ object CsvValidatorUi extends SimpleSwingApplication { trace = false, progress, rowCallback - )._2 match { + ) + + cliResult._2 match { case SystemExitCodes.ValidCsv => toConsole("PASS") - case _ => toConsole("FAIL") + case _ => toConsole(cliResult._1) } - - } /** diff --git a/pom.xml b/pom.xml index 8bc88681..2bac14ba 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ uk.gov.nationalarchives csv-validator-parent - 1.2-SNAPSHOT + 1.3.1-SNAPSHOT csv-validator-parent