From 6605157acdc150a9c2920c9c069daa92809dec2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Egyed=20=C3=81rp=C3=A1d?= <egyed.arpad@partner.t-systems.hu>
Date: Tue, 25 May 2021 12:49:20 +0200
Subject: [PATCH 1/3] Java version set to 1.8, regex fix in MrzEncoder

---
 pom.xml                                       | 54 +++++++++----------
 .../digg/dgc/transliteration/MrzEncoder.java  |  4 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc0f731..589ed7c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,14 @@
   <name>DIGG :: Digital Green Certificate :: DGC Java</name>
   <description>Schema representation, issuance and validation of Digital Green Certificates</description>
   <url>https://github.com/diggsweden/dgc-java</url>
-  
+
   <licenses>
     <license>
       <name>MIT License</name>
       <url>http://www.opensource.org/licenses/mit-license.php</url>
       <distribution>repo</distribution>
     </license>
-  </licenses>  
+  </licenses>
 
   <scm>
     <connection>scm:https://github.com/diggsweden/dgc-java.git</connection>
@@ -40,67 +40,67 @@
       <email>extern.henric.norlander@digg.se</email>
     </developer>
   </developers>
-  
+
   <distributionManagement>
     <repository>
       <id>ossrh</id>
       <url>https://s01.oss.sonatype.org/content/groups/staging/</url>
     </repository>
-  </distributionManagement>  
+  </distributionManagement>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>11</java.version>
+    <java.version>1.8</java.version>
 
     <!-- Versions on dependencies -->
     <jackson.version>2.11.4</jackson.version>
     <slf4j.version>1.7.30</slf4j.version>
     <junit.version>4.13.1</junit.version>
   </properties>
-  
+
   <dependencyManagement>
-  
+
     <dependencies>
-  
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
         <version>2.0.1.Final</version>
       </dependency>
-      
+
       <!-- Jackson -->
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-  
+
       <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-cbor</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jsr310</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-      
+
       <!-- CBOR and COSE -->
       <dependency>
         <groupId>com.upokecenter</groupId>
         <artifactId>cbor</artifactId>
         <version>4.4.1</version>
       </dependency>
-      
+
       <!-- Test -->
       <dependency>
         <groupId>junit</groupId>
@@ -108,20 +108,20 @@
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
-              
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-nop</artifactId>
         <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
-  
+
     </dependencies>
-  
+
   </dependencyManagement>
 
   <dependencies>
-  
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -132,7 +132,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-        
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-nop</artifactId>
@@ -141,7 +141,7 @@
   </dependencies>
 
   <build>
-  
+
     <plugins>
 
       <plugin>
@@ -189,11 +189,11 @@
           </execution>
         </executions>
       </plugin>
-      
+
     </plugins>
 
   </build>
-  
+
   <profiles>
 
     <profile>
@@ -213,10 +213,10 @@
               <serverId>ossrh</serverId>
               <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
               <autoReleaseAfterClose>false</autoReleaseAfterClose>
-              <!-- 
-                Allows manual inspection of the staging repo before deploying it to the central repo. 
-                Use 'mvn nexus-staging:release -Prelease' to release and 
-                'mvn nexus-staging:drop' to abort. 
+              <!--
+                Allows manual inspection of the staging repo before deploying it to the central repo.
+                Use 'mvn nexus-staging:release -Prelease' to release and
+                'mvn nexus-staging:drop' to abort.
               -->
             </configuration>
           </plugin>
@@ -285,7 +285,7 @@
     </profile>
 
   </profiles>
-  
+
   <modules>
     <module>schema</module>
     <module>create-validate</module>
diff --git a/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java b/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java
index 30c03dc..7d11eb9 100644
--- a/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java
+++ b/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java
@@ -59,7 +59,7 @@ public class MrzEncoder {
    */
   public static String encode(final String input) {
     
-    final StringBuffer sb = new StringBuffer();
+    final StringBuilder sb = new StringBuilder();
     
     for (int i = 0; i < input.trim().length(); i++) {
       final char c = input.charAt(i);
@@ -82,7 +82,7 @@ else if (Character.isWhitespace(c)) {
         .normalize(sb.toString(), Normalizer.Form.NFD)
         .replaceAll("[^\\p{ASCII}]", "")
         .toUpperCase()
-        .replaceAll("[^<[A-Z][0-9]]", "<");
+        .replaceAll("[^<A-Z0-9]", "<");
   }
 
 }

From fc07baba8c2f833eba859330425f5fe3392f798c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rp=C3=A1d=20Egyed?= <arpad.egyed@gmail.com>
Date: Sat, 12 Jun 2021 10:06:26 +0200
Subject: [PATCH 2/3] whitespace fix

---
 pom.xml                                       | 53 ++++++++++---------
 .../digg/dgc/transliteration/MrzEncoder.java  |  2 +-
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index b38310c..19b6084 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,14 @@
   <name>DIGG :: EU Digital Covid Certificate :: DCC Java</name>
   <description>Schema representation, issuance and validation of EU Digital Covid Certificates</description>
   <url>https://github.com/diggsweden/dgc-java</url>
-
+  
   <licenses>
     <license>
       <name>MIT License</name>
       <url>http://www.opensource.org/licenses/mit-license.php</url>
       <distribution>repo</distribution>
     </license>
-  </licenses>
+  </licenses>  
 
   <scm>
     <connection>scm:https://github.com/diggsweden/dgc-java.git</connection>
@@ -40,65 +40,66 @@
       <email>extern.henric.norlander@digg.se</email>
     </developer>
   </developers>
-
+  
   <distributionManagement>
     <repository>
       <id>ossrh</id>
       <url>https://s01.oss.sonatype.org/content/groups/staging/</url>
     </repository>
-  </distributionManagement>
+  </distributionManagement>  
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>        
+    
     <!-- Versions on dependencies -->
     <jackson.version>2.11.4</jackson.version>
     <slf4j.version>1.7.30</slf4j.version>
     <junit.version>4.13.1</junit.version>
   </properties>
-
+  
   <dependencyManagement>
-
+  
     <dependencies>
-
+  
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
         <version>2.0.1.Final</version>
       </dependency>
-
+      
       <!-- Jackson -->
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-
+  
       <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-cbor</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jsr310</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-
+      
       <!-- CBOR and COSE -->
       <dependency>
         <groupId>com.upokecenter</groupId>
         <artifactId>cbor</artifactId>
         <version>4.4.1</version>
       </dependency>
-
+      
       <!-- Test -->
       <dependency>
         <groupId>junit</groupId>
@@ -106,20 +107,20 @@
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
-
+              
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-nop</artifactId>
         <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
-
+  
     </dependencies>
-
+  
   </dependencyManagement>
 
   <dependencies>
-
+  
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -130,7 +131,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-
+        
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-nop</artifactId>
@@ -147,7 +148,7 @@
   </dependencies>
 
   <build>
-
+  
     <plugins>
 
       <plugin>
@@ -195,11 +196,11 @@
           </execution>
         </executions>
       </plugin>
-
+      
     </plugins>
 
   </build>
-
+  
   <profiles>
   
     <profile>
@@ -243,10 +244,10 @@
               <serverId>ossrh</serverId>
               <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
               <autoReleaseAfterClose>false</autoReleaseAfterClose>
-              <!--
-                Allows manual inspection of the staging repo before deploying it to the central repo.
-                Use 'mvn nexus-staging:release -Prelease' to release and
-                'mvn nexus-staging:drop' to abort.
+              <!-- 
+                Allows manual inspection of the staging repo before deploying it to the central repo. 
+                Use 'mvn nexus-staging:release -Prelease' to release and 
+                'mvn nexus-staging:drop' to abort. 
               -->
             </configuration>
           </plugin>
@@ -315,7 +316,7 @@
     </profile>
 
   </profiles>
-
+  
   <modules>
     <module>schema</module>
     <module>create-validate</module>
diff --git a/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java b/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java
index 4cfa842..d6c2a5b 100644
--- a/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java
+++ b/schema/src/main/java/se/digg/dgc/transliteration/MrzEncoder.java
@@ -94,7 +94,7 @@ else if (Character.isWhitespace(c)) {
       mrz = mrz.substring(0, LENGTH_RESTRICTION);
       if (mrz.endsWith("<")) {
         // OK, now it gets tricky. We can't end with a delimitter, and the rules
-        // are rather complex. Let's just remove the `<`. It's not entirely correct,
+        // are rather complex. Let's just remove the `<`. It's not entirely correct, 
         // but ...
         mrz = mrz.substring(0, LENGTH_RESTRICTION - 1);
       }

From fd938a2bb43641abf21e6f2cc8c8b0748c35f2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rp=C3=A1d=20Egyed?= <arpad.egyed@gmail.com>
Date: Sat, 12 Jun 2021 10:20:36 +0200
Subject: [PATCH 3/3] Add classifier to java8 jars

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index 19b6084..4b4dffa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,15 @@
       
       <build>
         <finalName>${project.artifactId}-java8-${project.version}</finalName>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <classifier>java8</classifier>
+            </configuration>
+          </plugin>
+        </plugins>
       </build>
       
     </profile>