merging changes from 1.3.0 Release to Master

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
 <dependency>
 	<groupId>uk.gov.nationalarchives</groupId>
     <artifactId>csv-validator-java-api</artifactId>
-    <version>1.2-RC4</version>
+    <version>1.3.0</version>
 </dependency>
 ```
 
@@ -81,7 +80,7 @@ Likewise, if you wish to use the CSV Validator from your own Scala project, the
 <dependency>
 	<groupId>uk.gov.nationalarchives</groupId>
     <artifactId>csv-validator-core</artifactId>
-    <version>1.2-RC4</version>
+    <version>1.3.0</version>
 </dependency>
 ```
 
@@ -91,26 +90,14 @@ 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.
 
 
 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).
 

csv-validator-cmd/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.nationalarchives</groupId>
         <artifactId>csv-validator-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../csv-validator-parent</relativePath>
     </parent>
 

csv-validator-core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.nationalarchives</groupId>
         <artifactId>csv-validator-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../csv-validator-parent</relativePath>
     </parent>
 

csv-validator-distribution/assembly-windows-with-jre.xml

@@ -11,7 +11,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>bin-win32-with-jre</id>
+    <id>bin-win64-with-jre</id>
     <formats>
         <format>zip</format>
     </formats>

csv-validator-distribution/pom.xml

@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>uk.gov.nationalarchives</groupId>
         <artifactId>csv-validator-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../csv-validator-parent</relativePath>
     </parent>
     <artifactId>csv-validator-distribution</artifactId>
@@ -24,7 +23,7 @@
                     <goal>wget</goal>
                 </goals>
                 <configuration>
-                    <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.21_9.zip</url>
+                    <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.21_9.zip</url>
                     <unpack>false</unpack>
                     <outputDirectory>${project.build.directory}</outputDirectory>
                 </configuration>
@@ -44,7 +43,7 @@
                     </goals>
                     <configuration>
                         <target>
-                            <unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.21_9.zip" />
+                            <unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK11U-jre_x64_windows_hotspot_11.0.21_9.zip" />
                             <move todir="${project.build.directory}/jre-windows/">
                                 <fileset dir="${project.build.directory}/jre_tmp/jdk-11.0.21+9-jre/">
                                     <include name="**/*" />

csv-validator-java-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.nationalarchives</groupId>
         <artifactId>csv-validator-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../csv-validator-parent</relativePath>
     </parent>
 

csv-validator-parent/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>uk.gov.nationalarchives</groupId>
     <artifactId>csv-validator-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>csv-validator-parent</name>
@@ -81,14 +81,34 @@
     </scm>
 
     <profiles>
-
-        <!-- Default profile publishes to Maven Central -->
-        <!-- See: https://search.maven.org/search?q=a:csv-validator-core -->
+        <!-- this profile signs the jars before publishing, if the jars are not signed, the deployment to maven central fails   -->
+        <!-- when doing a release, just run mvn release:perform -Prelease-sign-artifacts for this to work. It will ask for the  -->
+        <!-- gpg passphrase when run. It assumes that you have a gpg key setup properly        -->
         <profile>
-            <id>default-release-repo</id>
+            <id>release-sign-artifacts</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
             </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
             <distributionManagement>
                 <snapshotRepository>
                     <id>sonatype-nexus-snapshot-staging</id>

csv-validator-ui/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.nationalarchives</groupId>
         <artifactId>csv-validator-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../csv-validator-parent</relativePath>
     </parent>
 

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)
     }
-
-
   }
 
   /**

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.nationalarchives</groupId>
         <artifactId>csv-validator-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>csv-validator-parent</relativePath>
     </parent>